Add JetBrains annotations to common base classes

.classpath

@@ -38,7 +38,7 @@
 			<attribute name="gradle_used_by_scope" value="builder"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
 	<classpathentry kind="output" path="bin/default"/>
 </classpath>

.github/workflows/build_action.yml

@@ -1,33 +0,0 @@
-name: Latest Build
-
-on:
-   push:
-      branches: [ master ]
-   pull_request:
-      branches: [ master ]
-
-jobs:
-   build:
-      strategy:
-         fail-fast: false
-         matrix:
-            jdk: [8, 11, 16, 17, 18, 19, 20]
-
-      runs-on: ubuntu-latest
-      steps:
-         - uses: actions/checkout@v3
-         
-         - name: Set up JDK ${{ matrix.jdk }}
-           uses: actions/setup-java@v3
-           with:
-               distribution: 'temurin'
-               java-version: ${{ matrix.jdk }}
-
-         - name: Validate Gradle wrapper
-           uses: gradle/wrapper-validation-action@v1
-
-         - name: Make gradlew executable
-           run: chmod +x ./gradlew
-
-         - name: Build with Gradle
-           run: ./gradlew build

.github/workflows/build_tests_action.yml

@@ -1,84 +0,0 @@
-name: Unit Tests
-
-on:
-   push:
-      branches: [ master ]
-      
-jobs:
-   build:
-      name: Unit Tests
-      runs-on: ubuntu-latest
-      steps:
-      -  uses: actions/checkout@v3
-         with:
-            fetch-depth: 0
-            
-      -  name: Set up JDK 11
-         uses: actions/setup-java@v3
-         with:
-            distribution: temurin
-            java-version: 11
-            cache: gradle
-            
-      -  name: Make gradlew executable
-         run: chmod +x ./gradlew
-      -  name: Build and Test
-         run: |
-           ./gradlew generateTestSource test jacocoTestReport --info -Dfull_test_suite=true
-           ./gradlew --stop
-         
-      -  name: Publish Test Result
-         uses: EnricoMi/publish-unit-test-result-action@v2
-         id: test-results
-         if: always()
-         with:
-            junit_files: build/test-results/**/*.xml
-            fail_on: nothing
-            ignore_runs: true
-            json_thousands_separator: .
-            time_unit: milliseconds
-            
-      -  name: Create Badge Color
-         shell: bash
-         run: |
-            case ${{ fromJSON( steps.test-results.outputs.json ).conclusion }} in
-              success)
-                echo "BADGE_COLOR=31c653" >> $GITHUB_ENV
-                ;;
-              failure)
-                echo "BADGE_COLOR=800000" >> $GITHUB_ENV
-                ;;
-              neutral)
-                echo "BADGE_COLOR=696969" >> $GITHUB_ENV
-                ;;
-            esac
-
-      -  name: Create Test Badge
-         uses: emibcn/badge-action@v1.2.4
-         with:
-            label: Tests
-            status: '${{ fromJSON( steps.test-results.outputs.json ).conclusion }}, Passed: ${{ fromJSON( steps.test-results.outputs.json ).formatted.stats.tests_succ }}, Skipped: ${{ fromJSON( steps.test-results.outputs.json ).formatted.stats.tests_skip }}, Failed: ${{ fromJSON( steps.test-results.outputs.json ).formatted.stats.tests_fail }}'
-            color: ${{ env.BADGE_COLOR }}
-            path: tests.svg
-
-      -  name: Create Coverage Badge
-         id: jacoco
-         uses: cicirello/jacoco-badge-generator@v2
-         with:
-            jacoco-csv-file: build/reports/jacoco/test/jacocoTestReport.csv
-            badges-directory: null
-            intervals: 95 80 70 60 50 0
-      
-      -  name: Upload Test Badge
-         uses: exuanbo/actions-deploy-gist@v1
-         with:
-            token: ${{ secrets.GIST_TOKEN }}
-            gist_id: 280257cd19cbe1dda3789bebd4ff65cf
-            file_path: tests.svg
-            
-      -  name: Upload Coverage Badge
-         uses: exuanbo/actions-deploy-gist@v1
-         with:
-            token: ${{ secrets.GIST_TOKEN }}
-            gist_id: 280257cd19cbe1dda3789bebd4ff65cf
-            file_path: jacoco.svg

.github/workflows/coverage.yml

@@ -1,27 +0,0 @@
-name: Measure coverage
-
-on:
-  push:
-    branches: [ debug ]
-jobs:
-  build:
-    name: Code Quality Check
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
-      - name: Set up JDK 11
-        uses: actions/setup-java@v3
-        with:
-          distribution: 'temurin'
-          java-version: 11
-          cache: 'gradle'
-      - name: Make gradlew executable
-        run: chmod +x ./gradlew
-      - name: Build and analyze
-        run: ./gradlew generateTestSource test jacocoTestReport --info -Dfull_test_suite=true
-      - name: Upload to CodeCov
-        env:
-          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
-        run: bash <(curl -s https://codecov.io/bash) -t $CODECOV_TOKEN

.github/workflows/pull_build_tests_action.yml

@@ -1,39 +0,0 @@
-name: Unit Tests
-
-on:
-   pull_request:
-      branches: [ master ]
-
-jobs:
-   build:
-      name: Unit Tests
-      runs-on: ubuntu-latest
-      steps:
-      -  uses: actions/checkout@v2
-         with:
-            fetch-depth: 0
-            
-      -  name: Set up JDK 11
-         uses: actions/setup-java@v3
-         with:
-            distribution: temurin
-            java-version: 11
-            cache: gradle
-            
-      -  name: Make gradlew executable
-         run: chmod +x ./gradlew
-      -  name: Build and Test
-         env:
-            GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-         run: ./gradlew generateTestSource test jacocoTestReport --info -Dfull_test_suite=true
-         
-      -  name: Publish Test Result
-         uses: EnricoMi/publish-unit-test-result-action@v2
-         id: test-results
-         if: always()
-         with:
-            junit_files: build/test-results/**/*.xml
-            fail_on: nothing
-            ignore_runs: true
-            json_thousands_separator: .
-            time_unit: milliseconds

.gitignore

@@ -1,6 +1,7 @@
 # ---> Gradle
 .gradle
 /build/
+gradle.properties
 
 # Ignore Gradle GUI config
 gradle-app.setting
@@ -10,15 +11,23 @@ gradle-app.setting
 
 # # Work around https://youtrack.jetbrains.com/issue/IDEA-116898
 # gradle/wrapper/gradle-wrapper.properties
-
 .classpath
 .project
 
----> Custom
+# IntelliJ
+
+.idea/
+out/
+*.iws
+*.ipr
+*.iml
+
+# ---> Custom
 !/libs/
 /.settings/
 /bin/
 /storage/
+
 #Generated Code
 /src/main/java/speiger/src/collections/booleans/*
 /src/main/java/speiger/src/collections/bytes/*
@@ -30,19 +39,5 @@ gradle-app.setting
 /src/main/java/speiger/src/collections/doubles/*
 /src/main/java/speiger/src/collections/objects/*
 
-#Generated Tests
-/src/test/java/speiger/src/testers/booleans/*
-/src/test/java/speiger/src/testers/bytes/*
-/src/test/java/speiger/src/testers/shorts/*
-/src/test/java/speiger/src/testers/chars/*
-/src/test/java/speiger/src/testers/ints/*
-/src/test/java/speiger/src/testers/longs/*
-/src/test/java/speiger/src/testers/floats/*
-/src/test/java/speiger/src/testers/doubles/*
-/src/test/java/speiger/src/testers/objects/*
-/src/test/java/speiger/src/tests/*
-
 #Cache result
 /src/builder/resources/speiger/assets/collections/cache.bin
-/src/builder/resources/speiger/assets/testers/cache.bin
-/src/builder/resources/speiger/assets/tests/cache.bin

Changelog.md

@@ -1,296 +1,79 @@
-# Changelog of versions
-
-### Version 0.9.0
-- Added: getFirst/getLast/removeFirst/removeLast to List.class.
-- Added: Dedicated Set toArray implementations.
-- Added: ToArray/pushTop functions to Stack.class.
-- Added: ComputeNonDefault functions which will contain the current behavior of the Compute function, while the Compute will be changed to be more java compliant!
-- Added: List.reversed, which returns a SubList that has all elements in reversed order and also inserts reversed.
-- Added: Iterators.infinite as an option that will create a Infinite Iterator based on the inputed one.
-- Added: List.indexedIterator which allows you to create a iterator with a customized iteration indecies. Useful if you want to transform lists output.
-- Added: PriorityQueue.contains is now a function
-- Added: Iterators/Async Builders now support MapToPrimitiveType function on the object variant. So more processing can be done. (Will be expanded upon later versions)
-- Fixed: SetValue wasn't working on forEach implementations.
-- Fixed: Compute functions now perform with primitives more java compliant. Meaning that getDefaultReturnValue function no longer is seen as null.
-- Fixed: Supplier was using the wrong dataType in their function name.
-- Updated: SimpleCodeGenerator 1.3.0 is now being used which allows for iterative code support.
-- Breaking Change: Map.compute/IfAbsent/Present and Map.supplyIfAbsent if the value is a primitive it will no longer accept the defaultReturnValue() as "null" if that functionality is desired then use: computeNonDefault which contains the functionality!
-
-### Version 0.8.1
-- Added: getFirst/getLast/removeFirst/removeLast to List.class.
-- Added: Dedicated Set toArray implementations.
-- Added: ToArray/pushTop functions to Stack.class.
-- Added: ComputeNonDefault functions which will contain the current behavior of the Compute function, while the Compute will be changed to be more java compliant!
-- Added: List.reversed, which returns a SubList that has all elements in reversed order and also inserts reversed.
-- Added: Iterators.infinite as an option that will create a Infinite Iterator based on the inputed one.
-- Added: List.indexedIterator which allows you to create a iterator with a customized iteration indecies. Useful if you want to transform lists output.
-- Added: PriorityQueue.contains is now a function
-- Added: Iterators/Async Builders now support MapToPrimitiveType function on the object variant. So more processing can be done. (Will be expanded upon later versions)
-- Fixed: SetValue wasn't working on forEach implementations.
-- Fixed: Compute functions now perform with primitives more java compliant. Meaning that getDefaultReturnValue function no longer is seen as null.
-- Fixed: Supplier was using the wrong dataType in their function name.
-- Updated: SimpleCodeGenerator 1.3.0 is now being used which allows for iterative code support.
-
-### Version 0.8.0
-- Added: getFirst/getLast/removeFirst/removeLast to Lists
-- Added: Dedicated implementations for toArray into TreeSets
-- Fixed: forEach methods in Maps now can use "setValue" functions.
-
-### Version 0.8.0
-- Added: ISizeProvider interface (Optimization Helper)
-- Added: ISizeProvider into most Iterable implementations (Distinct/Filter/FlatMap/ArrayFlatMap don't support it, for obvious reasons)
-- Added: ToArray function into Iterable which uses ISizeProvider to reduce overhead of duplicating arrays.
-- Added: Functions that have the same type, Int2IntFunction as example, have now a identity function.
-- Added: Functions of a BooleanValue have now alwaysTrue/False function.
-- Added: ForEachIndexed for all Iterable implementations
-- Added: RandomGenerator support (Java17), though requires self compilation
-- Added: Optimizations for HashUtils next power of function.
-- Added: toArray() now returns a cached empty array if the collection is empty.
-- Added: toArray function for AsyncBuilder
-- Added: Modularization to the library where feature can be disabled as needed. (Requires Self-Compilation)
-- Fixed: putIfAbsent now replaces defaultValues
-- Fixed: OpenHashSet/Map and their Custom Variants no longer rely on List implementations.
-- Fixed: ObjectCopyOnWriteList.of did create a ObjectArrayList instead of the CopyOnWrite variant.
-- Removed: BooleanSet and Maps that start with a Boolean classes since they can not be used anyways.
-- Breaking Change: Function classes now use the "apply/applyAs/test" format from Java itself, instead of the "get" format. This cleans up a lot of things. But will break existing function class implementations
-- Breaking Change: Classes that used PrimitiveCollection functions now default to java functions where applicable, this is to increase compat.
-- Breaking Change: Some function classes now get closer to javas terms. (Predicate/UnaryOperator etc)
-
-### Version 0.7.0
-- Added: Over 11 Million Unit Tests to this library to ensure quality.
-- Added: ArrayList size constructor now throws IllegalStateException if the size parameter is negative
-- Added: EnumMap specialized forEach implementation.
-- Added: AbstractMap.remove now delegates to its primitive counterpart.
-- Added: ConcurrentHashMap now implements ITrimmable
-- Refactor: Removed a lot of disabled code from ArraySet.
-- Removed: LinkedList.addAll(index, List) now delegates to LinkedList.addAll(index, Collection) due to no special optimization required.
-- Fixed: AbstractList.SubList.get/set/swapRemove didn't calculate their List index Properly
-- Fixed: AbstractList.SubList chains now properly if you create SubLists within SubLists.
-- Fixed: AbstractList.Iterator.add now respects Immutable/UnmodifiableLists.
-- Fixed: AbstractList.Iterator.skip/back now keep track of the last returned value for remove function to work properly.
-- Fixed: CopyOnWriteArrayList.extract/removeElements(int, int) does now proper range checks and remove elements properly.
-- Fixed: CopyOnWriteArrayList.SubList now works properly. (Reimplemented entirely)
-- Fixed: CopyOnWriteArrayList.Iterator.previous() was returning the wrong values.
-- Fixed: CopyOnWriteArrayList.Iterator.skip now skips the right amount of elements and stops where it should.
-- Fixed: LinkedList.first/last/dequeue/dequeueLast now throws NoSuchElementException when empty instead of IllegalStateException.
-- Fixed: LinkedList had an edge case where the entire reverse iterator would break if the wrong element was removed.
-- Fixed: LinkedList.extractElement now returns the correct values.
-- Fixed: AbstractMap.entrySet().remove(Object) now returns true if defaultReturnValue elements were removed.
-- Fixed: ConcurrentHashMap.remove(Object, Object) checks if the type matches before comparing against null Values.
-- Fixed: LinkedHashMap.clearAndTrim() was checking the wrong value for determining the full reset or clearing of a Map.
-- Fixed: HashMap.trim/clearToTrim() was using the wrong value to determin if something should be done.
-- Fixed: HashMap now compares empty values (0) against nullKeys when Object Variants of the type are used.
-- Fixed: ImmutableMap now compares empty values (0) against nullKeys when Object Variants of the type are used.
-- Fixed: ArrayMap.iterator(key) now throws NoSuchElementException when the element wasn't found.
-- Fixed: Linked/EnumMap array constructor was creating the wrong size values array.
-- Fixed: LinkedEnumMap.getAndMoveToFirst/Last was moving elements even if the element wasn't present.
-- Fixed: AVL/RBTreeMap.getFirst/LastKey was not throwing a NoSuchElementException if the map was empty.
-- Fixed: Map.Builder wasn't throwing a IllegalStateException when creating a negative size builder.
-- Fixed: AVL/RBTreeSet.DecendingSet.subSet(from, fromInclusive, to, toInclusive) was creating a corrupt asending subset.
-- Fixed: ArraySet throws now a IllegalStateException when trying to create it with a negative size.
-- Fixed: ArraySet.addMoveToLast(key) was crashing when a key was already present.
-- Fixed: Immutable/LinkedHashSet now keep track of their iteration index properly.
-- Fixed: LinkedHashSet.moveToFirst/Last(key) would crash if the Set was empty.
-- Fixed: LinkedHashSet.clearAndTrim() was checking the wrong value for determining the full reset or clearing of a Map.
-- Fixed: HashSet.trim/clearToTrim() was using the wrong value to determin if something should be done.
-
-
-### Version 0.6.2
-- Added: Array only sorting function return the inputed array. This was done to allow for static final references to use the method in one go without having to make lambda wrappers. Cleaner code.
-- Added: Iterator Wrappers are now a bit more in Compliance with Java Standards.
-- Added: AsyncBuilders now Support Array Inputs to create cleaner code.
-- Changed: LinkedList.addBulk variable definition was triggering a false positive.
-- Fixed: TreeMap.subMap().entrySet().remove() wouldn't check primitives properly.
-- Fixed: SortedMap.sub/tail/headMap were looping into themselves.
-- Fixed: AbstractCollection.retainAll didn't push removed values through the consumer.
-- Fixed: AbstractCollection.toArray wouldn't reset the last entry if the input array was larger then the elements in the collection.
-- Fixed: SubList didn't check for ranges properly or didn't use parent list to validate changes.
-- Fixed: ArrayList.addElements didn't check input array fully and used the wrong variable to move the elements around.
-- Fixed: LinkedList.addElements(EmptyInput) would crash.
-- Fixed: LinkedList.swapRemove didn't account for if the removed element was the prelast one.
-- Fixed: LinkedList.removeElements would break the implementation if the list was almost empty and the middle element was removed.
-- Fixed: LinkedHashSet.addAndMoveToFirst wouldn't move elements to the first place.
-- Fixed: ArrayList/LinkedList extractElements crashing when 0 or less elements are desired.
-- Fixed: TreeMap pollFirst/LastKey should return the defaultMin/max value instead of a Empty value.
-- Fixed: TreeMap keySet implementation was missing the class type implementations to pass keySet tests.
-- Fixed: TreeMap.SubMap Iterator (primitive Keys) was crashing because a Null was set on to a primitive.
-
-
-### Version 0.6.1
-- Fixed: FIFO queue crashing when the last index is before the first index when peek is called.
-- Fixed: FIFO queue only clears the array if it was in use.
-- Added: Sorted Method for the stream replacing functions.
-
-### Version 0.6.0
-- Added: addOrGet for sets.
-- Added: Async API which allows to easily execute Iterables/Collections offthread without the complexity.
-- Added: CopyOnWriteArrayList and tests for it
-- Added: Support up to Java17.
-- Added: Build System now adds module-info if the Running JVM is 9 or higher
-- Added: ArrayList.of(Class, size) that allows you to allocate a size right at the creation of the List without having to create a wrapper array.
-- Added: A ConcurrentHashMap implementation.
-- Fixed: containsValue in the HashMap wouldn't check the nullKey
-- Removed: Deprecated functions from SortedMaps/Sets
-
-### Version 0.5.3
-- Added: OrderedMap/Set
-- Added: Deprecation to Functions that are specific to Ordered interfaces in the SortedMap/Set
-- Added: subFrom to Maps which is the counterpart of the addTo method
-- Added: pourAsList and pourAsSet (booleans excluded for sets) to Iterable
-- Fixed: ArrayList.grow had a small bug where it would trigger to early causing performance problems with exact sized collections.
-- Fixed: FIFOQueue size constructor had a small bug where it would trigger a array enlargement when all elements were inserted.
-
-### Version 0.5.2
-- Fixed: Bugs with Queues starting with the wrong size
-- Fixed: ArrayGrowth for Queues was +1 instead of +50%
-- Added: Benchmarks with java and FastUtil
-
-### Version 0.5.1
-- Fixed: Reworked the NavigableSet/Map implementations of RBTree/AVLTree/Array Sets/Maps so they are now deemed stable.
-- Added: Another 150k Unit tests.
-- Added: List and Set Unit tests for Integer (or Primitives in this case) to ensure basic stability there. (Now covering all sets and lists)
-- Fixed: Bugs with null values for primitive collections.
-- Removed: ArraySet/Map subSet/subMap implementation was removed.
-
-### Version 0.5.0
-- Added: 2 Helper functions to find out how many bits are required to store a Number.
-- Added: pour function directly into Iterable which allows to collect all elements in the Iterable directly.
-- Added: The new ToArray method from Java9 and newer into the library. Using a functional interface. (Just a backport)
-- Changed: Reworked how the Map Builder functions are created. They are now in a SubClass that moves them out of the way. Less Clutter. (This might break things if that was used before)
-- Added: Map Builder that allows now to Build Maps like Guava ImmutableMaps can be build. Note: This has a slight performance overhead.
-- Added: Unmodifiable and Synchronize wrapper functions direclty into Collection Interfaces. This is mostly a quality of life thing.
-- Added: Unmodifiable and Synchronized Wrapper Collections can now be cloned. They clone the underlying map which doesn't break functionality. (Had a usecase for it)
-- Added: A boxed putAll array variant.
-- Fixed: EnumMaps didn't keep track of their size and now got proper care and implementations as needed. There might be more work required but at least the core functionality is now up to date.
-- Added: Tests for the new Stream replace functions to ensure no bugs are left.
-- Fixed: Custom HashSet reduce function with a default value was checking incorrectly for present keys.
-- Added: Guava TestSuit
-- Fixed: HashCode and toString method would crash if the Object Key/Value was null
-- Added: AbstractTypeCollection now delegates the contains check to type-specific Collections if it detects it.
-- Fixed: Map.Entry toString wasn't writing values not like it should do.
-- Fixed: Set.hashCode now is the sum of the elements instead of a Unique HashCode based on the elements.
-- Fixed: Added missing NonNull Checks.
-- Fixed: Custom/OpenHashMap.containsValue implementation was wrong.
-- Fixed: Custom/OpenHashMap.compute/present/absent now works how it is specified in the Java Documentation
-- Fixed: Custom/OpenHashMap.merge/BulkMerge now works how it is specified in the Java Documentation
-- Fixed: Custom/Linked/OpenHashMap.keySet.remove was causing a infinite loop.
-- Fixed: Custom/Linked/OpenHashMap.entrySet.contains was not correctly comparing the entry.
-- Fixed: Custom/OpenHashMap.mapIterator now no longer crashes in certain cases.
-- Added: Custom/LinkedOpenHashMap now takes use of the improved Iterator it has for containsValue
-- Fixed: CustomOpenHashMap.keySet.forEach was basically putting out keys even if they were present
-- Fixed: ImmutableMaps issues thanks to the tests. Roughly the same as the rest of the maps
-- Fixed: RB/AVLTreeMaps issues. Roughly the same as the rest of the maps
-- Fixed: SubLists are now properly implemented.
-- Fixed: HashSet Iterator bugs now fixed... That was Painful.
-- Added: Tests for Lists and Sets
-
-### Version 0.4.5
-- Added: removeAll/retainAll(Collection c, Consumer r) which receives all the elements that got deleted from the collection
-- Fixed: Supplier get function wasn't referencing original function.
-- Added: addIfPresent/Absent to lists
-- Added: distinct, limit and peek iterators
-- Added: Iterable's can now reduce its contents
-- Added: Better ForEach support for IterableWrappers so a Iterator chain is not created
-- Added: SwapRemove to Lists which moves the last element into the desired space to be deleted
-- Added: More Test cases
-
-### Version 0.4.4
-- Fixed: ObjectArrayList.of was causing crashes because of a Poor implementation.
-- Added: Unsorted HashMaps/Sets now throw Concurrent exceptions if they were modified during a rehash.
-- Added: Array/Collection version of enqueue and enqueueFirst to PriorityQueues.
-- Added: fillBuffer function into PrimitiveLists which allow to optimize JavaNio buffers if needed.
-
-### Version 0.4.3
-- Added: Wrapper now support the Optimized Lambda replacer functions to improve performance.
-- Added: FIFO Queue has now a minimum capacity and that is now checked more consistently.
-
-### Version 0.4.2
-- Added: Lists/Sets/Maps/PriorityQueues are now copy-able. with the new copy() function.
-	Note: subLists/subMaps/subSets or synchronize/unmodifyable wrappers do not support that function.
-- Fixed: PriorityQueues didn't implement: hashCode/equals/toString
-
-### Version 0.4.1
-- Changed: ForEach with input now provides input, value instead of value, input, this improves the usage of method references greatly
-- Added: addAll with Array-types in collections.
-- Added: Java Iterator/Iterable support for Stream replacing methods
-- Added: Suppliers.
-- Added: SupplyIfAbsent. It is ComputeIfAbsent but using suppliers
-- Added: Count feature into Iterable
-- Fixed: A couple bugs with the new StreamReplacing functions in LinkedCollections Iterating to Infinity
-
-### Version 0.4.0
-- Changed: Iterable specific helper functions were moved out of Iterators and moved into Iterables
-- Added: New Stream replacing functions: findFirst, matchesAny/All/None
-- Fixed: Compute/ComputeIfAbsent/ComputeIfPresent/Merge/BulkMerge in maps now behave like they should.
-- Added: Implementations for New Stream replacing functions.
-- Changed: Removed a lot of duplicated forEach implementations
-- Added: Flat/Mapping functions (to object) are now accessible to primitive maps.
-- Added: Filter function to Iterators/Iterables (Iterable implements it by default)
-- Changed: Cleanup of some variables/mappers
-- Added/Fixed: AVL/RBTreeMap got reworked and SubMaps work more properly now. Also forEach support got improved a lot
-- Added/Fixed: TreeSubSets (RB/AVL) got their functional implementations improved too.
-- Added: Pairs are now a thing. In Mutable/Immutable Form
-
-### Version 0.3.6
-- Fixed: addAll non Type Specific Lists was causing crashes.
-- Fixed/Changed: clearAndTrim's implementation was all over the place. In some cases causing crash scenarios.
-- Fixed: Wrappers didn't implement toString/equals/hashCode
-- Added: Tests for addAll Bug
-- Changed: Cleaned up CodeStyle as bugs were fixed.
-
-### Version 0.3.5
-- Fixed: Simple Code Generator dependency was declared wrong. Its only needed for runtime. Not for Compilation.
-- Fixed: ObjectLists Crashed when a null was provided as a Comparator. (Unless the List was Initialized with the ClassType)
-- Fixed: LinkedLists didn't implement add(Object)
-- Fixed: Object Collections did have the JavaCollections deprecated as the Constructor. This should only be deprecated for Primitives
-- Added: Tests with 5k Random names for Object sorting.
-- Changed: Object Arrays no longer require a Comparable[] it just assumes now that the elements in the Array are Comparable
-- Fixed: Dependency to SimpleCodeGenerator should be no longer a thing. Because the resulting library doesn't need it only the builder does.
-
-### Version 0.3.4
-- Fixed: ArrayLists didn't resize properly if they were empty.
-
-
-### Version 0.3.3
-- Added: Flat/Mapping function for Iterables/Iterators to help avoid streams for cleaner looking code
-- Fixed: AVLTrees pollFirst/Last is now keeping orders and is fixed
-- Fixed: AbstractCollection bulk adding methods now link to the specialized implementations.
-- Fixed: A bug with getElements in ArrayList.
-- Fixed: PriorityQueue remove/toArray function were renamed so they fit better with other interfaces. (remove => removeFirst and toArray uses a different genericType)
-- Added: LinkedList which is a List/PriorityDequeue/Stack which allows for more optimized use-cases and reduced boxing/unboxing.
-- Added: Tests for LinkedList
-
-### Version 0.3.2
-- Fixed: Map.put wasn't referring to primitive variants.
-- Added: ImmutableList.
-- Added: Iterator pour function into a List or Array
-- Changed: Arrays Wrap is now accessible to Objects and now is ? extends TYPE instead of TYPE.
-- Added: OpenHashSets now implement foreach and have less overhead.
-- Added: ImmutableOpenHashSet that is not editable (is linked by default for fast iteration)
-- Added: CustomOpenHashSets now implement foreach and have less overhead.
-- Added: ImmutableOpenHashMap that is not editable (is linked by default for fast iteration)
-- Added: Maps can now be created through the interface.
-- Fixed: Lists.addElements(T...elements) was adding elements at the beginning of a list instead of the end.
-- Fixed: Bugs with the AVLTreeSet. And marked bugs with AVLTreeX that are still present.
-
-### Version 0.3.1
-- Fixed: containsKey & containsValue in HashMaps were deprecated for Object Variants.
-- Fixed: HashMap wasn't deleting Keys & Values references when removing a Object
-- Fixed: AVLTreeMap didn't balance properly.
-- Changed: EnumMap no longer tries to access SharedSecrets since its gone in java11
-- Added: HashMaps now implement ITrimmable
-- Added: AVLTreeSet didn't balance properly
-- Fixed: HashMaps & LinkedMaps weren't clearing references properly.
-
-### Version 0.3.0 (Breaking 0.2.0)
-- Added: Stack.isEmpty was missing
-- Changed: remove/removeLast/enqueue/enqueueFirst no longer use Type Suffixes
-- Removed: Suffixes for unmodifiable & synchronize functions.
-- Changed: Primitive Stacks no longer depend on the base Stack class. Because seriously not needed.
-- Changed: PriorityQueues no longer extends Object Variant.
-- Changed: Maps.get function is no longer using Suffixes unless its absolutely necessary.
-- Changed: Maps.remove function is no longer using Suffixes unless its absolutely necessary.
-- Changed: ObjectList methods are no longer marked Deprecated even so it was for primitive ones.
-- Added: Shuffle & Reverse Methods.
-- Added: Concat Iterators.
+# Changelog of versions
+
+
+### Version 0.4.0
+- Changed: Iterable specific helper functions were moved out of Iterators and moved into Iterables
+- Added: New Stream replacing functions: findFirst, matchesAny/All/None
+- Fixed: Compute/ComputeIfAbsent/ComputeIfPresent/Merge/BulkMerge in maps now behave like they should.
+- Added: Implementations for New Stream replacing functions.
+- Changed: Removed a lot of duplicated forEach implementations
+- Added: Flat/Mapping functions (to object) are now accessible to primitive maps.
+- Added: Filter function to Iterators/Iterables (Iterable implements it by default)
+- Changed: Cleanup of some variables/mappers
+- Added/Fixed: AVL/RBTreeMap got reworked and SubMaps work more properly now. Also forEach support got improved a lot
+- Added/Fixed: TreeSubSets (RB/AVL) got their functional implementations improved too.
+- Added: Pairs are now a thing. In Mutable/Immutable Form
+
+### Version 0.3.6
+- Fixed: addAll non Type Specific Lists was causing crashes.
+- Fixed/Changed: clearAndTrim's implementation was all over the place. In some cases causing crash scenarios.
+- Fixed: Wrappers didn't implement toString/equals/hashCode
+- Added: Tests for addAll Bug
+- Changed: Cleaned up CodeStyle as bugs were fixed.
+
+### Version 0.3.5
+- Fixed: Simple Code Generator dependency was declared wrong. Its only needed for runtime. Not for Compilation.
+- Fixed: ObjectLists Crashed when a null was provided as a Comparator. (Unless the List was Initialized with the ClassType)
+- Fixed: LinkedLists didn't implement add(Object)
+- Fixed: Object Collections did have the JavaCollections deprecated as the Constructor. This should only be deprecated for Primitives
+- Added: Tests with 5k Random names for Object sorting.
+- Changed: Object Arrays no longer require a Comparable[] it just assumes now that the elements in the Array are Comparable
+- Fixed: Dependency to SimpleCodeGenerator should be no longer a thing. Because the resulting library doesn't need it only the builder does.
+
+### Version 0.3.4
+- Fixed: ArrayLists didn't resize properly if they were empty.
+
+
+### Version 0.3.3
+- Added: Flat/Mapping function for Iterables/Iterators to help avoid streams for cleaner looking code
+- Fixed: AVLTrees pollFirst/Last is now keeping orders and is fixed
+- Fixed: AbstractCollection bulk adding methods now link to the specialized implementations.
+- Fixed: A bug with getElements in ArrayList.
+- Fixed: PriorityQueue remove/toArray function were renamed so they fit better with other interfaces. (remove => removeFirst and toArray uses a different genericType)
+- Added: LinkedList which is a List/PriorityDequeue/Stack which allows for more optimized use-cases and reduced boxing/unboxing.
+- Added: Tests for LinkedList
+
+### Version 0.3.2
+- Fixed: Map.put wasn't referring to primitive variants.
+- Added: ImmutableList.
+- Added: Iterator pour function into a List or Array
+- Changed: Arrays Wrap is now accessible to Objects and now is ? extends TYPE instead of TYPE.
+- Added: OpenHashSets now implement foreach and have less overhead.
+- Added: ImmutableOpenHashSet that is not editable (is linked by default for fast iteration)
+- Added: CustomOpenHashSets now implement foreach and have less overhead.
+- Added: ImmutableOpenHashMap that is not editable (is linked by default for fast iteration)
+- Added: Maps can now be created through the interface.
+- Fixed: Lists.addElements(T...elements) was adding elements at the beginning of a list instead of the end.
+- Fixed: Bugs with the AVLTreeSet. And marked bugs with AVLTreeX that are still present.
+
+### Version 0.3.1
+- Fixed: containsKey & containsValue in HashMaps were deprecated for Object Variants.
+- Fixed: HashMap wasn't deleting Keys & Values references when removing a Object
+- Fixed: AVLTreeMap didn't balance properly.
+- Changed: EnumMap no longer tries to access SharedSecrets since its gone in java11
+- Added: HashMaps now implement ITrimmable
+- Added: AVLTreeSet didn't balance properly
+- Fixed: HashMaps & LinkedMaps weren't clearing references properly.
+
+### Version 0.3.0 (Breaking 0.2.0)
+- Added: Stack.isEmpty was missing
+- Changed: remove/removeLast/enqueue/enqueueFirst no longer use Type Suffixes
+- Removed: Suffixes for unmodifiable & synchronize functions.
+- Changed: Primitive Stacks no longer depend on the base Stack class. Because seriously not needed.
+- Changed: PriorityQueues no longer extends Object Variant.
+- Changed: Maps.get function is no longer using Suffixes unless its absolutely necessary.
+- Changed: Maps.remove function is no longer using Suffixes unless its absolutely necessary.
+- Changed: ObjectList methods are no longer marked Deprecated even so it was for primitive ones.
+- Added: Shuffle & Reverse Methods.
+- Added: Concat Iterators.
 - Added: PriorityQueues

EXTRAS.md

@@ -1,41 +0,0 @@
-### Extra Features
-
-Primitive Collections comes with a few extra features that are disabled by default.    
-These will be enabled as soon they become relevant or never at all.
-
-But some of these can be already unlocked when the target version changes.    
-
-If you compile the library for yourself you will automatically gain access to said features.
-
-### Java17 Exclusive Features    
-Java17 has some new features that can sadly not really be back-ported but the library still supports them if it is compiled with java17
- 
-- RandomGenerator: Java17 has added [RandomGenerator.class](https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/random/RandomGenerator.html).
-  This allows to use custom random implementations without having to re-implement them yourselves.
-
-
-### ModuleSettings
-Primitive Collections is a huge library.   
-But maybe you only use like 5-10 different classes.   
-Normally you would use tools like "Proguard" to get rid of classes that you don't use.    
-But since a lot of classes have dependencies on each other this would only do so much.    
-
-This is where the [ModuleSettings](ModuleSettings.json) come into play.   
-It allows you to turn of implementations as you wish and adjusts the code that everything still works.   
-
-There is 3 layers of control inside of the ModuleSettings.   
-- Modules directly at the top that turn off everything.   
-- Type Specific configurations, where you can for example turn of everything thats "Long" based.   
-- And then there is each type specific module settings.   
-
-Allowing for greater control without having to edit hundreds of lines of code.   
-On top of that:   
-Any Setting that isn't "Present" is counted as "Enabled".    
-So if you want to disable just 1 thing you can keep that 1 thing and delete the rest of the Setting.    
-It will still work as the same.    
-The default settings just come with everything so you can see what is controllable.   
-
-How to compile the Code with the ModuleSettings enabled:
-```
-/gradlew.bat generateLimitSource build -x test
-```

LICENSE

@@ -1,201 +1,208 @@
-                                 Apache License
-                           Version 2.0, December 2021
-                        http://www.apache.org/licenses/
+Apache License
 
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+Version 2.0, January 2021
+
+http://www.apache.org/licenses/ TERMS AND CONDITIONS FOR USE, REPRODUCTION,
+AND DISTRIBUTION
 
    1. Definitions.
 
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
+      
 
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
+"License" shall mean the terms and conditions for use, reproduction, and distribution
+as defined by Sections 1 through 9 of this document.
 
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
+      
 
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
+"Licensor" shall mean the copyright owner or entity authorized by the copyright
+owner that is granting the License.
 
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
+      
 
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
+"Legal Entity" shall mean the union of the acting entity and all other entities
+that control, are controlled by, or are under common control with that entity.
+For the purposes of this definition, "control" means (i) the power, direct
+or indirect, to cause the direction or management of such entity, whether
+by contract or otherwise, or (ii) ownership of fifty percent (50%) or more
+of the outstanding shares, or (iii) beneficial ownership of such entity.
 
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
+      
 
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
+"You" (or "Your") shall mean an individual or Legal Entity exercising permissions
+granted by this License.
 
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
+      
 
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
+"Source" form shall mean the preferred form for making modifications, including
+but not limited to software source code, documentation source, and configuration
+files.
 
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
+      
 
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
+"Object" form shall mean any form resulting from mechanical transformation
+or translation of a Source form, including but not limited to compiled object
+code, generated documentation, and conversions to other media types.
 
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
+      
 
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
+"Work" shall mean the work of authorship, whether in Source or Object form,
+made available under the License, as indicated by a copyright notice that
+is included in or attached to the work (an example is provided in the Appendix
+below).
 
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
+      
 
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
+"Derivative Works" shall mean any work, whether in Source or Object form,
+that is based on (or derived from) the Work and for which the editorial revisions,
+annotations, elaborations, or other modifications represent, as a whole, an
+original work of authorship. For the purposes of this License, Derivative
+Works shall not include works that remain separable from, or merely link (or
+bind by name) to the interfaces of, the Work and Derivative Works thereof.
 
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
+      
 
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
+"Contribution" shall mean any work of authorship, including the original version
+of the Work and any modifications or additions to that Work or Derivative
+Works thereof, that is intentionally submitted to Licensor for inclusion in
+the Work by the copyright owner or by an individual or Legal Entity authorized
+to submit on behalf of the copyright owner. For the purposes of this definition,
+"submitted" means any form of electronic, verbal, or written communication
+sent to the Licensor or its representatives, including but not limited to
+communication on electronic mailing lists, source code control systems, and
+issue tracking systems that are managed by, or on behalf of, the Licensor
+for the purpose of discussing and improving the Work, but excluding communication
+that is conspicuously marked or otherwise designated in writing by the copyright
+owner as "Not a Contribution."
 
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
+      
 
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
+"Contributor" shall mean Licensor and any individual or Legal Entity on behalf
+of whom a Contribution has been received by Licensor and subsequently incorporated
+within the Work.
 
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
+2. Grant of Copyright License. Subject to the terms and conditions of this
+License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive,
+no-charge, royalty-free, irrevocable copyright license to reproduce, prepare
+Derivative Works of, publicly display, publicly perform, sublicense, and distribute
+the Work and such Derivative Works in Source or Object form.
 
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
+3. Grant of Patent License. Subject to the terms and conditions of this License,
+each Contributor hereby grants to You a perpetual, worldwide, non-exclusive,
+no-charge, royalty-free, irrevocable (except as stated in this section) patent
+license to make, have made, use, offer to sell, sell, import, and otherwise
+transfer the Work, where such license applies only to those patent claims
+licensable by such Contributor that are necessarily infringed by their Contribution(s)
+alone or by combination of their Contribution(s) with the Work to which such
+Contribution(s) was submitted. If You institute patent litigation against
+any entity (including a cross-claim or counterclaim in a lawsuit) alleging
+that the Work or a Contribution incorporated within the Work constitutes direct
+or contributory patent infringement, then any patent licenses granted to You
+under this License for that Work shall terminate as of the date such litigation
+is filed.
 
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
+4. Redistribution. You may reproduce and distribute copies of the Work or
+Derivative Works thereof in any medium, with or without modifications, and
+in Source or Object form, provided that You meet the following conditions:
 
-   END OF TERMS AND CONDITIONS
+(a) You must give any other recipients of the Work or Derivative Works a copy
+of this License; and
 
-   APPENDIX: How to apply the Apache License to your work.
+(b) You must cause any modified files to carry prominent notices stating that
+You changed the files; and
 
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
+(c) You must retain, in the Source form of any Derivative Works that You distribute,
+all copyright, patent, trademark, and attribution notices from the Source
+form of the Work, excluding those notices that do not pertain to any part
+of the Derivative Works; and
 
-   Copyright 2021 Speiger
+(d) If the Work includes a "NOTICE" text file as part of its distribution,
+then any Derivative Works that You distribute must include a readable copy
+of the attribution notices contained within such NOTICE file, excluding those
+notices that do not pertain to any part of the Derivative Works, in at least
+one of the following places: within a NOTICE text file distributed as part
+of the Derivative Works; within the Source form or documentation, if provided
+along with the Derivative Works; or, within a display generated by the Derivative
+Works, if and wherever such third-party notices normally appear. The contents
+of the NOTICE file are for informational purposes only and do not modify the
+License. You may add Your own attribution notices within Derivative Works
+that You distribute, alongside or as an addendum to the NOTICE text from the
+Work, provided that such additional attribution notices cannot be construed
+as modifying the License.
 
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
+You may add Your own copyright statement to Your modifications and may provide
+additional or different license terms and conditions for use, reproduction,
+or distribution of Your modifications, or for any such Derivative Works as
+a whole, provided Your use, reproduction, and distribution of the Work otherwise
+complies with the conditions stated in this License.
 
-       http://www.apache.org/licenses/LICENSE-2.0
+5. Submission of Contributions. Unless You explicitly state otherwise, any
+Contribution intentionally submitted for inclusion in the Work by You to the
+Licensor shall be under the terms and conditions of this License, without
+any additional terms or conditions. Notwithstanding the above, nothing herein
+shall supersede or modify the terms of any separate license agreement you
+may have executed with Licensor regarding such Contributions.
 
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
+6. Trademarks. This License does not grant permission to use the trade names,
+trademarks, service marks, or product names of the Licensor, except as required
+for reasonable and customary use in describing the origin of the Work and
+reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or agreed to
+in writing, Licensor provides the Work (and each Contributor provides its
+Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied, including, without limitation, any warranties
+or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR
+A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness
+of using or redistributing the Work and assume any risks associated with Your
+exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory, whether
+in tort (including negligence), contract, or otherwise, unless required by
+applicable law (such as deliberate and grossly negligent acts) or agreed to
+in writing, shall any Contributor be liable to You for damages, including
+any direct, indirect, special, incidental, or consequential damages of any
+character arising as a result of this License or out of the use or inability
+to use the Work (including but not limited to damages for loss of goodwill,
+work stoppage, computer failure or malfunction, or any and all other commercial
+damages or losses), even if such Contributor has been advised of the possibility
+of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing the Work
+or Derivative Works thereof, You may choose to offer, and charge a fee for,
+acceptance of support, warranty, indemnity, or other liability obligations
+and/or rights consistent with this License. However, in accepting such obligations,
+You may act only on Your own behalf and on Your sole responsibility, not on
+behalf of any other Contributor, and only if You agree to indemnify, defend,
+and hold each Contributor harmless for any liability incurred by, or claims
+asserted against, such Contributor by reason of your accepting any such warranty
+or additional liability. END OF TERMS AND CONDITIONS
+
+APPENDIX: How to apply the Apache License to your work.
+
+To apply the Apache License to your work, attach the following boilerplate
+notice, with the fields enclosed by brackets "[]" replaced with your own identifying
+information. (Don't include the brackets!) The text should be enclosed in
+the appropriate comment syntax for the file format. We also recommend that
+a file or class name and description of purpose be included on the same "printed
+page" as the copyright notice for easier identification within third-party
+archives.
+
+Copyright 2021 Speiger
+
+Licensed under the Apache License, Version 2.0 (the "License");
+
+you may not use this file except in compliance with the License.
+
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+
+distributed under the License is distributed on an "AS IS" BASIS,
+
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+
+See the License for the specific language governing permissions and
+
+limitations under the License.

README.md

@@ -1,71 +1,82 @@
-![build](https://github.com/Speiger/Primitive-Collections/actions/workflows/build_action.yml/badge.svg)
-[![Latest Release](https://jitpack.io/v/Speiger/Primitive-Collections.svg)](https://jitpack.io/#Speiger/Primitive-Collections)
-![Maven Central Version](https://img.shields.io/maven-central/v/io.github.speiger/Primitive-Collections)
-[![License](https://img.shields.io/badge/License-Apache_2.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
-![GitHub commit activity](https://img.shields.io/github/commit-activity/m/Speiger/Primitive-Collections)      
-![Unit Tests](https://github.com/Speiger/Primitive-Collections/actions/workflows/build_tests_action.yml/badge.svg)
-![Coverage](https://gist.githubusercontent.com/Speiger/280257cd19cbe1dda3789bebd4ff65cf/raw/405abd1d2f6c19ac70f20b8b1772176f42d5c5d3/jacoco.svg)
-[![codecov](https://codecov.io/gh/Speiger/Primitive-Collections/branch/debug/graph/badge.svg?token=WSTSNJM0EN)](https://codecov.io/gh/Speiger/Primitive-Collections)
-![Tests Done](https://gist.githubusercontent.com/Speiger/280257cd19cbe1dda3789bebd4ff65cf/raw/405abd1d2f6c19ac70f20b8b1772176f42d5c5d3/tests.svg)
 # Primitive-Collections
-This is a Simple Primitive Collections Library aimed to outperform Java's Collection Library and FastUtil.  
-Both in Performance and Quality of Life Features.  
 
-## Benchmarks
-Benchmarks can be found here: [[Charts]](https://github.com/Speiger/Primitive-Collections-Benchmarks/blob/master/BENCHMARKS-CHARTS.md), [[Tables]](https://github.com/Speiger/Primitive-Collections-Benchmarks/blob/master/BENCHMARKS.md)
-
-## Special Features
-[Here](features.md) you find a set of features added to Primitive Collections.   
-These are designed to improve performance or to provide Quality of Life.  
-
-[Here](EXTRAS.md) you also find features that can be used when you compile the library for yourself.    
-These features are not used by default to have a wider range of compat, or require self compilation.    
-Such as pruning classes that are not needed in your code.
+This is a Simple Primitive Collections Library i started as a hobby Project.     
+It is based on Java's Collection Library and FastUtil.     
+But its focus is a different one.     
 
 ## Main Features:      
-- ArrayLists / LinkedLists / CopyOnWriteLists
-- HashSets/Maps (Linked & HashControl)
-- TreeSets/Maps (RB & AVL)
-- EnumMaps
+- ArrayLists / LinkedLists
+- HashSet/Map (Linked & HashControl)
+- TreeSet/Map (RB & AVL)
+- EnumMap
 - Immutable Maps/Lists/Sets
-- ConcurrentHashMaps
-- Priority Queues
-- Streams & Functional Queries
-- Split/Iterators
+- Priority Queue
+- Streams
+- SplitIterators
+- Iterators
 - Pairs
-- Unary/Functions
-- Suppliers
-- Bi/Consumers
-- AsyncBuilders  
 
+## Specialized Functions
+New Specialized functions that were added to increase performance or reduce allocations or Quality Of life.
+To highlight things that may be wanted.
+- Iterable:
+	- map/flatMap/arrayFlatMap: A Light weight version of Stream.map()
+	- findFirst: Allows to find the first element of a Predicated Iterable.
+	- filter: Allows to filter unwanted elements for wrapped Iterable
+	- matchAny/matchNone/matchAll: Allows to find elements in a collection.
+	- forEach: Allows to input a second element into a forEach move allowing for more flexibility for Method References
+- Collection:
+	- containsAny: Allows to test if another collection contains an of the elements of the tested collection.
+	- primitiveStream: Provides access to the closest Java Stream Type.
+- List:
+	- add/get/removeElements (From FastUtil): Allows to add/get/remove an Array into/from a list. Just with less overhead
+	- extractElements: Allows to remove a Range of elements from the List and get what was removed.
+	- Unstable Sort(From FastUtil): Uses a faster but not stable sort (Quick-Sort as example) to sort the list.
+- SortedSet:
+	- addAndMoveToFirst/Last (From FastUtil but moved to Interface): Allows to add a element to the first/last position of a sorted set.
+	- moveToFirst/Last: Moves the desired element at the first/last position of the SortedSet.
+	- pollFirst/Last: Allows to poll the first/last element of the set.
+- Map:
+	- putAll: putAll but in Array form.
+	- putAllIfAbsent: Puts only the elements that are absent.
+	- addTo (Only Primitives Values) (From FastUtil but moved to Interface): allows to add to the value of a given key. If not present it will be added. (Accumulator)
+	- addToAll: Same as addTo but bulkVersion.
+	- removeOrDefault: removes a Element and if not present returns the default value instead of the present value.
+	- mergeAll: BulkVersion of Merge function.
+- Sorted Map:
+	- addAndMoveToFirst/Last (From FastUtil but moved to Interface): Allows to add a element to the first/last position of a sorted Map.
+	- moveToFirst/Last: Moves the desired element at the first/last position of the Map.
+	- getAndMoveToFirst/Last: gets the element and moves it to the first/last position. Replicating a Optional LinkedHashMap feature.
+	- pollFirst/LastKey: Allows to poll the first/last element.
+	- first/LastValue: Allows to get the first/last value from the Map.
+	
+	
 # Notes about Versions
 Any 0.x.0 version (Minor) can be reason for massive changes including API.     
 To ensure that problems can be dealt with even if it is breaking the current API.     
+Any breaking changes will be Documented (once 1.0 is released)     
 
 # How to install
-Using Jitpack Gradle
-```groovy
+Using Gradle:
+```gradle
 repositories {
     maven {
-        url = "https://jitpack.io"
+        url = "https://maven.speiger.com/repository/main"
     }
 }
 dependencies {
-	implementation 'com.github.Speiger:Primitive-Collections:0.9.0'
+	compile 'de.speiger:Primitive-Collections:0.4.0'
 }
 ```
+Direct:
 
-Using Maven Central
-```groovy
-dependencies {
-	implementation 'io.github.speiger:Primitive-Collections:0.9.0'
-}
-```
-
-# SourceCode
-The generated Sourcecode can be automatically build,    
-but if you want to just browse around in it.    
-Check out the [Debug Branch](https://github.com/Speiger/Primitive-Collections/tree/debug/src/main/java/speiger/src/collections), which has the entire up to date code.
+| Version 	| Jar                                                                                                                          	| Sources                                                                                                                              	| Java Doc                                                                                                                             	|
+|---------	|------------------------------------------------------------------------------------------------------------------------------	|--------------------------------------------------------------------------------------------------------------------------------------	|--------------------------------------------------------------------------------------------------------------------------------------	|
+| 0.4.0   	| [Download](https://maven.speiger.com/repository/main/de/speiger/Primitive-Collections/0.4.0/Primitive-Collections-0.4.0.jar) 	| [Download](https://maven.speiger.com/repository/main/de/speiger/Primitive-Collections/0.4.0/Primitive-Collections-0.4.0-sources.jar) 	| [Download](https://maven.speiger.com/repository/main/de/speiger/Primitive-Collections/0.4.0/Primitive-Collections-0.4.0-javadoc.jar) 	|
+| 0.3.6   	| [Download](https://maven.speiger.com/repository/main/de/speiger/Primitive-Collections/0.3.6/Primitive-Collections-0.3.6.jar) 	| [Download](https://maven.speiger.com/repository/main/de/speiger/Primitive-Collections/0.3.6/Primitive-Collections-0.3.6-sources.jar) 	| [Download](https://maven.speiger.com/repository/main/de/speiger/Primitive-Collections/0.3.6/Primitive-Collections-0.3.6-javadoc.jar) 	|
+| 0.3.5   	| [Download](https://maven.speiger.com/repository/main/de/speiger/Primitive-Collections/0.3.5/Primitive-Collections-0.3.5.jar) 	| [Download](https://maven.speiger.com/repository/main/de/speiger/Primitive-Collections/0.3.5/Primitive-Collections-0.3.5-sources.jar) 	| [Download](https://maven.speiger.com/repository/main/de/speiger/Primitive-Collections/0.3.5/Primitive-Collections-0.3.5-javadoc.jar) 	|
+| 0.3.4   	| [Download](https://maven.speiger.com/repository/main/de/speiger/Primitive-Collections/0.3.4/Primitive-Collections-0.3.4.jar) 	| [Download](https://maven.speiger.com/repository/main/de/speiger/Primitive-Collections/0.3.4/Primitive-Collections-0.3.4-sources.jar) 	| [Download](https://maven.speiger.com/repository/main/de/speiger/Primitive-Collections/0.3.4/Primitive-Collections-0.3.4-javadoc.jar) 	|
+| 0.3.3   	| [Download](https://maven.speiger.com/repository/main/de/speiger/Primitive-Collections/0.3.3/Primitive-Collections-0.3.3.jar) 	| [Download](https://maven.speiger.com/repository/main/de/speiger/Primitive-Collections/0.3.3/Primitive-Collections-0.3.3-sources.jar) 	| [Download](https://maven.speiger.com/repository/main/de/speiger/Primitive-Collections/0.3.3/Primitive-Collections-0.3.3-javadoc.jar) 	|
 
 # Contributing
 If you want to contribute.      
@@ -83,11 +94,12 @@ Please if you want to contribute follow the [Rule-Sheet](RuleSheet.md). It keeps
 # How to Build
 
 The SourceCode can be generated via:     
-```
 /gradlew.bat generateSource      
-```
 
-to generate SourceCode and build the jar:           
-```
+to build the jar:           
 /gradlew.bat build      
-```
+do not combine the commands because they can not be executed at the same time.      
+
+## Current Down Sides (Random order)
+- Testing for Sub Maps/Sets/Lists are only in a very basic way tested
+- Documentation is only present at the lowest level for most cases and needs a typo fixing.

SECURITY.md

@@ -1,15 +0,0 @@
-# Security Policy
-
-## Supported Versions
-
-Due to how the releases work, only the latest versions will be supported.
-
-## Reporting a Vulnerability
-
-If you have discovered a security vulnerability in this project, please report it privately.     
-**Please refrain from posting in public issues.**     
-This gives me time to process issues that are being found, and reduces the possiblity of abuse while patches are being created.   
-Please disclose it [here](https://github.com/Speiger/Primitive-Collections/security/advisories/new).
-
-Please consider that this project is developed by a single person.    
-So please provide a reasonable timeframe when reporting.    

build.gradle

@@ -1,48 +1,61 @@
-plugins {
-    id 'java-library'
-    id "jacoco"
-//	id "com.vanniktech.maven.publish" version "0.28.0"
-}
-
-tasks.withType(JavaCompile) {
-    options.encoding = 'UTF-8'
+buildscript {
+	def config = new Properties()
+	file('build.properties').withInputStream(config.&load)
+	project.ext.config = config
 }
 
 apply plugin: 'java'
 apply plugin: 'eclipse'
-apply plugin: 'maven-publish'
-apply plugin: 'signing'
+apply plugin: 'maven'
 
 repositories {
     mavenCentral()
+	google()
+
     maven {
         url = "https://maven.speiger.com/repository/main"
     }
 }
 
-archivesBaseName = 'Primitive Collections'
-version = RELEASE_VERSION;
-
-sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = JavaVersion.current();
-
-System.out.println("Java Version: "+compileJava.sourceCompatibility)
-
-java {
-	withJavadocJar()
-    withSourcesJar()
-}
+archivesBaseName = config.project_name
+version = config.project_version
+group = config.project_group
+sourceCompatibility = config.java_source_version
+targetCompatibility = config.java_target_version
 
 javadoc {
-    options.tags = [ "implSpec", "note" ] 
+    options.tags = [ "implSpec", "note" ]
+	failOnError = false
+	options.memberLevel = JavadocMemberLevel.PUBLIC
+	options.quiet()
 }
 
 eclipse {
 	classpath {
 		downloadJavadoc = true
 		downloadSources = true
+
+		file {
+			whenMerged {
+				//Enforce a custom container and allowing access to the sun.misc package which is nessesary for EnumMaps
+				entries.find{ it.kind == 'con' && it.path.startsWith('org.eclipse.jdt')}.path = 'org.eclipse.jdt.launching.JRE_CONTAINER';
+			}
+		}
 	}
 }
 
+tasks.withType(JavaCompile) {
+	sourceCompatibility = config.java_source_version
+	targetCompatibility = config.java_target_version
+	options.encoding = 'UTF-8'
+}
+
+compileJava {
+    options.compilerArgs << '-XDignore.symbol.file'
+    options.fork = true
+    options.forkOptions.executable = 'javac' // may not needed on 1.8
+}
+
 sourceSets {
     builder
 }
@@ -52,11 +65,12 @@ configurations {
 }
 
 dependencies {
-	builderImplementation 'com.google.code.gson:gson:2.10'
-	builderImplementation 'de.speiger:Simple-Code-Generator:1.3.0'
+	implementation group: 'org.jetbrains', name: 'annotations', version: config.annotations_version
+
+	builderCompile group: 'de.speiger', name: 'Simple-Code-Generator', version: config.scg_version
+	runtimeOnly group: 'de.speiger', name: 'Simple-Code-Generator', version: config.scg_version
+
     testImplementation 'junit:junit:4.12'
-    testImplementation 'com.google.guava:guava-testlib:31.0.1-jre'
-    
 }
 
 task generateSource(type: JavaExec) {
@@ -66,213 +80,46 @@ task generateSource(type: JavaExec) {
  	main = 'speiger.src.builder.PrimitiveCollectionsBuilder'
 }
 
-task generateGithubSource(type: JavaExec) {
-	group = 'internal'
-	description = 'Builds the sourcecode for Github Actions'
- 	classpath = sourceSets.builder.runtimeClasspath
- 	main = 'speiger.src.builder.PrimitiveCollectionsBuilder'
- 	args = ['silent']
-}
-
 task forceGenerateSource(type: JavaExec) {
 	group = 'internal'
 	description = 'Builds the sourcecode forceful'
  	classpath = sourceSets.builder.runtimeClasspath
  	main = 'speiger.src.builder.PrimitiveCollectionsBuilder'
- 	args = ['force']
+ 	args = ['true']
 }
 
-task generateTestSource(type: JavaExec) {
-	group = 'internal'
-	description = 'Builds the sourcecode for the Tests'
- 	classpath = sourceSets.builder.runtimeClasspath
- 	main = 'speiger.src.builder.PrimitiveCollectionsBuilder'
- 	args = ['tests', 'silent']
+task javadocJar(type: Jar) {
+    from javadoc
+    classifier = 'javadoc'
 }
 
-task forceGenerateTestSource(type: JavaExec) {
-	group = 'internal'
-	description = 'Builds the sourcecode for the Tests'
- 	classpath = sourceSets.builder.runtimeClasspath
- 	main = 'speiger.src.builder.PrimitiveCollectionsBuilder'
- 	args = ['tests', 'silent', 'force']
+task srcJar(type: Jar) {
+    from sourceSets.main.allSource
+    classifier = 'sources'
 }
 
-task generateLimitSource(type: JavaExec) {
-	group = 'internal'
-	description = 'Builds the Sourcecode with the ModuleSettings.json applied'
- 	classpath = sourceSets.builder.runtimeClasspath
- 	main = 'speiger.src.builder.PrimitiveCollectionsBuilder'
- 	args = ['silent', 'load']
-}
-
-compileJava.dependsOn generateGithubSource
-
-javadoc.failOnError = false
-javadoc.options.memberLevel = JavadocMemberLevel.PUBLIC
-javadoc.options.quiet()
-
-
-task testBooleans(type: Test) {
-	group 'tests'
-	description 'Tests all Boolean Collections'
-	filter {
-		excludeTestsMatching "speiger.src.testers.**.*"
-		includeTestsMatching "speiger.src.tests.booleans.**.*"
-	}
-	useJUnit()
-	ignoreFailures = true
-	maxHeapSize = maxMemory
-}
-
-task testBytes(type: Test) {
-	group 'tests'
-	description 'Tests all Byte Collections'
-	filter {
-		excludeTestsMatching "speiger.src.testers.**.*"
-		includeTestsMatching "speiger.src.tests.bytes.**.*"
-	}
-	useJUnit()
-	ignoreFailures = true
-	maxHeapSize = maxMemory
-	maxParallelForks = testThreads as Integer
-}
-
-task testShorts(type: Test) {
-	group 'tests'
-	description 'Tests all Short Collections'
-	filter {
-		excludeTestsMatching "speiger.src.testers.**.*"
-		includeTestsMatching "speiger.src.tests.shorts.**.*"
-	}
-	useJUnit()
-	ignoreFailures = true
-	maxHeapSize = maxMemory
-	maxParallelForks = testThreads as Integer
-}
-
-task testChars(type: Test) {
-	group 'tests'
-	description 'Tests all Character Collections'
-	filter {
-		excludeTestsMatching "speiger.src.testers.**.*"
-		includeTestsMatching "speiger.src.tests.chars.**.*"
-	}
-	useJUnit()
-	ignoreFailures = true
-	maxHeapSize = maxMemory
-	maxParallelForks = testThreads as Integer
-}
-
-task testInts(type: Test) {
-	group 'tests'
-	description 'Tests all Int Collections'
-	filter {
-		excludeTestsMatching "speiger.src.testers.**.*"
-		includeTestsMatching "speiger.src.tests.ints.**.*"
-	}
-	useJUnit()
-	ignoreFailures = true
-	maxHeapSize = maxMemory
-	maxParallelForks = testThreads as Integer
-}
-
-task testLongs(type: Test) {
-	group 'tests'
-	description 'Tests all Long Collections'
-	filter {
-		excludeTestsMatching "speiger.src.testers.**.*"
-		includeTestsMatching "speiger.src.tests.longs.**.*"
-	}
-	useJUnit()
-	ignoreFailures = true
-	maxHeapSize = maxMemory
-	maxParallelForks = testThreads as Integer
-}
-
-task testFloats(type: Test) {
-	group 'tests'
-	description 'Tests all Float Collections'
-	filter {
-		excludeTestsMatching "speiger.src.testers.**.*"
-		includeTestsMatching "speiger.src.tests.floats.**.*"
-	}
-	useJUnit()
-	ignoreFailures = true
-	maxHeapSize = maxMemory
-	maxParallelForks = testThreads as Integer
-}
-
-task testDoubles(type: Test) {
-	group 'tests'
-	description 'Tests all Double Collections'
-	filter {
-		excludeTestsMatching "speiger.src.testers.**.*"
-		includeTestsMatching "speiger.src.tests.doubles.**.*"
-	}
-	useJUnit()
-	ignoreFailures = true
-	maxHeapSize = maxMemory
-	maxParallelForks = testThreads as Integer
-}
-
-task testObjects(type: Test) {
-	group 'tests'
-	description 'Tests all Object Collections'
-	filter {
-		excludeTestsMatching "speiger.src.testers.**.*"
-		includeTestsMatching "speiger.src.tests.objects.**.*"
-	}
-	useJUnit()
-	ignoreFailures = true
-	maxHeapSize = maxMemory
-	maxParallelForks = testThreads as Integer
-}
-
-if(System.getProperty("full_test_suite", "false").toBoolean()) {
-	test.dependsOn testBooleans
-	test.dependsOn testBytes
-	test.dependsOn testShorts
-	test.dependsOn testChars
-	test.dependsOn testInts
-	test.dependsOn testLongs
-	test.dependsOn testFloats
-	test.dependsOn testDoubles
-	test.dependsOn testObjects
+artifacts {
+    archives javadocJar
+    archives srcJar
 }
 
 test {
-	filter {
-		excludeTestsMatching "speiger.src.testers.**.*"
-		excludeTestsMatching "speiger.src.tests.**.*"
-		excludeTestsMatching "tests.**.*"
-	}
-	useJUnit()
-	ignoreFailures = true
-	maxHeapSize = maxMemory
+    useJUnit()
 }
 
-jacocoTestReport {
-    executionData fileTree(project.buildDir.absolutePath).include("jacoco/*.exec")
-    reports {
-        xml.required = true
-        html.required = true
-        csv.required = true
-    }
-}
-
-
-publishing {
-	publications {
-		personal(MavenPublication) {
-			pom {
-				name = 'Primitive Collections'
-				description = 'A Primitive Collection library that reduces memory usage and improves performance'
-				url = 'https://github.com/Speiger/Primitive-Collections'
-				version = project.version
-				artifactId = project.archivesBaseName.replace(" ", "-")
-				groupId = 'de.speiger'
-				from components.java
+uploadArchives {
+	repositories.mavenDeployer {
+		repository(url: 'https://maven.speiger.com/repository/main') {
+			authentication(userName: project.properties.mavenUser, password: project.properties.mavenPassword)
+		}
+		snapshotRepository(url: 'https://maven.speiger.com/repository/main') {
+			authentication(userName: project.properties.mavenUser, password: project.properties.mavenPassword)
+		}
+		pom {
+			version = project.version
+			artifactId = config.artifact_id
+			groupId = config.artifact_group
+			project {
 				licenses {
 					license {
 						name = 'The Apache License, Version 2.0'
@@ -283,97 +130,10 @@ publishing {
 					developer {
 						id = 'speiger'
 						name = 'Speiger'
+						email = 'speiger@gmx.net'
 					}
 				}
-				scm {
-					url = 'https://github.com/Speiger/Primitive-Collections'
-				}
-				issueManagement {
-					system = 'github'
-					url = 'https://github.com/Speiger/Primitive-Collections/issues'
-				}
 			}
 		}
 	}
-	repositories {
-		maven {
-			name = "Speiger_Maven"
-			def auth = System.getenv("Speiger_Maven_Auth")?.split(';');
-			url version.endsWith('SNAPSHOT') ? "https://maven.speiger.com/repository/debug" : "https://maven.speiger.com/repository/main"
-			credentials(PasswordCredentials) {
-				username auth?[0]
-				password auth?[1]
-			}
-		}
-	}
-}
-
-tasks.withType(PublishToMavenRepository) {
-    def predicate = provider {
-        (repository == publishing.repositories.mavenCentral && publication == publishing.publications.maven) ||
-        (repository != publishing.repositories.mavenCentral && publication != publishing.publications.maven)
-    }
-    onlyIf("publishing binary to the external repository, or binary and sources to the internal one") {
-        predicate.get()
-    }
-}
-
-tasks.withType(PublishToMavenLocal) {
-    def predicate = provider {
-        publication == publishing.publications.personal
-    }
-    onlyIf("publishing binary and sources") {
-        predicate.get()
-    }
-}
-
-//Maven central Start
-//Disabling due to java8 incompat, only needed to manually publishing anyways
-
-//signing.useGpgCmd()
-//
-//import com.vanniktech.maven.publish.SonatypeHost
-//import com.vanniktech.maven.publish.JavaLibrary
-//import com.vanniktech.maven.publish.JavadocJar
-//
-//mavenPublishing {
-//  configure(new JavaLibrary(new JavadocJar.None(), true))
-//}
-//
-//mavenPublishing {
-//    publishToMavenCentral(SonatypeHost.CENTRAL_PORTAL)
-//
-//    signAllPublications()
-//    pom {
-//		name = 'Primitive Collections'
-//		description = 'A Primitive Collection library that reduces memory usage and improves performance'
-//		url = 'https://github.com/Speiger/Primitive-Collections'
-//		version = project.version	
-//		group = 'io.github.speiger'
-//        licenses {
-//            license {
-//				name = 'The Apache License, Version 2.0'
-//				url = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
-//            }
-//        }
-//
-//        developers {
-//			developer {
-//				id = 'speiger'
-//				name = 'Speiger'
-//			}
-//        }
-//
-//        scm {
-//            connection = 'scm:git:git://github.com/Speiger/Primitive-Collections.git'
-//            developerConnection = 'scm:git:ssh://github.com:Speiger/Primitive-Collections.git'
-//            url = 'https://github.com/Speiger/Primitive-Collections'
-//        }
-//                
-//        issueManagement {
-//			system = 'github'
-//			url = 'https://github.com/Speiger/Primitive-Collections/issues'
-//		}
-//    }
-//}
-//
+}

build.properties

@@ -0,0 +1,13 @@
+project_name=PrimitiveCollections
+project_id=primitivecollections
+project_group=speiger.src.collections
+project_version=0.4.0
+
+artifact_group=de.speiger
+artifact_id=Primitive-Collections
+
+java_source_version=11
+java_target_version=8
+annotations_version=22.0.0
+
+scg_version=1.0.4

features.md

@@ -1,402 +0,0 @@
-## Quality Of Life Features
-New Specialized functions/classes that were added to increase performance and/or reduce allocations and/or for Quality of life.  
-
-
-# Functions
-
-Functions that increase performance or are quality of life in their nature.   
-
-<details>
-<summary>Iterable</summary>
-<p>
-
-## Functional Functions
-
-Java adds themselves a lot of functional functions like,  
-- Stream:
-	- Map/FlatMap
-	- Filter/Distinct/Limit/Sorted
-	- Count/FindFirst/Collect
-	- Peek/ForEach/Reduce
-	- anyMatch/allMatch/NoneMatch   
-
-that allows to process a collection in a functional way.   
-But these require streams which have a lot of Overhead in their nature.    
-
-Luckly Primitive Collections adds replacement functions that provide the same functionality but with minimal overhead.   
-Here are some examples:
-```java
-public ObjectIterable<Path> toPath(ObjectIterable<String> iterable) {
-	return iterable.map(Paths::get).filter(Files::exist);
-}
-
-public Iterable<Path> toPath(Iterable<String> iterable) {
-	return ObjectIterables.map(iterable, Paths::get).filter(Files::exist);
-}
-
-public int sum(IntIterable iterable) {
-	return iterable.reduce(Integer::sum);
-}
-```
-
-## AsyncAPI</summary>
-
-The AsyncAPI is a Feature that simplifies the processing of Collections on a separate thread.   
-It uses the same concept as Javas Stream API but uses the light weight Functions from Primitive Collections to achieve the same thing.   
-Unlike Javas StreamAPI the AsyncAPI is always singleThreaded and more like Javas CompletableFuture, which you can await or let run Asynchronous.    
-
-The Goal is it to simplify the processing of Collections asynchronous.   
-Especially on tasks which don't have to be finished instantly but can be processed on the side.   
-
-Here is a example of how the API works.
-```java
-public void processFiles(ObjectCollection<String> potentialFiles) {
-     potentialFiles.asAsync()
-         .map(Paths::get).filter(Files::exists) //Modifies the collection (Optional)
-         .forEach(Files::delete) //Creates the action (Required)
-         .callback(T -> {}} //Callback on completion, still offthread (Optional)
-         .execute() //Starts the task. (Required)
-}
-```
-</p>
-</details>
-<details>
-<summary>Collection</summary>
-<p>
-
-These are functions specific to the Collections interface, stuff that everyone wished it was present to be in the first place.
-
-## AddAll (Array)
-Adding Elements to a Collection usually requires either a for loop or a Arrays.wrap().   
-This isn't an issue with Primitive Collections.
-```java
-public void addMonths(ObjectCollection<String> months) {
-	months.addAll("January", "February", "March", "April", "May", "June", "July", "August", "September, "October", November", "December");
-}
-
-public void addElements(ObjectCollection<String> result, String[] elements) {
-	result.addAll(elements, 0, 5); //elements, offset, length
-}
-```
-
-## containsAny
-Everyone hates comparing if 2 collections have part of each other included.   
-The solution usually requires for loops and keeping track if things were found or not.   
-And every Java Developer had this issue at least once and wished for a clean solution.
-```java
-public boolean hasMonths(ObjectCollection<Month> target, Collection<Month> toFind) {
-	return target.containsAny(toFind);
-}
-```
-
-## Copy
-Collections get copied every now and then. There is only 2 ways that this happens.  
-Javas Clone API or using Constructor that supports collections.  
-Javas Clone API is kinda in a Zombie state, where it is supported or not. Its not really clear if you should use it or not.  
-The Clone CloneNotSupportedException isn't helping either, causing more janky code.  
-While a Constructor can only support so much and testing for every case isn't really viable.  
-
-So the decision was made to straight out not support clone and instead add a copy function which doesn't use a checked exception.  
-It works exactly like the clone function. In a sense where it creates a shallow copy. (SubCollections do not work for obvious reasons)
-```java
-public IntCollection copy(IntCollection original) {
-	return original.copy();
-}
-```
-
-## Primitive Streams
-Since Javas Stream API is still really useful, even at its shortcomings, Primitive Collections provides easy access to it.  
-Generic Streams and the closest Primitive Stream will be provided. So a FloatCollection goes to a DoubleStream.
-```java
-public IntStream createStream(IntCollection source) {
-	return source.primitiveStream();
-}
-```
-
-## RemoveAll/RetainAll with listener
-Ever wanted use removeAll or retainAll and wanted to know what elements actually got deleted?  
-The usual solution is to create a copy and then apply it to the original and cross reference them.  
-Which leads to really messy code and just hasn't a clean solution.  
-Luckly Primitive Collections got you covered.
-```java
-public void removeInvalidFiles(ObjectCollections<Path> files, ObjectCollection<Path> toRemove) {
-	files.removeAll(toRemove, T -> System.out.println(T));
-}
-
-public void removeInvalidFiles(ObjectCollections<Path> files, ObjectCollection<Path> toKeep) {
-	files.retainFiles(toKeep, T -> System.out.println(T));
-}
-```
-
-## ToArray 
-Primitive Collections supports primitive/generic toArray functions for its Primitive Collections.  
-On top of that the Object side gets a Java9 function ported back to java8, which uses a functional Interface to create the backing array.
-```java
-public Integer[] toArray(IntCollection c) {
-	return c.toArray(new Integer[c.size]);
-}
-
-public int[] toArray(IntCollection c) {
-	return c.toIntArray();
-}
-
-public String[] toArray(ObjectCollection<String> c) {
-	return c.toArray(String::new);
-}
-```
-</p>
-</details>
-
-<details>
-<summary>List</summary>
-<p>
-
-These functions are List specific functions, a couple of these are from FastUtil.
-
-## add/get/remove/extractElements
-These functions really useful helper functions. 3 of which are copied from FastUtil. (extract is from Primitive Collections)  
-They are basically array forms of addAll, getAll, removeRange and removeAndGetRange. This is the simplest way to describe it.  
-
-Here some example:
-```java
-public void addAll(DoubleList list) {
-	list.addElements(0D, 12.2D, 3.5D, 4.2D);
-}
-
-public double[] getAll(DoubleList list, int amount) {
-	double[] result = new double[amount];
-	list.getElements(0, result);
-	return result;
-}
-
-public void removeRange(FloatList list) {
-	list.removeElements(5, 14);
-}
-
-public float[] extractRange(FloatList list) {
-	return list.extractElements(5, 14); //Returns the removed elements
-}
-```
-
-## addIfPresent/addIfAbsent
-These two functions are simple helper functions that check internally if a element is present or absent before adding them to the List.   
-Removing the need for a contains or indexOf check every time you want to add a element.
-While it is of course better to use a set, there is cases where this is still useful.
-
-```java
-public void addElements(IntList list, int... numbersToAdd) {
-	for(int e : numbersToAdd) {
-		list.addIfAbsent(e);
-	}
-}
-
-public void addExisting(ObjectList<String> list, String... textToAdd) {
-	for(String s : textToAdd) {
-		list.addIfPresent(s);
-	}
-}
-```
-
-## SwapRemove
-Lists when removing a Element shift usually the backing array to the left based to shrink the elements.  
-While that isn't computational expensive with LinkedLists, it is with ArrayLists.  
-Here comes swapRemove into play, which just removes the desired elements and instead of shifting left puts the last element in its place.
-This reduces the data copying required down to 1 element instead of an array.
-
-```java
-public int remove(IntList elements, int indexToRemove) {
-	return elements.swapRemove(indexToRemove);
-}
-```
-
-## Unstable Sort (From FastUtil)
-Unstable Sort uses a Faster but not as stable sorting algorithm to sort the Collection.  
-Stable doesn't mean crashing, but more like that the result isn't exactly perfectly sorted.  
-```java
-public void sort(List<Month> list, Comparator<Month> sorter) {
-	list.unstableSort(sorter);
-}
-```
-</p>
-</details>
-
-<details>
-<summary>Map</summary>
-<p>
-
-These functions are based on the Map interface. Useful functions you really would want.  
-
-## addTo/subFrom
-addTo (from FastUtil) and subFrom are mathematically functions that either add or subtract from the value of a given key.   
-And if the key isn't present or would result in the default value it will either add or remove the entry from the Map. Given the circumstance.   
-This is a really useful function and I wish FastUtil made it accessible by default but sadly it isn't.   
-To simplify the explanation:    
-- addTo if no element is present puts in the desired number, otherwise it sums up the two values.   
-- subFrom if a element is present subtracts from it, if the element reaches the default value it removes the element from the map. If not present it will be ignored.   
-```java
-public void addTo(Object2DoubleMap<Month> map, Month key, double averageTrainsRepaired) {
-	map.addTo(key, averageTrainsRepaired);
-}
-
-public void subFrom(Long2IntMap map, long key, double amount) {
-	map.subFrom(key, amount);
-}
-```
-
-## addToAll
-Simple bulk version of the addTo function since sometimes you want to merge 2 maps for summing.  
-Especially if your work is multi-threaded this can become useful.
-
-```java
-public void addTo(Object2DoubleMap<Month> map, Object2DoubleMap<Month> trainsRepaired) {
-	map.addToAll(trainsRepaired);
-}
-```
-
-## mergeAll
-This is a simple bulk version of merge since merging 2 maps is more frequent then people might think and leads to cleaner code too.
-```java
-public void merge(Long2ByteMap result, Long2ByteMap toMerge) {
-	result.mergeAll(toMerge);
-}
-```
-
-## putAll (Array)
-This allows to put keys and values as arrays instead of requiring a WrapperMap to insert the elements.  
-Not as useful as the Collections.addAll variant but still really useful.
-```java
-public void putAll(Int2DoubleMap map, int[] keys, double[] values) {
-	map.put(keys, values, 2, 15);
-}
-```
-
-## putAllIfAbsent
-putAll has this usual quirk where if a element is present it will replace the value, and sometimes this is not wanted.  
-While putIfAbsent exists it has no real mass form and makes iterative solutions really uneasy to use.  
-Here comes the helper function that gets rid of that problem.
-```java
-public void merge(Long2ObjectMap<String> regionFiles, Long2ObjectMap<String> toAdd) {
-	regionFiles.putAllIfAbsent(toAdd);
-}
-```
-
-## removeOrDefault
-getOrDefault is a really useful function that find use cases all the time.   
-Sadly by default there is no variant of removeOrDefault, while it has less cases still could be used every now and then.  
-This function basically tries to remove a element, if it is not present it will just return your desired default.
-```java
-public Path removeCache(Long2ObjectMap<Path> caches, long key) {
-	return caches.removeOrDefault(key, Paths.get("nuclearFun"));
-}
-```
-
-## supplyIfAbsent
-This one is one of my favorites. computeIfAbsent is a really useful function.   
-But in 90% of the cases I use it the value is a collection.  
-This becomes really annoying since methodReferences are faster/cleaner then Lambdas in my opinion.  
-supplyIfAbsent is basically computeIfAbsent but without a key, perfect for the default constructor of a collection.  
-This is the whole reason it exists.  
-```java
-public void example(Int2ObjectMap<List<String>> map, Int2ObjectMap<String> toAdd) {
-	for(Entry<String> entry : toAdd.entrySet()) {
-		map.supplyIfAbsent(entry.getKey(), ObjectArrayList::new).add(entry.getValue());
-	}
-}
-```
-</p>
-</details>
-
-# Interfaces
-
-Interfaces that provide essential or quality of life features.
-
-<details>
-<summary>ITrimmable</summary>
-<p>
-
-The ITrimmable is Accessor interface that allows you to access a couple helper functions to control the size of your collections.  
-This was created for the constant casting requirement to implementations just to shrink collections which get annoying over time.  
-
-## trim
-This function basically trims down the backing implementation to use as little memory as required to store the elements in the collection.  
-Optionally a desired minimum size can be provided as of how low it should go at worst.  
-
-## clearAndTrim
-when you want to reset a Collection completely you have 2 options. Clear it and then call trim, or recreate the collection.  
-clearAndTrim solves this problem by clearing the collection and trimming it in one go, reducing overhead to achieve such a thing.  
-
-</p>
-</details>
-
-<details>
-<summary>IArray</summary>
-<p>
-
-IArray is a Accessor interface that provides more access to collections by providing tools to grow your collection as needed.  
-While putAll/addAll try to ensure that you have enough room for your elements, this is not really a solution for all cases.  
-Sometimes you need to ensure the Collection is pre-initialized.  
-IArray grants you that control.  
-
-There is also a type specific that provides you access to the backing array implementation of Lists for faster Iteration but that is a really specific case.  
-
-## ensureCapacity
-Ensures that your collection has enough storage for the elements you want to insert.  
-
-## elements (ITypeSpecificArray)
-Allows you access to the backing array of a List which is for people who know what they are doing.  
-There is a lambda version of this function too which makes sure for synchronizedLists that you are the only one accessing the array.  
-
-</p>
-</details>
-
-<details>
-<summary>OrderedMap</summary>
-<p>
-
-The OrderedMap is a real edge case interface that was born for a need.    
-FastUtil added functions that were like moveToFirst which were hardcoded to the implementation.  
-They didn't fit into something like a SortedMap because the Set wasn't sorted.  
-So OrderedMap was born, which isn't random but ordered in a specific way that can be changed.  
-
-## getAndMoveToFirst/getAndMoveToLast
-Returns a desired element and removing it to the first/last spot in the Map. Moving the element that was at its spot after/before it.  
-
-## moveToFirst/moveToLast
-Moves the element if present to the first/last spot in the Map. Moving the element that was at its spot after/before it.  
-Returns true if the element was actually moved.  
-
-## putAndMoveToFirst/putAndMoveToLast
-Adds the desired element and moves it to first/last spot in the Map. Moving the element that was at its spot after/before it.  
-
-## firstKey/lastKey (Optional poll)
-Provides access to the current first/last key of the Map.  
-Optionally can be polled if desired.  
-
-## firstValue/lastValue
-Provides access to the current first/last value of the Map.  
-
-</p>
-</details>
-
-<details>
-<summary>OrderedSet</summary>
-<p>
-
-The OrderedSet is a real edge case interface that was born for a need.    
-FastUtil added functions that were like moveToFirst which were hardcoded to the implementation.  
-They didn't fit into something like a SortedSet because the Set wasn't sorted.  
-So OrderedSet was born, which isn't random but ordered in a specific way that can be changed.  
-
-## addAndMoveToFirst/addAndMoveToLast
-Adds the desired element and moves it to first/last spot in the Collection. Moving the element that was at its spot after/before it.  
-
-## moveToFirst/moveToLast
-Moves the element if present to the first/last spot in the Collection. Moving the element that was at its spot after/before it.  
-Returns true if the element was actually moved.  
-
-## first/last (Optional poll)
-Provides access to the current first/last element of the set.  
-Optionally can be polled if desired.
-
-</p>
-</details>

gradle.properties

@@ -1,6 +0,0 @@
-org.gradle.jvmargs=-Xmx3G
-
-maxMemory = 1024m
-testThreads = 4
-
-RELEASE_VERSION = 0.9.0

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.0-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists

jitpack.yml

@@ -1,6 +0,0 @@
-jdk:
-   - openjdk9
-install:
-   - chmod +x ./gradlew
-   - ./gradlew build publishToMavenLocal
-   

src/builder/java/speiger/src/builder/ClassType.java

@@ -3,15 +3,15 @@ package speiger.src.builder;
 @SuppressWarnings("javadoc")
 public enum ClassType
 {
-	BOOLEAN("boolean", "Boolean", "Boolean", "booleans", "BOOLEAN", "false", "false"),
-	BYTE("byte", "Byte", "Byte", "bytes", "BYTE", "(byte)0", "(byte)-1"),
-	SHORT("short", "Short", "Short", "shorts", "SHORT", "(short)0", "(short)-1"),
-	CHAR("char", "Character", "Char", "chars", "CHAR", "(char)0", "(char)-1"),
-	INT("int", "Integer", "Int", "ints", "INT", "0", "-1"),
-	LONG("long", "Long", "Long", "longs", "LONG", "0L", "-1L"),
-	FLOAT("float", "Float", "Float", "floats", "FLOAT", "0F", "-1F"),
-	DOUBLE("double", "Double", "Double", "doubles", "DOUBLE", "0D", "-1D"),
-	OBJECT("T", "T", "Object", "objects", "OBJECT", "null", "null");
+	BOOLEAN("boolean", "Boolean", "Boolean", "booleans", "BOOLEAN", "false"),
+	BYTE("byte", "Byte", "Byte", "bytes", "BYTE", "(byte)0"),
+	SHORT("short", "Short", "Short", "shorts", "SHORT", "(short)0"),
+	CHAR("char", "Character", "Char", "chars", "CHAR", "(char)0"),
+	INT("int", "Integer", "Int", "ints", "INT", "0"),
+	LONG("long", "Long", "Long", "longs", "LONG", "0L"),
+	FLOAT("float", "Float", "Float", "floats", "FLOAT", "0F"),
+	DOUBLE("double", "Double", "Double", "doubles", "DOUBLE", "0D"),
+	OBJECT("T", "T", "Object", "objects", "OBJECT", "null");
 	
 	String keyType;
 	String classType;
@@ -19,9 +19,8 @@ public enum ClassType
 	String pathType;
 	String capType;
 	String emptyValue;
-	String invalidValue;
 	
-	private ClassType(String keyType, String classType, String fileType, String pathType, String capType, String emptyValue, String invalidValue)
+	private ClassType(String keyType, String classType, String fileType, String pathType, String capType, String emptyValue)
 	{
 		this.keyType = keyType;
 		this.classType = classType;
@@ -29,7 +28,6 @@ public enum ClassType
 		this.pathType = pathType;
 		this.capType = capType;
 		this.emptyValue = emptyValue;
-		this.invalidValue = invalidValue;
 	}
 	
 	public String getKeyType()
@@ -52,11 +50,6 @@ public enum ClassType
 		return classType;
 	}
 	
-	public String getClassPath()
-	{
-		return this == OBJECT ? "Object" : classType;
-	}
-	
 	public String getClassType(boolean value) 
 	{
 		return value && this == OBJECT ? "V" : classType;
@@ -97,11 +90,6 @@ public enum ClassType
 		return emptyValue;
 	}
 	
-	public String getInvalidValue()
-	{
-		return invalidValue;
-	}
-	
 	public boolean isObject()
 	{
 		return this == OBJECT;
@@ -114,7 +102,7 @@ public enum ClassType
 	
 	public boolean needsCustomJDKType()
 	{
-		return this == BOOLEAN || this == BYTE || this == SHORT || this == CHAR || this == FLOAT;
+		return this == BYTE || this == SHORT || this == CHAR || this == FLOAT;
 	}
 	
 	public boolean needsCast()
@@ -133,12 +121,6 @@ public enum ClassType
 		}
 	}
 	
-	public String getApply(ClassType other) {
-		if(other == BOOLEAN) return "test";
-		if(other == ClassType.OBJECT) return "apply";
-		return "applyAs"+other.getFileType();
-	}
-	
 	public String getEquals(boolean not)
 	{
 		switch(this)

src/builder/java/speiger/src/builder/GlobalVariables.java

@@ -0,0 +1,433 @@
+package speiger.src.builder;
+
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.function.UnaryOperator;
+
+import speiger.src.builder.mappers.ArgumentMapper;
+import speiger.src.builder.mappers.IMapper;
+import speiger.src.builder.mappers.InjectMapper;
+import speiger.src.builder.mappers.LineMapper;
+import speiger.src.builder.mappers.SimpleMapper;
+import speiger.src.builder.processor.TemplateProcess;
+
+@SuppressWarnings("javadoc")
+public class GlobalVariables
+{
+	List<IMapper> operators = new ArrayList<>();
+	Set<String> flags = new LinkedHashSet<>();
+	ClassType type;
+	ClassType valueType;
+	
+	public GlobalVariables(ClassType type, ClassType subType)
+	{
+		this.type = type;
+		valueType = subType;
+	}
+	
+	public GlobalVariables createVariables()
+	{
+		addSimpleMapper("VALUE_PACKAGE", valueType.getPathType());
+		addSimpleMapper("PACKAGE", type.getPathType());
+		addSimpleMapper("CLASS_TYPE", type.getClassType());
+		addSimpleMapper("CLASS_VALUE_TYPE", valueType.getClassValueType());
+		addSimpleMapper("KEY_TYPE", type.getKeyType());
+		addSimpleMapper("KEY_SPECIAL_TYPE", type.isObject() ? "E" : type.getKeyType());
+		addSimpleMapper("VALUE_TYPE", valueType.getValueType());
+		addSimpleMapper("VALUE_SPECIAL_TYPE", valueType.isObject() ? "E" : valueType.getKeyType());
+		
+		addSimpleMapper("EMPTY_KEY_VALUE", type.getEmptyValue());
+		addSimpleMapper("EMPTY_VALUE", valueType.getEmptyValue());
+		
+		addSimpleMapper(" KEY_GENERIC_TYPE", type.isObject() ? "<"+type.getKeyType()+">" : "");
+		addSimpleMapper(" KEY_KEY_GENERIC_TYPE", type.isObject() ? "<"+type.getKeyType()+", "+type.getKeyType()+">" : "");
+		
+		addSimpleMapper(" VALUE_GENERIC_TYPE", valueType.isObject() ? "<"+valueType.getValueType()+">" : "");
+		addSimpleMapper(" VALUE_VALUE_GENERIC_TYPE", valueType.isObject() ? "<"+valueType.getValueType()+", "+valueType.getValueType()+">" : "");
+		
+		addSimpleMapper(" KEY_VALUE_GENERIC_TYPE", type.isObject() ? (valueType.isObject() ? "<"+type.getKeyType()+", "+valueType.getValueType()+">" : "<"+type.getKeyType()+">") : (valueType.isObject() ? "<"+valueType.getValueType()+">" : ""));
+		addSimpleMapper(" KEY_VALUE_VALUE_GENERIC_TYPE", type.isObject() ? (valueType.isObject() ? "<"+type.getKeyType()+", "+valueType.getValueType()+", "+valueType.getValueType()+">" : "<"+type.getKeyType()+">") : (valueType.isObject() ? "<"+valueType.getValueType()+", "+valueType.getValueType()+">" : ""));
+		
+		addSimpleMapper(" NO_GENERIC_TYPE", type.isObject() ? "<?>" : "");
+		addSimpleMapper(" NO_KV_GENERIC_TYPE", type.isObject() ? (valueType.isObject() ? "<?, ?>" : "<?>") : valueType.isObject() ? "<?>" : "");
+		addSimpleMapper(" KEY_COMPAREABLE_TYPE", type.isObject() ? "<"+type.getKeyType()+" extends Comparable<T>>" : "");
+		
+		addSimpleMapper(" KEY_SUPER_GENERIC_TYPE", type.isObject() ? "<? super "+type.getKeyType()+">" : "");
+		addSimpleMapper(" VALUE_SUPER_GENERIC_TYPE", valueType.isObject() ? "<? super "+valueType.getValueType()+">" : "");
+		addSimpleMapper(" KEY_VALUE_SUPER_GENERIC_TYPE", type.isObject() ? (valueType.isObject() ? "<? super "+type.getKeyType()+", ? super "+valueType.getValueType()+">" : "<? super "+type.getKeyType()+">") : (valueType.isObject() ? "<? super "+valueType.getValueType()+">" : ""));
+		
+		addSimpleMapper(" KEY_ENUM_VALUE_GENERIC_TYPE", type.isObject() ? (valueType.isObject() ? "<"+type.getKeyType()+" extends Enum<"+type.getKeyType()+">, "+valueType.getValueType()+">" : "<"+type.getKeyType()+" extends Enum<"+type.getKeyType()+">>") : (valueType.isObject() ? "<"+valueType.getValueType()+">" : ""));
+		addSimpleMapper(" KEY_VALUE_ENUM_GENERIC_TYPE", type.isObject() ? (valueType.isObject() ? "<"+type.getKeyType()+", "+valueType.getValueType()+" extends Enum<"+valueType.getValueType()+">>" : "<"+type.getKeyType()+">") : (valueType.isObject() ? "<"+valueType.getValueType()+" extends Enum<"+valueType.getValueType()+">>" : ""));
+		
+		addInjectMapper(" KEY_SPECIAL_GENERIC_TYPE", type.isObject() ? "<%s>" : "").removeBraces().setBraceType("<>");
+		addInjectMapper(" VALUE_SPECIAL_GENERIC_TYPE", valueType.isObject() ? "<%s>" : "").removeBraces().setBraceType("<>");
+		addInjectMapper(" KSK_GENERIC_TYPE", type.isObject() ? "<%s, "+type.getKeyType()+">" : "<%s>").removeBraces().setBraceType("<>");
+		addInjectMapper(" KKS_GENERIC_TYPE", type.isObject() ? "<"+type.getKeyType()+", %s>" : "<%s>").removeBraces().setBraceType("<>");
+		addArgumentMapper(" KSS_GENERIC_TYPE", type.isObject() ? "<%1$s, %2$s>" : "<%2$s>").removeBraces().setBraceType("<>");		
+		addInjectMapper(" VSV_GENERIC_TYPE", valueType.isObject() ? "<%s, "+valueType.getValueType()+">" : "<%s>").removeBraces().setBraceType("<>");
+		addInjectMapper(" VVS_GENERIC_TYPE", valueType.isObject() ? "<"+valueType.getValueType()+", %s>" : "<%s>").removeBraces().setBraceType("<>");
+		addArgumentMapper(" VSS_GENERIC_TYPE", valueType.isObject() ? "<%1$s, %2$s>" : "<%2$s>").removeBraces().setBraceType("<>");		
+
+		addSimpleMapper(" GENERIC_KEY_BRACES", type.isObject() ? " <"+type.getKeyType()+">" : "");
+		addSimpleMapper(" GENERIC_VALUE_BRACES", valueType.isObject() ? " <"+valueType.getValueType()+">" : "");
+		addInjectMapper(" GENERIC_SPECIAL_KEY_BRACES", type.isObject() ? " <%s>" : "").removeBraces().setBraceType("<>");
+		addInjectMapper(" GENERIC_SPECIAL_VALUE_BRACES", valueType.isObject() ? " <%s>" : "").removeBraces().setBraceType("<>");
+		
+		addInjectMapper(" GENERIC_KEY_SPECIAL_BRACES", type.isObject() ? " <"+type.getKeyType()+", %s>" : " <%s>").removeBraces().setBraceType("<>");
+		addInjectMapper(" GENERIC_VALUE_SPECIAL_BRACES", valueType.isObject() ? " <"+valueType.getKeyType()+", %s>" : " <%s>").removeBraces().setBraceType("<>");
+		
+		addSimpleMapper(" GENERIC_KEY_VALUE_BRACES", type.isObject() ? (valueType.isObject() ? " <"+type.getKeyType()+", "+valueType.getValueType()+">" : " <"+type.getKeyType()+">") : (valueType.isObject() ? " <"+valueType.getValueType()+">" : ""));
+		addSimpleMapper(" COMPAREABLE_KEY_BRACES", type.isObject() ? " <"+type.getKeyType()+" extends Comparable<T>>" : "");
+		addSimpleMapper("KV_BRACES", type.isObject() || valueType.isObject() ? "<>" : "");
+		addSimpleMapper("BRACES", type.isObject() ? "<>" : "");
+		if(type.needsCustomJDKType())
+		{
+			addSimpleMapper("JAVA_TYPE", type.getCustomJDKType().getKeyType());
+			addSimpleMapper("SANITY_CAST", "castTo"+type.getFileType());
+		}
+		addSimpleMapper("JAVA_CLASS", type.getCustomJDKType().getClassType());
+		if(valueType.needsCustomJDKType())
+		{
+			addSimpleMapper("SANITY_CAST_VALUE", "castTo"+valueType.getFileType());
+		}
+		addComment("@ArrayType", "@param <%s> the type of array that the operation should be applied");
+		addComment("@Type", "@param <%s> the type of elements maintained by this Collection");
+		addValueComment("@ValueArrayType", "@param <%s> the type of array that the operation should be applied");
+		addValueComment("@ValueType", "@param <%s> the type of elements maintained by this Collection");
+		addAnnontion("@PrimitiveOverride", "@Override");
+		addSimpleMapper("@PrimitiveDoc", "");
+		addAnnontion("@Primitive", "@Deprecated");
+		addValueAnnontion("@ValuePrimitiveOverride", "@Override");
+		addValueAnnontion("@ValuePrimitive", "@Deprecated");
+		return this;
+	}
+	
+	public GlobalVariables createHelperVariables()
+	{
+		createHelperVars(type, false, "KEY");
+		createHelperVars(valueType, true, "VALUE");
+		return this;
+	}
+	
+	private void createHelperVars(ClassType type, boolean value, String fix)
+	{
+		addArgumentMapper("EQUALS_"+fix+"_TYPE", "Objects.equals(%2$s, "+(type.isObject() ? "%1$s" : fix+"_TO_OBJ(%1$s)")+")").removeBraces();
+		addInjectMapper(fix+"_EQUALS_NOT_NULL", type.getComparableValue()+" != "+(type.isPrimitiveBlocking() || type.needsCast() ? type.getEmptyValue() : "0")).removeBraces();
+		addInjectMapper(fix+"_EQUALS_NULL", type.getComparableValue()+" == "+(type.isPrimitiveBlocking() || type.needsCast() ? type.getEmptyValue() : "0")).removeBraces();
+		addArgumentMapper(fix+"_EQUALS_NOT", type.getEquals(true)).removeBraces();
+		addArgumentMapper(fix+"_EQUALS", type.getEquals(false)).removeBraces();
+		
+		addArgumentMapper("COMPAREABLE_TO_"+fix, type.isObject() ? "((Comparable<"+type.getKeyType(value)+">)%1$s).compareTo(("+type.getKeyType(value)+")%2$s)" : type.getClassType(value)+".compare(%1$s, %2$s)").removeBraces();
+		addArgumentMapper("COMPARE_TO_"+fix, type.isObject() ? "%1$s.compareTo(%2$s)" : type.getClassType(value)+".compare(%1$s, %2$s)").removeBraces();
+		
+		addInjectMapper(fix+"_TO_OBJ", type.isObject() ? "%s" : type.getClassType(value)+".valueOf(%s)").removeBraces();
+		addInjectMapper("OBJ_TO_"+fix, type.isObject() ? "%s" : "%s."+type.getKeyType(value)+"Value()").removeBraces();
+		addInjectMapper("CLASS_TO_"+fix, type.isObject() ? "("+type.getKeyType(value)+")%s" : "(("+type.getClassType(value)+")%s)."+type.getKeyType(value)+"Value()").removeBraces();
+		
+		addInjectMapper(fix+"_TO_HASH", type.isObject() ? "%s.hashCode()" : type.getClassType(value)+".hashCode(%s)").removeBraces();
+		addInjectMapper(fix+"_TO_STRING", type.isObject() ? "%s.toString()" : type.getClassType(value)+".toString(%s)").removeBraces();
+		
+		addSimpleMapper("CAST_"+fix+"_ARRAY ", type.isObject() ? "("+fix+"_TYPE[])" : "");
+		addSimpleMapper("EMPTY_"+fix+"_ARRAY", type.isObject() ? "("+fix+"_TYPE[])ARRAYS.EMPTY_ARRAY" : "ARRAYS.EMPTY_ARRAY");
+		addInjectMapper("NEW_"+fix+"_ARRAY", type.isObject() ? "("+fix+"_TYPE[])new Object[%s]" : "new "+fix+"_TYPE[%s]").removeBraces();
+		addInjectMapper("NEW_SPECIAL_"+fix+"_ARRAY", type.isObject() ? "(E[])new Object[%s]" : "new "+fix+"_TYPE[%s]").removeBraces();
+		addInjectMapper("NEW_CLASS"+(value ? "_VALUE" : "")+"_ARRAY", type.isObject() ? "(CLASS_TYPE[])new Object[%s]" : "new CLASS_TYPE[%s]").removeBraces();
+	}
+	
+	public GlobalVariables createPreFunctions()
+	{
+		addSimpleMapper("ENTRY_SET", type.getFileType().toLowerCase()+"2"+valueType.getFileType()+"EntrySet");
+		return this;
+	}
+	
+	public GlobalVariables createClassTypes()
+	{
+		addSimpleMapper("JAVA_PREDICATE", type.isPrimitiveBlocking() ? "" : type.getCustomJDKType().getFileType()+"Predicate");
+		addSimpleMapper("JAVA_CONSUMER", type.isPrimitiveBlocking() ? "" : "java.util.function."+type.getCustomJDKType().getFileType()+"Consumer");
+		addSimpleMapper("JAVA_FUNCTION", type.getFunctionClass(valueType));
+		addSimpleMapper("JAVA_BINARY_OPERATOR", type == ClassType.BOOLEAN ? "" : (type.isObject() ? "java.util.function.BinaryOperator" : "java.util.function."+type.getCustomJDKType().getFileType()+"BinaryOperator"));
+		addSimpleMapper("JAVA_UNARY_OPERATOR", type.isObject() ? "BinaryOperator" : type == ClassType.BOOLEAN ? "" : type.getCustomJDKType().getFileType()+"UnaryOperator");
+		addSimpleMapper("JAVA_SPLIT_ITERATOR", type.isPrimitiveBlocking() ? "Spliterator" : "Of"+type.getCustomJDKType().getFileType());
+		addSimpleMapper("JAVA_STREAM", type.isPrimitiveBlocking() ? "" : type.getCustomJDKType().getFileType()+"Stream");
+		
+		//Final Classes
+		addClassMapper("ARRAY_LIST", "ArrayList");
+		addClassMapper("LINKED_LIST", "LinkedList");
+		addAbstractMapper("IMMUTABLE_LIST", "Immutable%sList");
+		addClassMapper("ARRAY_FIFO_QUEUE", "ArrayFIFOQueue");
+		addClassMapper("ARRAY_PRIORITY_QUEUE", "ArrayPriorityQueue");
+		addClassMapper("HEAP_PRIORITY_QUEUE", "HeapPriorityQueue");
+		addClassMapper("LINKED_CUSTOM_HASH_SET", "LinkedOpenCustomHashSet");
+		addClassMapper("LINKED_HASH_SET", "LinkedOpenHashSet");
+		addAbstractMapper("IMMUTABLE_HASH_SET", "Immutable%sOpenHashSet");
+		addClassMapper("CUSTOM_HASH_SET", "OpenCustomHashSet");
+		addClassMapper("HASH_SET", "OpenHashSet");
+		addAbstractBiMapper("IMMUTABLE_HASH_MAP", "Immutable%sOpenHashMap", "2");
+		addBiClassMapper("LINKED_CUSTOM_HASH_MAP", "LinkedOpenCustomHashMap", "2");
+		addBiClassMapper("LINKED_HASH_MAP", "LinkedOpenHashMap", "2");
+		addBiClassMapper("CUSTOM_HASH_MAP", "OpenCustomHashMap", "2");
+		addBiClassMapper("AVL_TREE_MAP", "AVLTreeMap", "2");
+		addBiClassMapper("RB_TREE_MAP", "RBTreeMap", "2");
+		addFunctionValueMappers("LINKED_ENUM_MAP", valueType.isObject() ? "LinkedEnum2ObjectMap" : "LinkedEnum2%sMap");
+		addFunctionValueMappers("ENUM_MAP", valueType.isObject() ? "Enum2ObjectMap" : "Enum2%sMap");
+		addBiClassMapper("HASH_MAP", "OpenHashMap", "2");
+		addBiClassMapper("ARRAY_MAP", "ArrayMap", "2");
+		addBiClassMapper("IMMUTABLE_PAIR", "ImmutablePair", "");
+		addBiClassMapper("MUTABLE_PAIR", "MutablePair", "");
+		addClassMapper("RB_TREE_SET", "RBTreeSet");
+		addClassMapper("AVL_TREE_SET", "AVLTreeSet");
+		addClassMapper("ARRAY_SET", "ArraySet");
+		
+		//Abstract Classes
+		addAbstractMapper("ABSTRACT_COLLECTION", "Abstract%sCollection");
+		addAbstractMapper("ABSTRACT_SET", "Abstract%sSet");
+		addAbstractMapper("ABSTRACT_LIST", "Abstract%sList");
+		addAbstractBiMapper("ABSTRACT_MAP", "Abstract%sMap", "2");
+		addClassMapper("SUB_LIST", "SubList");
+		
+		//Helper Classes
+		addClassMapper("LISTS", "Lists");
+		addClassMapper("SETS", "Sets");
+		addClassMapper("COLLECTIONS", "Collections");
+		addClassMapper("ARRAYS", "Arrays");
+		addClassMapper("PRIORITY_QUEUES", "PriorityQueues");
+		addClassMapper("SPLIT_ITERATORS", "Splititerators");
+		addClassMapper("ITERATORS", "Iterators");
+		addClassMapper("ITERABLES", "Iterables");
+		addBiClassMapper("MAPS", "Maps", "2");
+		
+		//Interfaces
+		addClassMapper("LIST_ITERATOR", "ListIterator");
+		addClassMapper("BI_ITERATOR", "BidirectionalIterator");
+		addBiClassMapper("BI_CONSUMER", "Consumer", "");
+		addClassMapper("BI_OBJECT_CONSUMER", "ObjectConsumer");
+		addClassMapper("SPLIT_ITERATOR", "Splititerator");
+		addClassMapper("ITERATOR", "Iterator");
+		addClassMapper("ITERABLE", "Iterable");
+		addClassMapper("COLLECTION", "Collection");
+		addClassMapper("TO_OBJECT_FUNCTION", "2ObjectFunction");
+		addBiClassMapper("FUNCTION", "Function", "2");
+		addClassMapper("LIST_ITER", "ListIter");
+		addClassMapper("LIST", "List");
+		addBiClassMapper("NAVIGABLE_MAP", "NavigableMap", "2");
+		addBiClassMapper("SORTED_MAP", "SortedMap", "2");
+		addBiClassMapper("MAP", "Map", "2");
+		addClassMapper("NAVIGABLE_SET", "NavigableSet");
+		addBiClassMapper("PAIR", "Pair", "");
+		addClassMapper("PRIORITY_QUEUE", "PriorityQueue");
+		addClassMapper("PRIORITY_DEQUEUE", "PriorityDequeue");
+		addClassMapper("PREDICATE", "2BooleanFunction");
+		addClassMapper("SORTED_SET", "SortedSet");
+		addClassMapper("SET", "Set");
+		addClassMapper("STRATEGY", "Strategy");
+		addClassMapper("STACK", "Stack");
+		addBiClassMapper("UNARY_OPERATOR", "UnaryOperator", "");
+		if(type.isObject())
+		{
+			if(!valueType.isObject()) addSimpleMapper("VALUE_CONSUMER", valueType.getFileType()+"Consumer");
+			else addSimpleMapper("VALUE_CONSUMER", "Consumer");
+			addSimpleMapper("CONSUMER", "Consumer");
+			addSimpleMapper("COMPARATOR", "Comparator");	
+			addSimpleMapper("IARRAY", "IObjectArray");
+		}
+		else
+		{
+			if(valueType.isObject()) 
+			{
+				addSimpleMapper("VALUE_CONSUMER", "Consumer");
+				addSimpleMapper("CONSUMER", type.getFileType()+"Consumer");
+			}
+			else addClassMapper("CONSUMER", "Consumer");
+			addClassMapper("COMPARATOR", "Comparator");
+			addFunctionMappers("IARRAY", "I%sArray");
+		}
+		return this;
+	}
+	
+	public GlobalVariables createFunctions()
+	{
+		addSimpleMapper("APPLY_VALUE", valueType.isObject() ? "apply" : "applyAs"+valueType.getNonFileType());
+		addSimpleMapper("APPLY_CAST", "applyAs"+type.getCustomJDKType().getNonFileType());
+		addSimpleMapper("APPLY", type.isObject() ? "apply" : "applyAs"+type.getNonFileType());
+		addFunctionValueMapper("BULK_MERGE", "mergeAll");
+		addFunctionValueMappers("COMPUTE_IF_ABSENT", "compute%sIfAbsent");
+		addFunctionValueMappers("COMPUTE_IF_PRESENT", "compute%sIfPresent");
+		addFunctionValueMapper("COMPUTE", "compute");
+		addFunctionMapper("DEQUEUE_LAST", "dequeueLast");
+		addFunctionMapper("DEQUEUE", "dequeue");
+		addFunctionMappers("POLL_FIRST_ENTRY_KEY", "pollFirst%sKey");
+		addFunctionMappers("POLL_LAST_ENTRY_KEY", "pollLast%sKey");
+		addFunctionMapper("POLL_FIRST_KEY", "pollFirst");
+		addFunctionMapper("POLL_LAST_KEY", "pollLast");
+		addFunctionMappers("FIRST_ENTRY_KEY", "first%sKey");
+		addFunctionValueMappers("FIRST_ENTRY_VALUE", "first%sValue");
+		addFunctionMapper("FIRST_KEY", "first");
+		addFunctionMappers("LAST_ENTRY_KEY", "last%sKey");
+		addFunctionValueMappers("LAST_ENTRY_VALUE", "last%sValue");
+		addFunctionMappers("ENTRY_KEY", "get%sKey");
+		addFunctionValueMappers("ENTRY_VALUE", "get%sValue");
+		addFunctionMappers("KEY_ENTRY", "set%sKey");
+		addFunctionValueMappers("VALUE_ENTRY", "set%sValue");
+		addFunctionMapper("GET_KEY", "get");
+		if(type.isObject()) addFunctionValueMapper("GET_VALUE", valueType.isObject() ? "getObject" : "get");
+		else addSimpleMapper("GET_VALUE", "get");
+		addFunctionMapper("LAST_KEY", "last");
+		addFunctionValueMapper("MERGE", "merge");
+		addFunctionMapper("NEXT", "next");
+		addFunctionMapper("PREVIOUS", "previous");
+		if(type.isObject()) addFunctionMapper("REMOVE_VALUE", "rem");
+		else addSimpleMapper("REMOVE_VALUE", "remove");
+		addFunctionMapper("REMOVE_KEY", "rem");
+		addFunctionMapper("REMOVE_LAST", "removeLast");
+		addFunctionMapper("REMOVE", "remove");
+		addFunctionValueMappers("REPLACE_VALUES", valueType.isObject() ? "replaceObjects" : "replace%ss");
+		addFunctionMappers("REPLACE", type.isObject() ? "replaceObjects" : "replace%ss");
+		addFunctionMappers("SORT", "sort%ss");
+		addSimpleMapper("VALUE_TEST_VALUE", valueType.isObject() ? "getBoolean" : "get");
+		addSimpleMapper("TEST_VALUE", type.isObject() ? "getBoolean" : "get");
+		addSimpleMapper("NEW_STREAM", type.isPrimitiveBlocking() ? "" : type.getCustomJDKType().getKeyType()+"Stream");
+		addSimpleMapper("TO_ARRAY", "to"+type.getNonFileType()+"Array");
+		addSimpleMapper("[SPACE]", " ");
+		return this;
+	}
+	
+	public GlobalVariables createFlags()
+	{
+		flags.add("TYPE_"+type.getCapType());
+		flags.add("VALUE_"+valueType.getCapType());
+		if(type == valueType) flags.add("SAME_TYPE");
+		if(type.hasFunction(valueType)) flags.add("JDK_FUNCTION");
+		if(!type.needsCustomJDKType()) flags.add("JDK_TYPE");
+		if(!type.isPrimitiveBlocking()) flags.add("PRIMITIVES");
+		if(!valueType.isPrimitiveBlocking()) flags.add("VALUE_PRIMITIVES");
+		if(valueType.needsCustomJDKType()) flags.add("JDK_VALUE");
+		return this;
+	}
+	
+	public TemplateProcess create(String fileName, String splitter, boolean valueOnly)
+	{
+		TemplateProcess process = new TemplateProcess(String.format(fileName+".java", (splitter != null ? type.getFileType()+splitter+valueType.getFileType() : (valueOnly ? valueType : type).getFileType())));
+		process.setPathBuilder(new PathBuilder(type.getPathType()));
+		process.addFlags(flags);
+		process.addMappers(operators);
+		return process;
+	}
+	
+	public ClassType getType()
+	{
+		return type;
+	}
+	
+	private void addClassMapper(String pattern, String replacement)
+	{
+		operators.add(new SimpleMapper(type.name()+"[VALUE_"+pattern+"]", "VALUE_"+pattern, valueType.getFileType()+replacement));
+		operators.add(new SimpleMapper(type.name()+"["+pattern+"]", pattern, type.getFileType()+replacement));
+	}
+	
+	private void addBiClassMapper(String pattern, String replacement, String splitter)
+	{
+		operators.add(new SimpleMapper(type.name()+"[KEY_"+pattern+"]", "KEY_"+pattern, type.getFileType()+splitter+type.getFileType()+replacement));
+		operators.add(new SimpleMapper(type.name()+"[VALUE_"+pattern+"]", "VALUE_"+pattern, valueType.getFileType()+splitter+valueType.getFileType()+replacement));
+		operators.add(new SimpleMapper(type.name()+"["+pattern+"]", pattern, type.getFileType()+splitter+valueType.getFileType()+replacement));
+	}
+	
+	private void addAbstractMapper(String pattern, String replacement)
+	{
+		operators.add(new SimpleMapper(type.name()+"[VALUE_"+pattern+"]", "VALUE_"+pattern, String.format(replacement, valueType.getFileType())));
+		operators.add(new SimpleMapper(type.name()+"["+pattern+"]", pattern, String.format(replacement, type.getFileType())));		
+	}
+	
+	private void addAbstractBiMapper(String pattern, String replacement, String splitter) 
+	{
+		operators.add(new SimpleMapper(type.name()+"["+pattern+"]", pattern, String.format(replacement, type.getFileType()+splitter+valueType.getFileType())));
+	}
+	
+	private void addFunctionMapper(String pattern, String replacement)
+	{
+		operators.add(new SimpleMapper(type.name()+"[VALUE_"+pattern+"]", "VALUE_"+pattern, replacement+valueType.getNonFileType()));
+		operators.add(new SimpleMapper(type.name()+"["+pattern+"]", pattern, replacement+type.getNonFileType()));
+	}
+	
+	private void addFunctionValueMapper(String pattern, String replacement)
+	{
+		operators.add(new SimpleMapper(type.name()+"["+pattern+"]", pattern, replacement+valueType.getNonFileType()));
+	}
+	
+	private void addFunctionMappers(String pattern, String replacement)
+	{
+		operators.add(new SimpleMapper(type.name()+"[VALUE_"+pattern+"]", "VALUE_"+pattern, String.format(replacement, valueType.getNonFileType())));		
+		operators.add(new SimpleMapper(type.name()+"["+pattern+"]", pattern, String.format(replacement, type.getNonFileType())));		
+	}
+	
+	private void addFunctionValueMappers(String pattern, String replacement)
+	{
+		operators.add(new SimpleMapper(type.name()+"["+pattern+"]", pattern, String.format(replacement, valueType.getNonFileType())));		
+	}
+	
+	private void addSimpleMapper(String pattern, String replacement)
+	{
+		operators.add(new SimpleMapper(type.name()+"["+pattern+"]", pattern, replacement));
+	}
+	
+	private void addAnnontion(String pattern, String value)
+	{
+		if(type == ClassType.OBJECT) operators.add(new LineMapper(type.name()+"["+pattern+"]", pattern));
+		else operators.add(new SimpleMapper(type.name()+"["+pattern+"]", pattern, value));
+	}
+	
+	private void addValueAnnontion(String pattern, String value)
+	{
+		if(valueType == ClassType.OBJECT) operators.add(new LineMapper(valueType.name()+"["+pattern+"]", pattern));
+		else operators.add(new SimpleMapper(valueType.name()+"["+pattern+"]", pattern, value));
+	}
+	
+	private void addComment(String pattern, String value)
+	{
+		if(type == ClassType.OBJECT) operators.add(new InjectMapper(type.name()+"["+pattern+"]", pattern, value).removeBraces());
+		else operators.add(new LineMapper(type.name()+"["+pattern+"]", pattern));
+	}
+	
+	private void addValueComment(String pattern, String value)
+	{
+		if(valueType == ClassType.OBJECT) operators.add(new InjectMapper(valueType.name()+"["+pattern+"]", pattern, value).removeBraces());
+		else operators.add(new LineMapper(valueType.name()+"["+pattern+"]", pattern));
+	}
+	
+	private InjectMapper addInjectMapper(String pattern, String replacement)
+	{
+		InjectMapper mapper = new InjectMapper(type.name()+"["+pattern+"]", pattern, replacement);
+		operators.add(mapper);
+		return mapper;
+	}
+	
+	private ArgumentMapper addArgumentMapper(String pattern, String replacement)
+	{
+		return addArgumentMapper(pattern, replacement, ", ");
+	}
+	
+	private ArgumentMapper addArgumentMapper(String pattern, String replacement, String splitter)
+	{
+		ArgumentMapper mapper = new ArgumentMapper(type.name()+"["+pattern+"]", pattern, replacement, splitter);
+		operators.add(mapper);
+		return mapper;
+	}
+	
+	class PathBuilder implements UnaryOperator<Path>
+	{
+		String before;
+		
+		public PathBuilder(String before)
+		{
+			this.before = before;
+		}
+		
+		@Override
+		public Path apply(Path t)
+		{
+			return t.subpath(0, 6).resolve(before).resolve(t.subpath(6, t.getNameCount()));
+		}
+	}
+}

src/builder/java/speiger/src/builder/ModulePackage.java

@@ -1,155 +0,0 @@
-package speiger.src.builder;
-
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.function.BiConsumer;
-import java.util.function.Consumer;
-import java.util.function.Predicate;
-import java.util.function.UnaryOperator;
-
-import speiger.src.builder.mappers.IMapper;
-import speiger.src.builder.processor.TemplateProcess;
-
-@SuppressWarnings("javadoc")
-public class ModulePackage
-{
-	private static final BiConsumer<String, RequiredType> VOID = (K, V) -> {};
-	public static final ClassType[] TYPE = ClassType.values();
-	final ClassType keyType;
-	final ClassType valueType;
-	Set<String> blocked = new HashSet<>();
-	Map<String, String> nameRemapper = new HashMap<>();
-	Map<String, String> splitters = new HashMap<>();
-	List<Predicate<String>> blockedFilters = new ArrayList<>();
-	List<IMapper> mappers = new ArrayList<>();
-	Set<String> flags = new LinkedHashSet<>();
-	Set<String> globalFlags;
-	Map<String, Integer> flaggedValues = new HashMap<>();
-	BiConsumer<String, RequiredType> requirements = VOID;
-	
-	public ModulePackage(Set<String> globalFlags, ClassType keyType, ClassType valueType) {
-		this.globalFlags = globalFlags;
-		this.keyType = keyType;
-		this.valueType = valueType;
-	}
-	
-	public void finish() {
-		requirements = VOID;
-		mappers.sort(Comparator.comparing(IMapper::getSearchValue, Comparator.comparingInt(String::length).reversed()));
-		mappers.sort(Comparator.comparing(IMapper::getSearchValue, this::sort));
-	}
-	
-	public void setRequirements(BiConsumer<String, RequiredType> requirements) {
-		this.requirements = requirements;
-	}
-	
-	public boolean isSame() {
-		return keyType == valueType;
-	}
-	
-	public boolean isEnumValid() {
-		return keyType == ClassType.OBJECT;
-	}
-	
-	public ClassType getKeyType() {
-		return keyType;
-	}
-	
-	public ClassType getValueType() {
-		return valueType;
-	}
-	
-	public void addFlag(String flag) {
-		flags.add(flag);
-	}
-	
-	public void addGlobalFlag(String flag) {
-		globalFlags.add(flag);
-	}
-	
-	public void addValue(String key, int value) {
-		flaggedValues.put(key, value);
-	}
-	
-	public void addRequirement(String fileName, RequiredType type) {
-		requirements.accept(fileName, type);
-	}
-	
-	public void addMapper(IMapper mapper) {
-		mappers.add(mapper);
-	}
-	
-	public void addBlockedFilter(Predicate<String> filter) {
-		blockedFilters.add(filter);
-	}
-	
-	public void addBlockedFiles(String... names) {
-		blocked.addAll(Arrays.asList(names));
-	}
-	
-	public void addSplitter(String fileName, String splitter) {
-		splitters.put(fileName, splitter);
-	}
-	
-	public void addRemapper(String fileName, String actualName) {
-		nameRemapper.put(fileName, actualName);
-	}
-	
-	public void process(String fileName, Consumer<TemplateProcess> result) {
-		if(isBlocked(fileName)) return;
-		String splitter = String.format(splitters.getOrDefault(fileName, keyType.getFileType()), keyType.getFileType(), valueType.getFileType());
-		String newName = String.format(nameRemapper.getOrDefault(fileName, "%s"+fileName), splitter);
-		TemplateProcess process = new TemplateProcess(newName+".java");
-		process.setPathBuilder(new PathBuilder(keyType.getPathType()));
-		process.addFlags(flags);
-		process.addFlags(globalFlags);
-		process.addMappers(mappers);
-		process.addValues(flaggedValues);
-		result.accept(process);
-	}
-	
-	private boolean isBlocked(String fileName) {
-		if(blocked.contains(fileName)) return true;
-		for(int i = 0,m=blockedFilters.size();i<m;i++) {
-			if(blockedFilters.get(i).test(fileName)) return true;
-		}
-		return false;
-	}
-	
-	public static List<ModulePackage> createPackages(Set<String> globalFlags) {
-		List<ModulePackage> list = new ArrayList<>();
-		for(ClassType key : TYPE) {
-			for(ClassType value : TYPE) {
-				list.add(new ModulePackage(globalFlags, key, value));
-			}
-		}
-		return list;
-	}
-	
-	private int sort(String key, String value) {
-		if(value.contains(key)) return 1;
-		else if(key.contains(value)) return -1;
-		return 0;
-	}
-	
-	class PathBuilder implements UnaryOperator<Path> {
-		String before;
-		
-		public PathBuilder(String before) {
-			this.before = before;
-		}
-		
-		@Override
-		public Path apply(Path t) {
-			return t.subpath(0, 6).resolve(before).resolve(t.subpath(6, t.getNameCount()));
-		}
-	}
-}

src/builder/java/speiger/src/builder/PrimitiveCollectionsBuilder.java

@@ -1,229 +1,179 @@
-package speiger.src.builder;
-
-import java.io.BufferedWriter;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.StringJoiner;
-import java.util.function.Consumer;
-import java.util.stream.Stream;
-
-import speiger.src.builder.modules.AsyncModule;
-import speiger.src.builder.modules.BaseModule;
-import speiger.src.builder.modules.CollectionModule;
-import speiger.src.builder.modules.FunctionModule;
-import speiger.src.builder.modules.JavaModule;
-import speiger.src.builder.modules.ListModule;
-import speiger.src.builder.modules.MapModule;
-import speiger.src.builder.modules.PairModule;
-import speiger.src.builder.modules.PrioQueueModule;
-import speiger.src.builder.modules.SetModule;
-import speiger.src.builder.processor.TemplateProcess;
-import speiger.src.builder.processor.TemplateProcessor;
-
-@SuppressWarnings("javadoc")
-public class PrimitiveCollectionsBuilder extends TemplateProcessor
-{
-	private static final int SPECIAL = 0x1; //Detects if the Builder is generating tests
-	private static final int LOAD = 0x2; //If Configs should be loaded
-	private static final int ANTI_SAVE = SPECIAL | LOAD; //If save should be disabled since load/save shouldn't happen at the same time.
-	private static final int SAVE = 0x4; //if the configuration should be created
-	Set<String> globalFlags = new HashSet<>();
-	List<ModulePackage> simplePackages = new ArrayList<>();
-	List<ModulePackage> biPackages = new ArrayList<>();
-	List<ModulePackage> enumPackages = new ArrayList<>();
-	Map<String, RequiredType> requirements = new HashMap<>();
-	SettingsManager manager = new SettingsManager();
-	int flags;
-	
-	public PrimitiveCollectionsBuilder() {
-		this(false);
-	}
-	
-	public PrimitiveCollectionsBuilder(boolean silencedSuccess) {
-		super(silencedSuccess, Paths.get("src/builder/resources/speiger/assets/collections/templates/"), Paths.get("src/main/java/speiger/src/collections/"), Paths.get("src/builder/resources/speiger/assets/collections/"));
-	}
-	
-	public PrimitiveCollectionsBuilder(Path sourceFolder, Path outputFolder, Path dataFolder) {
-		this(false, sourceFolder, outputFolder, dataFolder);
-	}
-	
-	public PrimitiveCollectionsBuilder(boolean silencedSuccess, Path sourceFolder, Path outputFolder, Path dataFolder) {
-		super(silencedSuccess, sourceFolder, outputFolder, dataFolder);
-	}
-	
-	private PrimitiveCollectionsBuilder setFlags(int flags) {
-		this.flags = flags;
-		if((flags & ANTI_SAVE) != 0) {
-			this.flags &= ~SAVE;
-		}
-		return this;
-	}
-	
-	private static PrimitiveCollectionsBuilder createTests(boolean silent, int flags) {
-		return new PrimitiveCollectionsBuilder(silent, 
-				Paths.get("src/builder/resources/speiger/assets/tests/templates/"), 
-				Paths.get("src/test/java/speiger/src/tests/"), 
-				Paths.get("src/builder/resources/speiger/assets/tests/")).setFlags(flags | SPECIAL);
-	}
-	
-	private static PrimitiveCollectionsBuilder createTesters(boolean silent, int flags) {
-		return new PrimitiveCollectionsBuilder(silent, 
-				Paths.get("src/builder/resources/speiger/assets/testers/templates/"), 
-				Paths.get("src/test/java/speiger/src/testers/"), 
-				Paths.get("src/builder/resources/speiger/assets/testers/")).setFlags(flags | SPECIAL);
-	}
-	
-	@Override
-	protected boolean isFileValid(Path fileName) { return true; }
-	@Override
-	protected boolean relativePackages() { return true; }
-	@Override
-	protected boolean debugUnusedMappers() { return false; }
-	
-	@Override
-	protected void afterFinish() {
-		if((flags & SPECIAL) == 0 && getVersion() > 8)  {
-			Path basePath = Paths.get("src/main/java");
-			try(BufferedWriter writer = Files.newBufferedWriter(basePath.resolve("module-info.java"))) {
-				writer.write(getModuleInfo(basePath));
-			}
-			catch(Exception e) { e.printStackTrace(); }
-		}
-	}
-	
-	public List<BaseModule> createModules() {
-		List<BaseModule> modules = new ArrayList<>();
-		modules.add(JavaModule.INSTANCE);
-		modules.add(FunctionModule.INSTANCE);
-		modules.add(CollectionModule.INSTANCE);
-		modules.add(PrioQueueModule.INSTANCE);
-		modules.add(ListModule.INSTANCE);
-		modules.add(SetModule.INSTANCE);
-		modules.add(MapModule.INSTANCE);
-		modules.add(PairModule.INSTANCE);
-		modules.add(AsyncModule.INSTANCE);
-		return modules;
-	}
-
-	
-	@Override
-	protected void init()  {
-		prepPackages();
-		//Init Modules here
-		addModules(createModules());
-		finishPackages();
-	}
-	
-	public void addModules(List<BaseModule> modules) {
-		for(int i = 0,m=modules.size();i<m;i++) {
-			modules.get(i).setManager(manager);
-		}
-		for(int i = 0,m=modules.size();i<m;i++) {
-			biPackages.forEach(modules.get(i)::init);
-		}
-		modules.forEach(BaseModule::cleanup);
-	}
-	
-	private void finishPackages()  {
-		biPackages.forEach(ModulePackage::finish);
-		if((flags & SAVE) != 0) manager.save();
-	}
-	
-	private void prepPackages() {
-		if((flags & LOAD) != 0) manager.load();
-		for(ModulePackage entry : ModulePackage.createPackages(globalFlags)) {
-			entry.setRequirements(requirements::put);
-			biPackages.add(entry);
-			if(entry.isSame()) simplePackages.add(entry);
-			if(entry.isEnumValid()) enumPackages.add(entry);
-		}		
-	}
-	
-	@Override
-	public void createProcesses(String fileName, Consumer<TemplateProcess> process) {
-		List<ModulePackage> packages = getPackagesByRequirement(requirements.get(fileName));
-		for(int i = 0,m=packages.size();i<m;i++) {
-			packages.get(i).process(fileName, process);
-		}
-	}
-	
-	protected List<ModulePackage> getPackagesByRequirement(RequiredType type) {
-		if(type == null) return simplePackages;
-		if(type == RequiredType.BI_CLASS) return biPackages;
-		if(type == RequiredType.ENUM) return enumPackages;
-		return Collections.emptyList();
-	}
-	
-	private String getModuleInfo(Path basePath) {
-		StringJoiner joiner = new StringJoiner("\n", "", "\n");
-		try(Stream<Path> stream = Files.walk(getOutputFolder())) {
-			stream.filter(Files::isDirectory)
-					.filter(this::containsFiles)
-					.map(basePath::relativize)
-					.map(Path::toString)
-					.map(this::sanitize)
-					.forEach(T -> joiner.add("\texports "+T+";"));
-		}
-		catch(Exception e) {
-			e.printStackTrace();
-			throw new RuntimeException(e);
-		}
-		StringBuilder builder = new StringBuilder();
-		builder.append("/** @author Speiger */\n");
-		builder.append("module ").append(sanitize(basePath.relativize(getOutputFolder()).toString())).append(" {\n");
-		builder.append(joiner.toString()).append("}");	
-		return builder.toString();
-	}
-	
-	private String sanitize(String input) {
-		return input.replace("\\", ".").replace("/", ".");
-	}
-	
-	private boolean containsFiles(Path path)  {
-		try(Stream<Path> stream = Files.walk(path, 1)) {
-			return stream.filter(Files::isRegularFile).findFirst().isPresent();
-		}
-		catch(Exception e) { e.printStackTrace(); }
-		return false;
-	}
-	
-	private int getVersion() {
-		String version = System.getProperty("java.version");
-		if(version.startsWith("1.")) return Integer.parseInt(version.substring(2, 3));
-		int dot = version.indexOf(".");
-		return Integer.parseInt(dot != -1 ? version.substring(0, dot) : version);
-	}
-	
-	public static void main(String...args) {
-		try
-		{
-			Set<String> flags = new HashSet<>(Arrays.asList(args));
-			boolean silent = flags.contains("silent");
-			boolean force = flags.contains("force");
-			boolean tests = flags.contains("tests");
-			boolean forceTests =  flags.contains("force-tests");
-			boolean load = flags.contains("load");
-			boolean save = flags.contains("save");
-			int flag = (load ? LOAD : 0) | (save ? SAVE : 0);
-            new PrimitiveCollectionsBuilder(silent).setFlags(flag).process(force);
-            if(tests) {
-    			createTests(silent, flag).process(force || forceTests);
-    			createTesters(silent, flag).process(force || forceTests);
-            }
-        }
-		catch(InterruptedException | IOException e)
-		{
-			e.printStackTrace();
-		}
-	}
-}
+package speiger.src.builder;
+
+import java.io.IOException;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.EnumSet;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.function.Consumer;
+
+import speiger.src.builder.processor.TemplateProcess;
+import speiger.src.builder.processor.TemplateProcessor;
+
+@SuppressWarnings("javadoc")
+public class PrimitiveCollectionsBuilder extends TemplateProcessor
+{
+	Map<String, EnumSet<ClassType>> blocked = new HashMap<>();
+	Map<String, String> nameRemapper = new HashMap<>();
+	Map<String, String> biRequired = new HashMap<>();
+	Set<String> enumRequired = new HashSet<>();
+	public static final ClassType[] TYPE = ClassType.values();
+	List<GlobalVariables> variables = new ArrayList<>();
+	List<GlobalVariables> biVariables = new ArrayList<>();
+	List<GlobalVariables> enumVariables = new ArrayList<>();
+	
+	public PrimitiveCollectionsBuilder()
+	{
+		super(Paths.get("src/builder/resources/speiger/assets/collections/templates/"), Paths.get("src/main/java/speiger/src/collections/"), Paths.get("src/builder/resources/speiger/assets/collections/"));
+	}
+	
+	public PrimitiveCollectionsBuilder(Path sourceFolder, Path outputFolder, Path dataFolder)
+	{
+		super(sourceFolder, outputFolder, dataFolder);
+	}
+	
+	@Override
+	protected boolean isFileValid(Path fileName)
+	{
+		return true;
+	}
+	
+	@Override
+	protected boolean relativePackages()
+	{
+		return true;
+	}
+	
+	@Override
+	protected boolean debugUnusedMappers()
+	{
+		return false;
+	}
+	
+	@Override
+	protected void init()
+	{
+		variables.clear();
+		for(ClassType clzType : TYPE)
+		{
+			for(ClassType subType : TYPE)
+			{
+				create(clzType, subType);
+			}
+		}
+		enumRequired.add("EnumMap");
+		enumRequired.add("LinkedEnumMap");
+		biRequired.put("BiConsumer", "");
+		biRequired.put("UnaryOperator", "");
+		biRequired.put("Pair", "");
+		biRequired.put("MutablePair", "");
+		biRequired.put("ImmutablePair", "");
+		addBiClass("Function", "Maps", "Map", "SortedMap", "NavigableMap", "AbstractMap", "ImmutableOpenHashMap", "OpenHashMap", "LinkedOpenHashMap", "OpenCustomHashMap", "LinkedOpenCustomHashMap", "ArrayMap", "RBTreeMap", "AVLTreeMap");
+		nameRemapper.put("BiConsumer", "%sConsumer");
+		nameRemapper.put("IArray", "I%sArray");
+		nameRemapper.put("AbstractMap", "Abstract%sMap");
+		nameRemapper.put("AbstractCollection", "Abstract%sCollection");
+		nameRemapper.put("AbstractSet", "Abstract%sSet");
+		nameRemapper.put("AbstractList", "Abstract%sList");
+		nameRemapper.put("EnumMap", "Enum2%sMap");
+		nameRemapper.put("LinkedEnumMap", "LinkedEnum2%sMap");
+		nameRemapper.put("ImmutableList", "Immutable%sList");
+		nameRemapper.put("ImmutableOpenHashSet", "Immutable%sOpenHashSet");
+		nameRemapper.put("ImmutableOpenHashMap", "Immutable%sOpenHashMap");
+		
+		addBlockage(ClassType.OBJECT, "Consumer", "Comparator", "Stack");
+		addBlockage(ClassType.BOOLEAN, "ArraySet", "AVLTreeSet", "RBTreeSet", "SortedSet", "NavigableSet", "OpenHashSet", "OpenCustomHashSet", "LinkedOpenHashSet", "LinkedOpenCustomHashSet");
+		addBlockage(ClassType.BOOLEAN, "ImmutableOpenHashMap", "ImmutableOpenHashSet", "SortedMap", "NavigableMap", "OpenHashMap", "LinkedOpenHashMap", "OpenCustomHashMap", "LinkedOpenCustomHashMap", "ArrayMap", "RBTreeMap", "AVLTreeMap");
+	}
+	
+	protected void create(ClassType mainType, ClassType subType) 
+	{
+		GlobalVariables type = new GlobalVariables(mainType, subType);
+		type.createFlags();
+		type.createHelperVariables();
+		type.createVariables();
+		type.createPreFunctions();
+		type.createClassTypes();
+		type.createFunctions();
+		if(mainType == subType) variables.add(type);
+		biVariables.add(type);
+		if(mainType.isObject()) enumVariables.add(type);
+	}
+	
+	protected void addBiClass(String...classNames) 
+	{
+		for(String s : classNames)
+		{
+			biRequired.put(s, "2");
+		}
+	}
+	
+	protected void addBlockage(ClassType type, String...args) 
+	{
+		for(String s : args) 
+		{
+			EnumSet<ClassType> set = blocked.get(s);
+			if(set == null) 
+			{
+				set = EnumSet.noneOf(ClassType.class);
+				blocked.put(s, set);
+			}
+			set.add(type);
+		}
+	}
+	
+	@Override
+	public void createProcesses(String name, Consumer<TemplateProcess> acceptor)
+	{
+		String splitter = biRequired.get(name);
+		boolean valueRequired = enumRequired.contains(name);
+		List<GlobalVariables> vars = getVariablesByClass(name, splitter != null);
+		EnumSet<ClassType> types = blocked.get(name);
+		for(int i = 0,m=vars.size();i<m;i++)
+		{
+			GlobalVariables type = vars.get(i);
+			if(types == null || !types.contains(type.getType()))
+			{
+				acceptor.accept(type.create(nameRemapper.getOrDefault(name, "%s"+name), splitter, valueRequired));
+			}
+		}
+	}
+	
+	protected List<GlobalVariables> getVariablesByClass(String name, boolean bi) {
+		if(enumRequired.contains(name)) return enumVariables;
+		if(bi) return biVariables;
+		return variables;
+	}
+	
+	public static void main(String...args)
+	{
+		try
+		{
+	        if(args.length == 0) {
+	            new PrimitiveCollectionsBuilder().process(false);
+	        } else if(args.length == 1) {
+	            new PrimitiveCollectionsBuilder().process(Boolean.parseBoolean(args[0]));
+	        } else if(args.length == 3) {
+	            new PrimitiveCollectionsBuilder(Paths.get(args[0]), Paths.get(args[1]), Paths.get(args[2])).process(false);
+	        } else if(args.length == 4) {
+	            new PrimitiveCollectionsBuilder(Paths.get(args[0]), Paths.get(args[1]), Paths.get(args[2])).process(Boolean.parseBoolean(args[3]));
+	        } else {
+	            System.out.println("Invalid argument count passed in");
+	            System.exit(1);
+	    	}
+		}
+		catch(InterruptedException e)
+		{
+			e.printStackTrace();
+		}
+		catch(IOException e)
+		{
+			e.printStackTrace();
+		}
+	}
+}

src/builder/java/speiger/src/builder/RequiredType.java

@@ -1,8 +0,0 @@
-package speiger.src.builder;
-
-@SuppressWarnings("javadoc")
-public enum RequiredType
-{
-	BI_CLASS,
-	ENUM
-}

src/builder/java/speiger/src/builder/SettingsManager.java

@@ -1,125 +0,0 @@
-package speiger.src.builder;
-
-import java.io.BufferedReader;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import java.util.Set;
-import java.util.TreeSet;
-
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-import com.google.gson.internal.Streams;
-import com.google.gson.stream.JsonWriter;
-
-import speiger.src.builder.modules.BaseModule;
-
-@SuppressWarnings("javadoc")
-public class SettingsManager
-{
-	boolean loaded;
-	JsonObject data = new JsonObject();
-	Set<String> moduleNames = new TreeSet<>(String.CASE_INSENSITIVE_ORDER);
-	
-	public boolean isModuleEnabled(BaseModule base, ClassType keyType, ClassType valueType) {
-		if(!loaded) return true;
-		if(!isEnabled(data, base.getModuleName())) return false;
-		JsonObject result = getObject(data, keyType.getClassPath(), false);
-		if(!isEnabled(result, "Enabled")) return false;
-		if(base.isBiModule()) {
-			result = getObject(result, valueType.getClassPath(), false);
-			if(!isEnabled(result, "Enabled")) return false;
-		}
-		result = getObject(result, base.getModuleName(), false);
-		return (result.size() <= 0 || isEnabled(result, "Enabled")) && base.areDependenciesLoaded();		
-	}
-	
-	public boolean isModuleEnabled(BaseModule base, ClassType keyType, ClassType valueType, String entry)
-	{
-		if(!loaded) return true;
-		if(!isEnabled(data, base.getModuleName())) return false;
-		JsonObject result = getObject(data, keyType.getClassPath(), false);
-		if(!isEnabled(result, "Enabled")) return false;
-		if(base.isBiModule()) {
-			result = getObject(result, valueType.getClassPath(), false);
-			if(!isEnabled(result, "Enabled")) return false;
-		}
-		result = getObject(result, base.getModuleName(), false);
-		return (result.size() <= 0 || (isEnabled(result, "Enabled") && isEnabled(result, entry))) && base.areDependenciesLoaded();
-	}
-	
-	public void addModule(BaseModule module) {
-		if(loaded) return;
-		String moduleName = module.getModuleName();
-		moduleNames.add(moduleName);
-		data.addProperty(moduleName, true);
-		if(module.isBiModule()) {
-			for(ClassType keyType : ModulePackage.TYPE) {
-				for(ClassType valueType : ModulePackage.TYPE) {
-					if(!module.isModuleValid(keyType, valueType)) continue;
-					JsonObject obj = new JsonObject();
-					obj.addProperty("Enabled", true);
-					for(String key : module.getModuleKeys(keyType, valueType)) {
-						obj.addProperty(key, true);
-					}
-					addModule(keyType, valueType, true, moduleName, obj);
-				}
-			}
-			return;
-		}
-		for(ClassType keyType : ModulePackage.TYPE) {
-			if(!module.isModuleValid(keyType, keyType)) continue;
-			JsonObject obj = new JsonObject();
-			obj.addProperty("Enabled", true);
-			for(String key : module.getModuleKeys(keyType, keyType)) {
-				obj.addProperty(key, true);
-			}
-			addModule(keyType, keyType, false, moduleName, obj);			
-		}
-	}
-	
-	public void load() {
-		try(BufferedReader reader = Files.newBufferedReader(Paths.get("ModulSettings.json"))) {
-			data = JsonParser.parseReader(reader).getAsJsonObject();
-			loaded = true;
-		}
-		catch(Exception e) { e.printStackTrace(); }
-	}
-	
-	public void save() {
-		data.asMap().keySet().removeAll(moduleNames);
-		JsonObject result = new JsonObject();
-		for(String s : moduleNames) {
-			result.addProperty(s, true);
-		}
-		result.asMap().putAll(data.asMap());
-		
-		try(JsonWriter writer = new JsonWriter(Files.newBufferedWriter(Paths.get("ModulSettings.json")))) {
-			writer.setIndent("\t");
-			Streams.write(result, writer);
-		}
-		catch(Exception e) { e.printStackTrace(); }
-	}
-	
-	private void addModule(ClassType keyType, ClassType valueType, boolean bi, String moduleName, JsonObject obj) {
-		JsonObject result = getObject(data, keyType.getClassPath(), true);
-		if(bi) {
-			result = getObject(result, valueType.getClassPath(), true);
-		}
-		result.add(moduleName, obj);
-	}
-	
-	private JsonObject getObject(JsonObject data, String name, boolean create) {
-		JsonObject obj = data.getAsJsonObject(name);
-		if(obj == null) {
-			obj = new JsonObject();
-			data.add(name, obj);
-			if(create) obj.addProperty("Enabled", true);
-		}
-		return obj;
-	}
-	
-	private boolean isEnabled(JsonObject obj, String key) {
-		if(obj.has(key)) return obj.getAsJsonPrimitive(key).getAsBoolean();
-		return true;
-	}
-}

src/builder/java/speiger/src/builder/modules/AsyncModule.java

@@ -1,45 +0,0 @@
-package speiger.src.builder.modules;
-
-@SuppressWarnings("javadoc")
-public class AsyncModule extends BaseModule
-{
-	public static final BaseModule INSTANCE = new AsyncModule();
-	
-	@Override
-	public String getModuleName() { return "Async"; }
-	@Override
-	protected void loadVariables() {}
-	@Override
-	protected void loadRemappers() {}
-	@Override
-	protected void loadTestClasses() {}
-	@Override
-	protected void loadFunctions() {}
-	@Override
-	public boolean areDependenciesLoaded() { return isDependencyLoaded(CollectionModule.INSTANCE); }
-	@Override
-	protected void loadBlockades() {
-		if(!isModuleEnabled()) {
-			addBlockedFiles("AsyncBuilder", "Task");
-		}
-	}
-	@Override
-	protected void loadFlags() {
-		if(isModuleEnabled()) {
-			addKeyFlag("ASYNC_MODULE");
-		}
-	}
-	
-	@Override
-	protected void loadClasses()
-	{
-		//Implementation Classes
-		addClassMapper("ASYNC_BUILDER", "AsyncBuilder");
-		
-		//Abstract Classes
-		addAbstractMapper("BASE_TASK", "Base%sTask");
-		
-		//Interfaces
-		addClassMapper("TASK", "Task");
-	}
-}

src/builder/java/speiger/src/builder/modules/BaseModule.java

@@ -1,208 +0,0 @@
-package speiger.src.builder.modules;
-
-import java.util.Collections;
-import java.util.Set;
-import java.util.function.Predicate;
-
-import speiger.src.builder.ClassType;
-import speiger.src.builder.ModulePackage;
-import speiger.src.builder.RequiredType;
-import speiger.src.builder.SettingsManager;
-import speiger.src.builder.mappers.ArgumentMapper;
-import speiger.src.builder.mappers.InjectMapper;
-import speiger.src.builder.mappers.LineMapper;
-import speiger.src.builder.mappers.SimpleMapper;
-
-@SuppressWarnings("javadoc")
-public abstract class BaseModule
-{
-	SettingsManager manager;
-	ModulePackage entry;
-	protected ClassType keyType;
-	protected ClassType valueType;
-	
-	public final void setManager(SettingsManager manager) {
-		this.manager = manager;
-		manager.addModule(this);
-	}
-	
-	public final void init(ModulePackage entry) {
-		this.entry = entry;
-		keyType = entry.getKeyType();
-		valueType = entry.getValueType();
-		loadVariables();
-		loadClasses();
-		loadTestClasses();
-		loadFunctions();
-		loadRemappers();
-		loadBlockades();
-		loadFlags();
-	}
-	
-	public final void cleanup() {
-		entry = null;
-		keyType = null;
-		valueType = null;
-		manager = null;
-	}
-	
-	protected abstract void loadVariables();
-	protected abstract void loadClasses();
-	protected abstract void loadTestClasses();
-	protected abstract void loadFunctions();
-	protected abstract void loadRemappers();
-	protected abstract void loadBlockades();
-	protected abstract void loadFlags();
-	
-	public abstract String getModuleName();
-	public boolean isBiModule() { return false; }
-	public Set<String> getModuleKeys(ClassType keyType, ClassType valueType) { return Collections.emptySet(); }
-	public boolean isModuleValid(ClassType keyType, ClassType valueType) { return true; }
-	
-	public ClassType keyType() { return keyType; }
-	public ClassType valueType() { return valueType; }
-	
-	protected boolean isModuleEnabled() {
-		return manager == null || manager.isModuleEnabled(this, keyType, valueType);
-	}
-	
-	protected boolean isModuleEnabled(String name) {
-		return manager == null || manager.isModuleEnabled(this, keyType, valueType, name);
-	}
-	
-	protected boolean isDependencyLoaded(BaseModule module) {
-		return isDependencyLoaded(module, true);
-	}
-	
-	protected boolean isDependencyLoaded(BaseModule module, boolean key) {
-		return manager == null || (module.isBiModule() ? manager.isModuleEnabled(module, keyType, valueType) : (key ? manager.isModuleEnabled(module, keyType, keyType) : manager.isModuleEnabled(module, valueType, valueType))); 
-	}
-	
-	public boolean areDependenciesLoaded() {
-		return true;
-	}
-	
-	protected void addFlag(String name) {
-		entry.addFlag(name);
-	}
-	
-	protected void addValue(String name, int value) {
-		entry.addValue(name, value);
-	}
-	
-	protected void addKeyFlag(String name) {
-		entry.addFlag(name);
-		entry.addGlobalFlag(keyType.getCapType()+"_"+name);
-	}
-	
-	protected void addBiRequirement(String fileName) {
-		entry.addRequirement(fileName, RequiredType.BI_CLASS);
-		entry.addSplitter(fileName, "%1$s2%2$s");
-	}
-	
-	protected void addEnumRequirement(String fileName) {
-		entry.addRequirement(fileName, RequiredType.ENUM);
-		entry.addSplitter(fileName, "%2$s");
-
-	}
-	
-	protected void addBiRequirement(String fileName, String splitter) {
-		entry.addRequirement(fileName, RequiredType.BI_CLASS);
-		entry.addSplitter(fileName, "%1$s"+splitter+"%2$s");
-	}
-	
-	protected void addRequirement(String fileName, String splitter, RequiredType type) {
-		entry.addRequirement(fileName, type);
-		entry.addSplitter(fileName, splitter);
-	}
-	
-	protected void addRemapper(String fileName, String actualName) {
-		entry.addRemapper(fileName, actualName);
-	}
-	
-	protected void addBlockedFiles(String... name) {
-		entry.addBlockedFiles(name);
-	}
-	
-	protected void addBlockedFilter(Predicate<String> filter) {
-		entry.addBlockedFilter(filter);
-	}
-	
-	protected void addClassMapper(String pattern, String replacement) {
-		entry.addMapper(new SimpleMapper("VALUE_"+pattern, "VALUE_"+pattern, valueType.getFileType()+replacement));
-		entry.addMapper(new SimpleMapper(pattern, pattern, keyType.getFileType()+replacement));
-	}
-	
-	protected void addBiClassMapper(String pattern, String replacement, String splitter) {
-		entry.addMapper(new SimpleMapper("KEY_"+pattern, "KEY_"+pattern, keyType.getFileType()+splitter+keyType.getFileType()+replacement));
-		entry.addMapper(new SimpleMapper("VALUE_"+pattern, "VALUE_"+pattern, valueType.getFileType()+splitter+valueType.getFileType()+replacement));
-		entry.addMapper(new SimpleMapper(pattern, pattern, keyType.getFileType()+splitter+valueType.getFileType()+replacement));
-	}
-	
-	protected void addAbstractMapper(String pattern, String replacement) {
-		entry.addMapper(new SimpleMapper("VALUE_"+pattern, "VALUE_"+pattern, String.format(replacement, valueType.getFileType())));
-		entry.addMapper(new SimpleMapper(pattern, pattern, String.format(replacement, keyType.getFileType())));		
-	}
-	
-	protected void addAbstractBiMapper(String pattern, String replacement, String splitter) {
-		entry.addMapper(new SimpleMapper(pattern, pattern, String.format(replacement, keyType.getFileType()+splitter+valueType.getFileType())));
-	}
-	
-	protected void addFunctionMapper(String pattern, String replacement) {
-		entry.addMapper(new SimpleMapper("VALUE_"+pattern, "VALUE_"+pattern, replacement+valueType.getNonFileType()));
-		entry.addMapper(new SimpleMapper(pattern, pattern, replacement+keyType.getNonFileType()));
-	}
-	
-	protected void addFunctionValueMapper(String pattern, String replacement) {
-		entry.addMapper(new SimpleMapper(pattern, pattern, replacement+valueType.getNonFileType()));
-	}
-	
-	protected void addFunctionMappers(String pattern, String replacement) {
-		entry.addMapper(new SimpleMapper("VALUE_"+pattern, "VALUE_"+pattern, String.format(replacement, valueType.getNonFileType())));		
-		entry.addMapper(new SimpleMapper(pattern, pattern, String.format(replacement, keyType.getNonFileType())));		
-	}
-	
-	protected void addFunctionValueMappers(String pattern, String replacement) {
-		entry.addMapper(new SimpleMapper(pattern, pattern, String.format(replacement, valueType.getNonFileType())));		
-	}
-	
-	protected void addSimpleMapper(String pattern, String replacement) {
-		entry.addMapper(new SimpleMapper(pattern, pattern, replacement));
-	}
-	
-	protected void addAnnontion(String pattern, String value) {
-		if(keyType == ClassType.OBJECT) entry.addMapper(new LineMapper(pattern, pattern));
-		else entry.addMapper(new SimpleMapper(pattern, pattern, value));
-	}
-	
-	protected void addValueAnnontion(String pattern, String value) {
-		if(valueType == ClassType.OBJECT) entry.addMapper(new LineMapper(pattern, pattern));
-		else entry.addMapper(new SimpleMapper(pattern, pattern, value));
-	}
-	
-	protected void addComment(String pattern, String value) {
-		if(keyType == ClassType.OBJECT) entry.addMapper(new InjectMapper(pattern, pattern, value).removeBraces());
-		else entry.addMapper(new LineMapper(pattern, pattern));
-	}
-	
-	protected void addValueComment(String pattern, String value) {
-		if(valueType == ClassType.OBJECT) entry.addMapper(new InjectMapper(pattern, pattern, value).removeBraces());
-		else entry.addMapper(new LineMapper(pattern, pattern));
-	}
-	
-	protected InjectMapper addInjectMapper(String pattern, String replacement) {
-		InjectMapper mapper = new InjectMapper(pattern, pattern, replacement);
-		entry.addMapper(mapper);
-		return mapper;
-	}
-	
-	protected ArgumentMapper addArgumentMapper(String pattern, String replacement) {
-		return addArgumentMapper(pattern, replacement, ", ");
-	}
-	
-	protected ArgumentMapper addArgumentMapper(String pattern, String replacement, String splitter) {
-		ArgumentMapper mapper = new ArgumentMapper(pattern, pattern, replacement, splitter);
-		entry.addMapper(mapper);
-		return mapper;
-	}
-}

src/builder/java/speiger/src/builder/modules/CollectionModule.java

@@ -1,128 +0,0 @@
-package speiger.src.builder.modules;
-
-import java.util.Arrays;
-import java.util.Set;
-import java.util.TreeSet;
-
-import speiger.src.builder.ClassType;
-
-@SuppressWarnings("javadoc")
-public class CollectionModule extends BaseModule
-{
-	public static final BaseModule INSTANCE = new CollectionModule();
-	
-	@Override
-	public String getModuleName() { return "Collection"; }
-	@Override
-	protected void loadVariables() {}
-	@Override
-	public boolean areDependenciesLoaded(){ return isDependencyLoaded(JavaModule.INSTANCE); }
-	
-	@Override
-	public Set<String> getModuleKeys(ClassType keyType, ClassType valueType)
-	{
-		return new TreeSet<>(Arrays.asList("Streams", "Splititerators", "IArray", "Strategy"));
-	}
-	
-	@Override
-	protected void loadFlags() {
-		if(isModuleEnabled()) addKeyFlag("COLLECTION_MODULE");
-		if(isModuleEnabled("Streams")) addKeyFlag("STREAM_FEATURE");
-		if(isModuleEnabled("Splititerators")) addKeyFlag("SPLIT_ITERATOR_FEATURE");
-		if(isModuleEnabled("IArray")) addKeyFlag("IARRAY_FEATURE");
-	}
-	
-	@Override
-	protected void loadBlockades() {
-		if(!isModuleEnabled()) {
-			addBlockedFiles("Iterable", "Iterables", "Iterator", "Iterators", "BidirectionalIterator", "ListIterator");
-			addBlockedFiles("Arrays", "Collection", "AbstractCollection", "Collections", "Stack");
-		}
-		if(!isModuleEnabled("Splititerators")) addBlockedFiles("Splititerator", "Splititerators");
-		if(!isModuleEnabled("IArray")) addBlockedFiles("IArray");
-		if(!isModuleEnabled("Strategy")) addBlockedFiles("Strategy");
-		
-		if(keyType.isObject()) {
-			addBlockedFiles("Stack");
-			addBlockedFiles("CollectionStreamTester");
-		}
-		if(keyType == ClassType.BOOLEAN) {
-			addBlockedFiles("CollectionRemoveIfTester", "CollectionStreamTester");
-			addBlockedFilter(T -> T.endsWith("Tester") && T.startsWith("Iterable"));
-		}
-	}
-	
-	@Override
-	protected void loadRemappers()
-	{
-		//Main Classes
-		addRemapper("IArray", "I%sArray");
-		addRemapper("AbstractCollection", "Abstract%sCollection");
-		
-		//Test Classes
-		addRemapper("AbstractIteratorTester", "Abstract%sIteratorTester");
-		addRemapper("MinimalCollection", "Minimal%sCollection");
-		addRemapper("TestCollectionGenerator", "Test%sCollectionGenerator");
-		addRemapper("AbstractContainerTester", "Abstract%sContainerTester");
-		addRemapper("AbstractCollectionTester", "Abstract%sCollectionTester");
-		addRemapper("SimpleTestGenerator", "Simple%sTestGenerator");
-	}
-	
-	@Override
-	protected void loadFunctions()
-	{
-		addFunctionMapper("NEXT", "next");
-		addSimpleMapper("NEW_STREAM", keyType.isPrimitiveBlocking() ? "" : keyType.getCustomJDKType().getKeyType()+"Stream");
-		addFunctionMapper("PREVIOUS", "previous");
-		addFunctionMapper("REMOVE_KEY", "rem");
-		addSimpleMapper("TO_ARRAY", "to"+keyType.getNonFileType()+"Array");
-		addSimpleMapper("VALUE_TO_ARRAY", "to"+valueType.getNonFileType()+"Array");
-	}
-	
-	@Override
-	protected void loadClasses()
-	{
-		//Abstract Classes
-		addAbstractMapper("ABSTRACT_COLLECTION", "Abstract%sCollection");
-		
-		//Helper Classes
-		addClassMapper("ARRAYS", "Arrays");
-		addClassMapper("COLLECTIONS", "Collections");
-		addClassMapper("ITERABLES", "Iterables");
-		addClassMapper("SPLIT_ITERATORS", "Splititerators");
-		addClassMapper("ITERATORS", "Iterators");
-		
-		//Interfaces
-		addClassMapper("COLLECTION", "Collection");
-		addClassMapper("ITERABLE", "Iterable");
-		addClassMapper("SPLIT_ITERATOR", "Splititerator");
-		addClassMapper("LIST_ITERATOR", "ListIterator");
-		addClassMapper("BI_ITERATOR", "BidirectionalIterator");
-		addClassMapper("ITERATOR", "Iterator");
-		if(keyType.isObject()) addSimpleMapper("STACK", "Stack");
-		else addClassMapper("STACK", "Stack");
-		addClassMapper("STRATEGY", "Strategy");
-	}
-	
-	@Override
-	protected void loadTestClasses()
-	{
-		//Implementation Classes
-		addAbstractMapper("MINIMAL_COLLECTION", "Minimal%sCollection");
-		addClassMapper("BIDIRECTIONAL_ITERATOR_TESTER", "BidirectionalteratorTester");
-		addClassMapper("LIST_ITERATOR_TESTER", "ListIteratorTester");
-		addClassMapper("ITERATOR_TESTER", "IteratorTester");
-		addClassMapper("COLLECTION_TEST_BUILDER", "CollectionTestSuiteBuilder");
-		addClassMapper("COLLECTION_CONSTRUCTOR_TESTS", "CollectionConstructorTests");
-		
-		//Abstract Classes
-		addAbstractMapper("ABSTRACT_COLLECTION_TESTER", "Abstract%sCollectionTester");
-		addAbstractMapper("ABSTRACT_CONTAINER_TESTER", "Abstract%sContainerTester");
-		addAbstractMapper("ABSTRACT_ITERATOR_TESTER", "Abstract%sIteratorTester");
-		
-		//Helper Classes
-		addAbstractMapper("TEST_COLLECTION_GENERATOR", "Test%sCollectionGenerator");
-		addAbstractMapper("SIMPLE_TEST_GENERATOR", "Simple%sTestGenerator");
-
-	}
-}

src/builder/java/speiger/src/builder/modules/FunctionModule.java

@@ -1,107 +0,0 @@
-package speiger.src.builder.modules;
-
-import speiger.src.builder.ClassType;
-import speiger.src.builder.RequiredType;
-
-@SuppressWarnings("javadoc")
-public class FunctionModule extends BaseModule
-{
-	public static final BaseModule INSTANCE = new FunctionModule();
-	
-	@Override
-	public String getModuleName() { return "Function"; }
-	@Override
-	public boolean isBiModule() { return true; }
-	@Override
-	protected void loadVariables() {}
-	@Override
-	protected void loadFlags() {}
-	@Override
-	protected void loadTestClasses() {}
-	
-	@Override
-	protected void loadBlockades()
-	{
-		if(keyType.isObject()) addBlockedFiles("Consumer", "Comparator");
-	}
-	
-	@Override
-	protected void loadRemappers()
-	{
-		addBiRequirement("BiConsumer", "");
-		addBiRequirement("UnaryOperator", "");
-		if(valueType == ClassType.BOOLEAN) {
-			addRequirement("Function", "%1$s", RequiredType.BI_CLASS);
-			addRemapper("Function", (keyType.isObject() ? "" : "%s")+"Predicate");
-		}
-		else if(keyType.isObject() && !valueType.isObject()) {
-			addRequirement("Function", "%2$s", RequiredType.BI_CLASS);
-			addRemapper("Function", "To%sFunction");			
-		}
-		else if(keyType == valueType) {
-			addRequirement("Function", "%1$s", RequiredType.BI_CLASS);
-			addRemapper("Function", (keyType.isObject() ? "" : "%s")+"UnaryOperator");
-		}
-		else if(valueType.isObject()) {
-			addRequirement("Function", "%1$s", RequiredType.BI_CLASS);
-			addRemapper("Function", "%sFunction");
-		}
-		else addBiRequirement("Function");
-		addRemapper("BiConsumer", "%sConsumer");
-	}
-	
-	@Override
-	protected void loadFunctions()
-	{
-		addSimpleMapper("APPLY", keyType.getApply(valueType));
-		addSimpleMapper("SUPPLY_GET", keyType.isObject() ? "get" : "getAs"+keyType.getNonFileType());
-		addSimpleMapper("VALUE_SUPPLY_GET", valueType.isObject() ? "get" : "getAs"+valueType.getNonFileType());
-	}
-	
-	@Override
-	protected void loadClasses()
-	{
-		//Interfaces
-		addBiClassMapper("BI_CONSUMER", "Consumer", "");
-		addClassMapper("BI_TO_OBJECT_CONSUMER", "ObjectConsumer");
-		addAbstractMapper("BI_FROM_OBJECT_CONSUMER", "Object%sConsumer");
-		addAbstractMapper("BI_FROM_INT_CONSUMER", "Int%sConsumer");
-		if(keyType.isObject()) {
-			addSimpleMapper("TO_OBJECT_FUNCTION", keyType.getNonFileType()+"UnaryOperator");
-			addSimpleMapper("VALUE_TO_OBJECT_FUNCTION", valueType.isObject() ? "UnaryOperator" : valueType.getFileType()+"Function");
-		}
-		else {
-			addSimpleMapper("TO_OBJECT_FUNCTION", keyType.getNonFileType()+"Function");
-			addSimpleMapper("VALUE_TO_OBJECT_FUNCTION", valueType.isObject() ? "UnaryOperator" : valueType.getFileType()+"Function");
-		}
-		if(valueType == ClassType.BOOLEAN) addFunctionMappers("FUNCTION", "%sPredicate");
-		else if(keyType.isObject() && !valueType.isObject()) addFunctionValueMappers("FUNCTION", "To%sFunction");
-		else if(keyType == valueType) addFunctionMappers("FUNCTION", "%sUnaryOperator");
-		else if(valueType.isObject()) addFunctionMappers("FUNCTION", "%sFunction");
-		else addBiClassMapper("FUNCTION", "Function", "2");
-		
-		addFunctionMappers("PREDICATE", "%sPredicate");
-		addClassMapper("SUPPLIER", "Supplier");
-		addAbstractMapper("SINGLE_UNARY_OPERATOR", "%1$s%1$sUnaryOperator");
-		addBiClassMapper("UNARY_OPERATOR", "UnaryOperator", "");
-		if(keyType.isObject())
-		{
-			if(!valueType.isObject()) addSimpleMapper("VALUE_CONSUMER", valueType.getFileType()+"Consumer");
-			else addSimpleMapper("VALUE_CONSUMER", "Consumer");
-			addSimpleMapper("CONSUMER", "Consumer");
-			addSimpleMapper("IARRAY", "IObjectArray");
-		}
-		else
-		{
-			if(valueType.isObject()) 
-			{
-				addSimpleMapper("VALUE_CONSUMER", "Consumer");
-				addSimpleMapper("CONSUMER", keyType.getFileType()+"Consumer");
-			}
-			else addClassMapper("CONSUMER", "Consumer");
-			addFunctionMappers("IARRAY", "I%sArray");
-		}
-		addSimpleMapper("VALUE_COMPARATOR", valueType.isObject() ? "Comparator" : String.format("%sComparator", valueType.getNonFileType()));
-		addSimpleMapper("COMPARATOR", keyType.isObject() ? "Comparator" : String.format("%sComparator", keyType.getNonFileType()));
-	}
-}

src/builder/java/speiger/src/builder/modules/JavaModule.java

@@ -1,221 +0,0 @@
-package speiger.src.builder.modules;
-
-import speiger.src.builder.ClassType;
-
-@SuppressWarnings("javadoc")
-public class JavaModule extends BaseModule
-{
-	public static final BaseModule INSTANCE = new JavaModule();
-	
-	@Override
-	public String getModuleName() { return "Base"; }
-	@Override
-	protected void loadVariables()
-	{
-		createHelperVars(keyType, false, "KEY");
-		createHelperVars(valueType, true, "VALUE");
-		loadBaseVariables();
-	}
-	
-	@Override
-	protected void loadFlags()
-	{
-		addFlag("TYPE_"+keyType.getCapType());
-		addFlag("VALUE_"+valueType.getCapType());
-		addValue("JAVA_VERSION", getVersion());
-		if(keyType == valueType) addFlag("SAME_TYPE");
-		if(keyType.hasFunction(valueType)) addFlag("JDK_FUNCTION");
-		if(!keyType.needsCustomJDKType()) addFlag("JDK_TYPE");
-		if(!keyType.isPrimitiveBlocking()) addFlag("PRIMITIVES");
-		if(!valueType.isPrimitiveBlocking()) addFlag("VALUE_PRIMITIVES");
-		if(!valueType.needsCustomJDKType()) addFlag("JDK_VALUE");
-	}
-	
-	private int getVersion()  {
-		String version = System.getProperty("java.version");
-		if(version.startsWith("1.")) return Integer.parseInt(version.substring(2, 3));
-		int dot = version.indexOf(".");
-		return Integer.parseInt(dot != -1 ? version.substring(0, dot) : version);
-	}
-	
-	@Override
-	protected void loadRemappers() {}
-	@Override
-	protected void loadBlockades() {}
-	
-	@Override
-	protected void loadFunctions()
-	{
-		addSimpleMapper("APPLY_KEY_VALUE", keyType.isObject() ? "apply" : "applyAs"+keyType.getNonFileType());
-		addSimpleMapper("APPLY_VALUE", valueType.isObject() ? "apply" : "applyAs"+valueType.getNonFileType());
-		addSimpleMapper("APPLY_CAST", "applyAs"+keyType.getCustomJDKType().getNonFileType());
-		
-		//Shared by Maps and Pairs so moved to java.
-		addFunctionMappers("ENTRY_KEY", "get%sKey");
-		addFunctionValueMappers("ENTRY_VALUE", "get%sValue");
-		addFunctionMappers("KEY_ENTRY", "set%sKey");
-		addFunctionValueMappers("VALUE_ENTRY", "set%sValue");
-	}
-	
-	@Override
-	protected void loadClasses()
-	{
-		if(getVersion() >= 17) addSimpleMapper("RANDOM", "RandomGenerator");
-		else addSimpleMapper("RANDOM", "Random");
-		addSimpleMapper("JAVA_PREDICATE", keyType.isPrimitiveBlocking() ? "" : keyType.getCustomJDKType().getFileType()+"Predicate");
-		addSimpleMapper("JAVA_CONSUMER", keyType.isPrimitiveBlocking() ? "" : "java.util.function."+keyType.getCustomJDKType().getFileType()+"Consumer");
-		addSimpleMapper("JAVA_SUPPLIER", keyType.isPrimitiveBlocking() ? "" : "java.util.function."+keyType.getCustomJDKType().getFileType()+"Supplier");
-		addSimpleMapper("JAVA_FUNCTION", keyType.getFunctionClass(valueType));
-		addSimpleMapper("JAVA_BINARY_OPERATOR", keyType == ClassType.BOOLEAN ? "" : (keyType.isObject() ? "java.util.function.BinaryOperator" : "java.util.function."+keyType.getCustomJDKType().getFileType()+"BinaryOperator"));
-		addSimpleMapper("JAVA_UNARY_OPERATOR", keyType.isObject() ? "BinaryOperator" : keyType == ClassType.BOOLEAN ? "" : keyType.getCustomJDKType().getFileType()+"UnaryOperator");
-		addSimpleMapper("JAVA_SPLIT_ITERATOR", keyType.isPrimitiveBlocking() ? "Spliterator" : "Of"+keyType.getCustomJDKType().getFileType());
-		addSimpleMapper("JAVA_STREAM", keyType.isPrimitiveBlocking() ? "" : keyType.getCustomJDKType().getFileType()+"Stream");
-		addSimpleMapper("JAVA_BUFFER", keyType.getFileType()+"Buffer");
-	}
-	
-	@Override
-	protected void loadTestClasses()
-	{
-		addClassMapper("HELPERS", "Helpers");
-		addClassMapper("SAMPLE_ELEMENTS", "Samples");
-	}
-	
-	private void loadBaseVariables()
-	{
-		addSimpleMapper("VALUE_PACKAGE", valueType.getPathType());
-		addSimpleMapper("PACKAGE", keyType.getPathType());
-		addSimpleMapper("CLASS_TYPE", keyType.getClassType());
-		addSimpleMapper("CLASS_VALUE_TYPE", valueType.getClassValueType());
-		addSimpleMapper("KEY_TYPE", keyType.getKeyType());
-		addSimpleMapper("KEY_OBJECT_TYPE", keyType.isObject() ? "Object" : keyType.getKeyType());
-		addSimpleMapper("KEY_STRING_TYPE", keyType.isObject() ? "String" : keyType.getKeyType());
-		addSimpleMapper("KEY_SPECIAL_TYPE", keyType.isObject() ? "E" : keyType.getKeyType());
-		addSimpleMapper("CLASS_OBJECT_TYPE", keyType.getClassType());
-		addSimpleMapper("CLASS_OBJECT_VALUE_TYPE", valueType.getClassValueType());
-		addSimpleMapper("CLASS_STRING_TYPE", keyType.isObject() ? "String" : keyType.getClassType());
-		addSimpleMapper("CLASS_STRING_VALUE_TYPE", valueType.isObject() ? "String" : valueType.getClassValueType());
-		addSimpleMapper("VALUE_TYPE", valueType.getValueType());
-		addSimpleMapper("VALUE_OBJECT_TYPE", valueType.isObject() ? "Object" : valueType.getValueType());
-		addSimpleMapper("VALUE_STRING_TYPE", valueType.isObject() ? "String" : valueType.getValueType());
-		addSimpleMapper("VALUE_SPECIAL_TYPE", valueType.isObject() ? "E" : valueType.getKeyType());
-		addSimpleMapper("KEY_JAVA_TYPE", keyType.getCustomJDKType().getKeyType());
-		addSimpleMapper("VALUE_JAVA_TYPE", keyType.getCustomJDKType().getKeyType());
-		
-		addSimpleMapper("EMPTY_KEY_VALUE", keyType.getEmptyValue());
-		addSimpleMapper("EMPTY_VALUE", valueType.getEmptyValue());
-		
-		addSimpleMapper("INVALID_KEY_VALUE", keyType.getInvalidValue());
-		addSimpleMapper("INVALID_VALUE", valueType.getInvalidValue());
-		
-		addSimpleMapper(" KEY_STRING_GENERIC_TYPE", keyType.isObject() ? "<String>" : "");
-		addSimpleMapper(" VALUE_STRING_GENERIC_TYPE", valueType.isObject() ? "<String>" : "");
-		addSimpleMapper(" KEY_VALUE_STRING_GENERIC_TYPE", keyType.isObject() ? (valueType.isObject() ? "<String, String>" : "<String>") : (valueType.isObject() ? "<String>" : ""));
-		
-		addSimpleMapper(" KEY_SAME_GENERIC_TYPE", keyType.isObject() ? "<T, T>" : "");
-		addSimpleMapper(" VALUE_SAME_GENERIC_TYPE", keyType.isObject() ? "<V, V>" : "");
-		
-		addSimpleMapper(" KEY_GENERIC_TYPE", keyType.isObject() ? "<"+keyType.getKeyType()+">" : "");
-		addSimpleMapper(" KEY_KEY_GENERIC_TYPE", keyType.isObject() ? "<"+keyType.getKeyType()+", "+keyType.getKeyType()+">" : "");
-		addSimpleMapper(" KEY_CLASS_GENERIC_TYPE", keyType.isObject() ? "<"+keyType.getClassType()+">" : "");
-
-		
-		addSimpleMapper(" VALUE_GENERIC_TYPE", valueType.isObject() ? "<"+valueType.getValueType()+">" : "");
-		addSimpleMapper(" VALUE_VALUE_GENERIC_TYPE", valueType.isObject() ? "<"+valueType.getValueType()+", "+valueType.getValueType()+">" : "");
-		addSimpleMapper(" VALUE_CLASS_GENERIC_TYPE", valueType.isObject() ? "<"+valueType.getClassValueType()+">" : "");
-		
-		addSimpleMapper(" KEY_VALUE_GENERIC_TYPE", keyType.isObject() ? (valueType.isObject() ? "<"+keyType.getKeyType()+", "+valueType.getValueType()+">" : "<"+keyType.getKeyType()+">") : (valueType.isObject() ? "<"+valueType.getValueType()+">" : ""));
-		addSimpleMapper(" KEY_VALUE_VALUE_GENERIC_TYPE", keyType.isObject() ? (valueType.isObject() ? "<"+keyType.getKeyType()+", "+valueType.getValueType()+", "+valueType.getValueType()+">" : "<"+keyType.getKeyType()+">") : (valueType.isObject() ? "<"+valueType.getValueType()+", "+valueType.getValueType()+">" : ""));
-		addInjectMapper(" KEY_VALUE_SPECIAL_GENERIC_TYPE", keyType.isObject() ? (valueType.isObject() ? "<"+keyType.getKeyType()+", "+valueType.getValueType()+", %s>" : "<"+keyType.getKeyType()+", %s>") : (valueType.isObject() ? "<"+valueType.getValueType()+", %s>" : "<%s>")).setBraceType("<>").removeBraces();
-		
-		addSimpleMapper(" NO_GENERIC_TYPE", keyType.isObject() ? "<?>" : "");
-		addSimpleMapper(" NO_KV_GENERIC_TYPE", keyType.isObject() ? (valueType.isObject() ? "<?, ?>" : "<?>") : valueType.isObject() ? "<?>" : "");
-		addSimpleMapper(" KEY_COMPAREABLE_TYPE", keyType.isObject() ? "<"+keyType.getKeyType()+" extends Comparable<T>>" : "");
-		
-		addSimpleMapper(" KEY_SUPER_GENERIC_TYPE", keyType.isObject() ? "<? super "+keyType.getKeyType()+">" : "");
-		addSimpleMapper(" VALUE_SUPER_GENERIC_TYPE", valueType.isObject() ? "<? super "+valueType.getValueType()+">" : "");
-		addSimpleMapper(" KEY_VALUE_SUPER_GENERIC_TYPE", keyType.isObject() ? (valueType.isObject() ? "<? super "+keyType.getKeyType()+", ? super "+valueType.getValueType()+">" : "<? super "+keyType.getKeyType()+">") : (valueType.isObject() ? "<? super "+valueType.getValueType()+">" : ""));
-		
-		addSimpleMapper(" KEY_UNKNOWN_GENERIC_TYPE", keyType.isObject() ? "<? extends "+keyType.getKeyType()+">" : "");
-		addSimpleMapper(" VALUE_UNKNOWN_GENERIC_TYPE", valueType.isObject() ? "<? extends "+valueType.getValueType()+">" : "");
-		addSimpleMapper(" KEY_VALUE_UNKNOWN_GENERIC_TYPE", keyType.isObject() ? (valueType.isObject() ? "<? extends "+keyType.getKeyType()+", ? extends "+valueType.getValueType()+">" : "<? extends "+keyType.getKeyType()+">") : (valueType.isObject() ? "<? extends "+valueType.getValueType()+">" : ""));
-
-		addSimpleMapper(" KEY_ENUM_VALUE_GENERIC_TYPE", keyType.isObject() ? (valueType.isObject() ? "<"+keyType.getKeyType()+" extends Enum<"+keyType.getKeyType()+">, "+valueType.getValueType()+">" : "<"+keyType.getKeyType()+" extends Enum<"+keyType.getKeyType()+">>") : (valueType.isObject() ? "<"+valueType.getValueType()+">" : ""));
-		addSimpleMapper(" KEY_VALUE_ENUM_GENERIC_TYPE", keyType.isObject() ? (valueType.isObject() ? "<"+keyType.getKeyType()+", "+valueType.getValueType()+" extends Enum<"+valueType.getValueType()+">>" : "<"+keyType.getKeyType()+">") : (valueType.isObject() ? "<"+valueType.getValueType()+" extends Enum<"+valueType.getValueType()+">>" : ""));
-		
-		addInjectMapper(" KEY_SPECIAL_GENERIC_TYPE", keyType.isObject() ? "<%s>" : "").removeBraces().setBraceType("<>");
-		addInjectMapper(" VALUE_SPECIAL_GENERIC_TYPE", valueType.isObject() ? "<%s>" : "").removeBraces().setBraceType("<>");
-		addInjectMapper(" KSK_GENERIC_TYPE", keyType.isObject() ? "<%s, "+keyType.getKeyType()+">" : "<%s>").removeBraces().setBraceType("<>");
-		addInjectMapper(" KKS_GENERIC_TYPE", keyType.isObject() ? "<"+keyType.getKeyType()+", %s>" : "<%s>").removeBraces().setBraceType("<>");
-		addArgumentMapper(" KSS_GENERIC_TYPE", keyType.isObject() ? "<%1$s, %2$s>" : "<%2$s>").removeBraces().setBraceType("<>");		
-		addInjectMapper(" SK_GENERIC_TYPE", keyType.isObject() ? "<%s, "+keyType.getKeyType()+">" : "").removeBraces().setBraceType("<>");
-		addInjectMapper(" KS_GENERIC_TYPE", keyType.isObject() ? "<"+keyType.getKeyType()+", %s>" : "").removeBraces().setBraceType("<>");
-		addInjectMapper(" VSV_GENERIC_TYPE", valueType.isObject() ? "<%s, "+valueType.getValueType()+">" : "<%s>").removeBraces().setBraceType("<>");
-		addInjectMapper(" VVS_GENERIC_TYPE", valueType.isObject() ? "<"+valueType.getValueType()+", %s>" : "<%s>").removeBraces().setBraceType("<>");
-		addArgumentMapper(" VSS_GENERIC_TYPE", valueType.isObject() ? "<%1$s, %2$s>" : "<%2$s>").removeBraces().setBraceType("<>");	
-		addInjectMapper(" SV_GENERIC_TYPE", valueType.isObject() ? "<%s, "+valueType.getValueType()+">" : "").removeBraces().setBraceType("<>");
-		addInjectMapper(" VS_GENERIC_TYPE", valueType.isObject() ? "<"+valueType.getValueType()+", %s>" : "").removeBraces().setBraceType("<>");
-
-
-		addSimpleMapper(" GENERIC_KEY_BRACES", keyType.isObject() ? " <"+keyType.getKeyType()+">" : "");
-		addSimpleMapper(" GENERIC_VALUE_BRACES", valueType.isObject() ? " <"+valueType.getValueType()+">" : "");
-		addInjectMapper(" GENERIC_SPECIAL_KEY_BRACES", keyType.isObject() ? " <%s>" : "").removeBraces().setBraceType("<>");
-		addInjectMapper(" GENERIC_SPECIAL_VALUE_BRACES", valueType.isObject() ? " <%s>" : "").removeBraces().setBraceType("<>");
-		addSimpleMapper(" GENERIC_KEY_ENUM_VALUE_BRACES", keyType.isObject() ? (valueType.isObject() ? " <"+keyType.getKeyType()+" extends Enum<"+keyType.getKeyType()+">, "+valueType.getValueType()+">" : " <"+keyType.getKeyType()+" extends Enum<"+keyType.getKeyType()+">>") : (valueType.isObject() ? " <"+valueType.getValueType()+">" : ""));
-		
-		addInjectMapper(" GENERIC_KEY_SPECIAL_BRACES", keyType.isObject() ? " <"+keyType.getKeyType()+", %s>" : " <%s>").removeBraces().setBraceType("<>");
-		addInjectMapper(" GENERIC_VALUE_SPECIAL_BRACES", valueType.isObject() ? " <"+valueType.getKeyType()+", %s>" : " <%s>").removeBraces().setBraceType("<>");
-		
-		addSimpleMapper(" GENERIC_KEY_VALUE_BRACES", keyType.isObject() ? (valueType.isObject() ? " <"+keyType.getKeyType()+", "+valueType.getValueType()+">" : " <"+keyType.getKeyType()+">") : (valueType.isObject() ? " <"+valueType.getValueType()+">" : ""));
-		addSimpleMapper(" COMPAREABLE_KEY_BRACES", keyType.isObject() ? " <"+keyType.getKeyType()+" extends Comparable<T>>" : "");
-		addSimpleMapper("KV_BRACES", keyType.isObject() || valueType.isObject() ? "<>" : "");
-		addSimpleMapper("VALUE_BRACES", valueType.isObject() ? "<>" : "");
-		addSimpleMapper("BRACES", keyType.isObject() ? "<>" : "");
-		if(keyType.needsCustomJDKType())
-		{
-			addSimpleMapper("JAVA_TYPE", keyType.getCustomJDKType().getKeyType());
-			addSimpleMapper("SANITY_CAST", "castTo"+keyType.getFileType());
-		}
-		addSimpleMapper("JAVA_CLASS", keyType.getCustomJDKType().getClassType());
-		if(valueType.needsCustomJDKType())
-		{
-			addSimpleMapper("SANITY_CAST_VALUE", "castTo"+valueType.getFileType());
-		}
-		addSimpleMapper("[SPACE]", " ");
-		addComment("@ArrayType", "@param <%s> the keyType of array that the operation should be applied");
-		addComment("@Type", "@param <%s> the keyType of elements maintained by this Collection");
-		addValueComment("@ValueArrayType", "@param <%s> the keyType of array that the operation should be applied");
-		addValueComment("@ValueType", "@param <%s> the keyType of elements maintained by this Collection");
-		addAnnontion("@PrimitiveOverride", "@Override");
-		addSimpleMapper("@PrimitiveDoc", "");
-		addAnnontion("@Primitive", "@Deprecated");
-		addValueAnnontion("@ValuePrimitiveOverride", "@Override");
-		addValueAnnontion("@ValuePrimitive", "@Deprecated");
-	}
-	
-	private void createHelperVars(ClassType type, boolean value, String fix)
-	{
-		addArgumentMapper("EQUALS_"+fix+"_TYPE", "Objects.equals(%2$s, "+(type.isObject() ? "%1$s" : fix+"_TO_OBJ(%1$s)")+")").removeBraces();
-		addInjectMapper(fix+"_EQUALS_NOT_NULL", type.getComparableValue()+" != "+(type.isPrimitiveBlocking() || type.needsCast() ? type.getEmptyValue() : "0")).removeBraces();
-		addInjectMapper(fix+"_EQUALS_NULL", type.getComparableValue()+" == "+(type.isPrimitiveBlocking() || type.needsCast() ? type.getEmptyValue() : "0")).removeBraces();
-		addArgumentMapper(fix+"_EQUALS_NOT", type.getEquals(true)).removeBraces();
-		addArgumentMapper(fix+"_EQUALS", type.getEquals(false)).removeBraces();
-		addSimpleMapper("FILE_"+fix+"_TYPE", type.getFileType());
-		
-		addArgumentMapper("COMPAREABLE_TO_"+fix, type.isObject() ? "((Comparable<"+type.getKeyType(value)+">)%1$s).compareTo(("+type.getKeyType(value)+")%2$s)" : type.getClassType(value)+".compare(%1$s, %2$s)").removeBraces();
-		addArgumentMapper("COMPARE_TO_"+fix, type.isObject() ? "%1$s.compareTo(%2$s)" : type.getClassType(value)+".compare(%1$s, %2$s)").removeBraces();
-		
-		addInjectMapper(fix+"_TO_OBJ", type.isObject() ? "%s" : type.getClassType(value)+".valueOf(%s)").removeBraces();
-		addInjectMapper("OBJ_TO_"+fix, type.isObject() ? "%s" : "%s."+type.getKeyType(value)+"Value()").removeBraces();
-		addInjectMapper("CLASS_TO_"+fix, type.isObject() ? "("+type.getKeyType(value)+")%s" : "(("+type.getClassType(value)+")%s)."+type.getKeyType(value)+"Value()").removeBraces();
-		
-		addInjectMapper(fix+"_TO_HASH", type.isObject() ? "Objects.hashCode(%s)" : type.getClassType(value)+".hashCode(%s)").removeBraces();
-		addInjectMapper(fix+"_TO_STRING", type.isObject() ? "Objects.toString(%s)" : type.getClassType(value)+".toString(%s)").removeBraces();
-		
-		addSimpleMapper("CAST_"+fix+"_ARRAY ", type.isObject() ? "("+fix+"_TYPE[])" : "");
-		addSimpleMapper("EMPTY_"+fix+"_ARRAY", type.isObject() ? "("+fix+"_TYPE[])ARRAYS.EMPTY_ARRAY" : "ARRAYS.EMPTY_ARRAY");
-		addInjectMapper("NEW_"+fix+"_ARRAY", type.isObject() ? "("+fix+"_TYPE[])new Object[%s]" : "new "+fix+"_TYPE[%s]").removeBraces();
-		addInjectMapper("NEW_SPECIAL_"+fix+"_ARRAY", type.isObject() ? "(E[])new Object[%s]" : "new "+fix+"_TYPE[%s]").removeBraces();
-		if(value) addInjectMapper("NEW_CLASS_VALUE_ARRAY", type.isObject() ? "(CLASS_VALUE_TYPE[])new Object[%s]" : "new CLASS_VALUE_TYPE[%s]").removeBraces();
-		else addInjectMapper("NEW_CLASS_ARRAY", type.isObject() ? "(CLASS_TYPE[])new Object[%s]" : "new CLASS_TYPE[%s]").removeBraces();
-	}
-}

src/builder/java/speiger/src/builder/modules/ListModule.java

@@ -1,118 +0,0 @@
-package speiger.src.builder.modules;
-
-import java.util.Arrays;
-import java.util.Set;
-import java.util.TreeSet;
-
-import speiger.src.builder.ClassType;
-
-@SuppressWarnings("javadoc")
-public class ListModule extends BaseModule
-{
-	public static final BaseModule INSTANCE = new ListModule();
-	
-	@Override
-	public String getModuleName() { return "List"; }
-	@Override
-	protected void loadVariables() {}
-	@Override
-	protected void loadFlags() {
-		if(isModuleEnabled()) addKeyFlag("LIST_MODULE");
-		if(isModuleEnabled("Wrappers")) addKeyFlag("LISTS_FEATURE");
-		boolean implementations = isModuleEnabled("Implementations");
-		if(implementations && isModuleEnabled("ArrayList")) addKeyFlag("ARRAY_LIST_FEATURE");
-		if(implementations && isModuleEnabled("LinkedList")) addKeyFlag("LINKED_LIST_FEATURE");
-		if(implementations && isModuleEnabled("ImmutableList")) addKeyFlag("IMMUTABLE_LIST_FEATURE");
-		if(implementations && isModuleEnabled("CopyOnWriteList")) addKeyFlag("COPY_ON_WRITE_LIST_FEATURE");
-	}
-	
-	@Override
-	protected void loadBlockades()
-	{
-		if(!isModuleEnabled("Wrappers")) addBlockedFiles("Lists");
-		boolean implementations = !isModuleEnabled("Implementations");
-		if(implementations || !isModuleEnabled("ArrayList")) addBlockedFiles("ArrayList");
-		if(implementations || !isModuleEnabled("LinkedList")) addBlockedFiles("LinkedList");
-		if(implementations || !isModuleEnabled("ImmutableList")) addBlockedFiles("ImmutableList");
-		if(implementations || !isModuleEnabled("CopyOnWriteList")) addBlockedFiles("CopyOnWriteList");
-		if(!isModuleEnabled()) addBlockedFiles("List", "AbstractList");
-		
-		if(keyType.isObject()) addBlockedFiles("ListFillBufferTester");
-		if(keyType == ClassType.BOOLEAN) addBlockedFiles("ListFillBufferTester", "ListReplaceAllTester");
-	}
-	
-	@Override
-	public Set<String> getModuleKeys(ClassType keyType, ClassType valueType) {
-		return new TreeSet<>(Arrays.asList("Implementations", "Wrappers", "ArrayList", "LinkedList", "ImmutableList", "CopyOnWriteList"));
-	}
-	
-	@Override
-	public boolean areDependenciesLoaded() {
-		return isDependencyLoaded(CollectionModule.INSTANCE);
-	}
-	
-	@Override
-	protected void loadRemappers()
-	{
-		//Main Classes
-		addRemapper("AbstractList", "Abstract%sList");
-		addRemapper("ImmutableList", "Immutable%sList");
-		addRemapper("CopyOnWriteList", "CopyOnWrite%sArrayList");
-		
-		//Test Classes
-		addRemapper("AbstractListTester", "Abstract%sListTester");
-		addRemapper("AbstractListIndexOfTester", "Abstract%sListIndexOfTester");
-		addRemapper("TestListGenerator", "Test%sListGenerator");
-	}
-	
-	@Override
-	protected void loadFunctions()
-	{
-		addFunctionMapper("GET_KEY", "get");
-		addFunctionMapper("GET_FIRST_KEY", "getFirst");
-		addFunctionMapper("GET_LAST_KEY", "getLast");
-		addFunctionMapper("REMOVE_FIRST_KEY", "removeFirst");
-		addFunctionMapper("REMOVE_LAST_KEY", "removeLast");
-		addFunctionMapper("REMOVE_SWAP", "swapRemove");
-		addFunctionMappers("REPLACE", keyType.isObject() ? "replaceObjects" : "replace%ss");
-		addFunctionMappers("SORT", "sort%ss");
-	}
-	
-	@Override
-	protected void loadClasses()
-	{
-		//Implementation Classes
-		addClassMapper("ARRAY_LIST", "ArrayList");
-		addAbstractMapper("COPY_ON_WRITE_LIST", "CopyOnWrite%sArrayList");
-		addClassMapper("LINKED_LIST", "LinkedList");
-		addAbstractMapper("IMMUTABLE_LIST", "Immutable%sList");
-		
-		//Abstract Classes
-		addAbstractMapper("ABSTRACT_LIST", "Abstract%sList");
-		
-		//SubClasses
-		addClassMapper("SUB_LIST", "SubList");
-		addClassMapper("LIST_ITER", "ListIter");
-		
-		//Helper Classes
-		addClassMapper("LISTS", "Lists");
-		
-		//Interfaces
-		addClassMapper("LIST", "List");
-	}
-	
-	@Override
-	protected void loadTestClasses()
-	{
-		//Implementation Classes
-		addClassMapper("LIST_TEST_BUILDER", "ListTestSuiteBuilder");
-		addClassMapper("LIST_TESTS", "ListTests");
-
-		//Abstract Classes
-		addAbstractMapper("ABSTRACT_LIST_INDEX_OF_TESTER", "Abstract%sListIndexOfTester");
-		addAbstractMapper("ABSTRACT_LIST_TESTER", "Abstract%sListTester");
-		
-		//Helper classes
-		addAbstractMapper("TEST_LIST_GENERATOR", "Test%sListGenerator");
-	}
-}

src/builder/java/speiger/src/builder/modules/MapModule.java

@@ -1,288 +0,0 @@
-package speiger.src.builder.modules;
-
-import java.util.Arrays;
-import java.util.Set;
-import java.util.TreeSet;
-
-import speiger.src.builder.ClassType;
-
-@SuppressWarnings("javadoc")
-public class MapModule extends BaseModule
-{
-	public static final BaseModule INSTANCE = new MapModule();
-	
-	@Override
-	public String getModuleName() { return "Map"; }
-	@Override
-	public boolean isBiModule() { return true; }
-	@Override
-	protected void loadVariables() {}
-	@Override
-	public boolean isModuleValid(ClassType keyType, ClassType valueType) { return keyType != ClassType.BOOLEAN; }
-	@Override
-	public boolean areDependenciesLoaded() { return isDependencyLoaded(SetModule.INSTANCE) && isDependencyLoaded(CollectionModule.INSTANCE, false); }
-	
-	@Override
-	public Set<String> getModuleKeys(ClassType keyType, ClassType valueType) {
-		Set<String> sets = new TreeSet<>();
-		sets.addAll(Arrays.asList("Wrappers", "Implementations"));
-		sets.addAll(Arrays.asList("OrderedMap", "SortedMap"));
-		sets.addAll(Arrays.asList("ArrayMap", "ConcurrentMap", "ImmutableMap"));
-		sets.addAll(Arrays.asList("HashMap", "LinkedHashMap"));
-		sets.addAll(Arrays.asList("CustomHashMap", "LinkedCustomHashMap"));
-		sets.addAll(Arrays.asList("EnumMap", "LinkedEnumMap"));
-		sets.addAll(Arrays.asList("AVLTreeMap", "RBTreeMap"));
-		return sets;
-	}
-	
-	@Override
-	protected void loadFlags()
-	{
-		if(isModuleEnabled()) addFlag("MAP_MODULE");
-		if(isModuleEnabled("Wrappers")) addFlag("MAPS_FEATURE");
-		boolean implementations = isModuleEnabled("Implementations");
-		boolean hashMap = implementations && isModuleEnabled("HashMap");
-		boolean customHashMap = implementations && isModuleEnabled("CustomHashMap");
-		boolean enumMap = implementations && isModuleEnabled("EnumMap");
-		
-		if(isModuleEnabled("OrderedMap")) {
-			addFlag("ORDERED_MAP_FEATURE");
-			if(isModuleEnabled("ArrayMap")) addFlag("ARRAY_MAP_FEATURE");
-			if(hashMap && isModuleEnabled("LinkedHashMap")) addFlag("LINKED_MAP_FEATURE");
-			if(customHashMap && isModuleEnabled("LinkedCustomHashMap")) addFlag("LINKED_CUSTOM_MAP_FEATURE");
-			if(enumMap && isModuleEnabled("LinkedEnumMap")) addFlag("LINKED_ENUM_MAP_FEATURE");
-		}
-		if(isModuleEnabled("SortedMap")) {
-			addFlag("SORTED_MAP_FEATURE");
-			if(implementations && isModuleEnabled("AVLTreeMap")) addFlag("AVL_TREE_MAP_FEATURE");
-			if(implementations && isModuleEnabled("RBTreeMap")) addFlag("RB_TREE_MAP_FEATURE");
-		}
-		if(implementations && isModuleEnabled("ConcurrentMap")) addFlag("CONCURRENT_MAP_FEATURE");
-		if(implementations && isModuleEnabled("ImmutableMap")) addFlag("IMMUTABLE_MAP_FEATURE");
-		if(hashMap) addFlag("MAP_FEATURE");
-		if(customHashMap) addFlag("CUSTOM_MAP_FEATURE");
-		if(enumMap) addFlag("ENUM_MAP_FEATURE");
-	}
-	
-	@Override
-	protected void loadBlockades()
-	{
-		if(!isModuleEnabled()) addBlockedFiles("Map", "AbstractMap");
-		if(!isModuleEnabled("Wrappers")) addBlockedFiles("Maps");
-		boolean implementations = !isModuleEnabled("Implementations");
-		if(implementations || !isModuleEnabled("ImmutableMap")) addBlockedFiles("ImmutableOpenHashMap");
-		if(implementations || !isModuleEnabled("ConcurrentMap")) addBlockedFiles("ConcurrentMap", "ConcurrentOpenHashMap");
-		
-		boolean ordered = !isModuleEnabled("OrderedMap");
-		if(ordered) addBlockedFiles("OrderedMap");
-		boolean hashMap = implementations || !isModuleEnabled("HashMap");
-		if(hashMap) addBlockedFiles("OpenHashMap");
-		if(hashMap || ordered || !isModuleEnabled("LinkedHashMap")) addBlockedFiles("LinkedOpenHashMap");
-		
-		boolean customHashMap = implementations || !isModuleEnabled("CustomHashMap");
-		if(customHashMap) addBlockedFiles("OpenCustomHashMap");
-		if(customHashMap || ordered || !isModuleEnabled("LinkedCustomHashMap")) addBlockedFiles("LinkedOpenCustomHashMap");
-		
-		boolean enumMap = implementations || !isModuleEnabled("EnumMap");
-		if(enumMap) addBlockedFiles("EnumMap");
-		if(enumMap || ordered || !isModuleEnabled("LinkedEnumMap")) addBlockedFiles("LinkedEnumMap");
-		
-		if(ordered || !isModuleEnabled("ArrayMap")) addBlockedFiles("ArrayMap");
-		
-		boolean sorted = !isModuleEnabled("SortedMap");
-		if(sorted) addBlockedFiles("SortedMap", "NavigableMap");
-		if(implementations || sorted || !isModuleEnabled("AVLTreeMap")) addBlockedFiles("AVLTreeMap");
-		if(implementations || sorted || !isModuleEnabled("RBTreeMap")) addBlockedFiles("RBTreeMap");
-		
-		if(keyType == ClassType.BOOLEAN)
-		{
-			//Main Classes
-			addBlockedFiles("SortedMap", "NavigableMap", "RBTreeMap", "AVLTreeMap");
-			addBlockedFiles("OrderedMap", "ArrayMap", "LinkedOpenHashMap", "LinkedOpenCustomHashMap");
-			addBlockedFiles("ConcurrentMap", "ConcurrentOpenHashMap");
-			addBlockedFiles("Map", "Maps", "AbstractMap", "ImmutableOpenHashMap", "OpenHashMap", "OpenCustomHashMap");
-			
-			//Test Classes
-			addBlockedFiles("TestMap", "MapTests", "MapTestSuiteBuilder", "MapConstructorTests", "TestMapGenerator", "SimpleMapTestGenerator", "DerivedMapGenerators", "AbstractMapTester");
-			addBlockedFiles("TestSortedMapGenerator", "OrderedMapTestSuiteBuilder", "NavigableMapTestSuiteBuilder", "SortedMapTestSuiteBuilder");
-			addBlockedFiles("TestOrderedMapGenerator");
-			addBlockedFilter(T -> T.endsWith("Tester") && (T.startsWith("Map") || T.startsWith("OrderedMap") || T.startsWith("SortedMap") || T.startsWith("NavigableMap")));
-		}
-		if(valueType == ClassType.OBJECT) {
-			addBlockedFiles("MapComputeIfAbsentNonDefaultTester", "MapComputeIfPresentNonDefaultTester", "MapComputeNonDefaultTester", "MapSupplyIfAbsentNonDefaultTester");
-		}
-	}
-	
-	@Override
-	protected void loadRemappers()
-	{
-		//Main Classes
-		addBiRequirement("Map");
-		addBiRequirement("SortedMap");
-		addBiRequirement("OrderedMap");
-		addBiRequirement("NavigableMap");
-		addBiRequirement("ConcurrentMap");
-		addBiRequirement("AbstractMap");
-		addEnumRequirement("EnumMap");
-		addEnumRequirement("LinkedEnumMap");
-		addBiRequirement("ConcurrentOpenHashMap");
-		addBiRequirement("ImmutableOpenHashMap");
-		addBiRequirement("OpenHashMap");
-		addBiRequirement("LinkedOpenHashMap");
-		addBiRequirement("OpenCustomHashMap");
-		addBiRequirement("LinkedOpenCustomHashMap");
-		addBiRequirement("ArrayMap");
-		addBiRequirement("RBTreeMap");
-		addBiRequirement("AVLTreeMap");
-		addBiRequirement("Maps");
-		
-		addRemapper("AbstractMap", "Abstract%sMap");
-		addRemapper("EnumMap", "Enum2%sMap");
-		addRemapper("LinkedEnumMap", "LinkedEnum2%sMap");
-		addRemapper("ImmutableOpenHashMap", "Immutable%sOpenHashMap");
-		
-		//Test Classes
-		addBiRequirement("TestMapGenerator");
-		addBiRequirement("TestSortedMapGenerator");
-		addBiRequirement("TestOrderedMapGenerator");
-		addBiRequirement("SimpleMapTestGenerator");
-		addBiRequirement("DerivedMapGenerators");
-		addBiRequirement("AbstractMapTester");
-		addBiRequirement("MapTestSuiteBuilder");
-		addBiRequirement("SortedMapTestSuiteBuilder");
-		addBiRequirement("NavigableMapTestSuiteBuilder");
-		addBiRequirement("OrderedMapTestSuiteBuilder");
-		addBiRequirement("MapTests");
-		addBiRequirement("MapConstructorTests");
-		addBiRequirement("TestMap");
-		addBiRequirement("MapAddToTester");
-		addBiRequirement("MapSubFromTester");
-		addBiRequirement("MapClearTester");
-		addBiRequirement("MapComputeIfAbsentTester");
-		addBiRequirement("MapComputeIfPresentTester");
-		addBiRequirement("MapComputeTester");
-		addBiRequirement("MapComputeIfAbsentNonDefaultTester");
-		addBiRequirement("MapComputeIfPresentNonDefaultTester");
-		addBiRequirement("MapComputeNonDefaultTester");
-		addBiRequirement("MapCopyTester");
-		addBiRequirement("MapContainsTester");
-		addBiRequirement("MapContainsKeyTester");
-		addBiRequirement("MapContainsValueTester");
-		addBiRequirement("MapCreatorTester");
-		addBiRequirement("MapEntrySetTester");
-		addBiRequirement("MapEqualsTester");
-		addBiRequirement("MapForEachTester");
-		addBiRequirement("MapGetOrDefaultTester");
-		addBiRequirement("MapGetTester");
-		addBiRequirement("MapHashCodeTester");
-		addBiRequirement("MapIsEmptyTester");
-		addBiRequirement("MapMergeTester");
-		addBiRequirement("MapMergeBulkTester");
-		addBiRequirement("MapPutAllArrayTester");
-		addBiRequirement("MapPutAllTester");
-		addBiRequirement("MapPutIfAbsentTester");
-		addBiRequirement("MapPutTester");
-		addBiRequirement("MapRemoveEntryTester");
-		addBiRequirement("MapRemoveOrDefaultTester");
-		addBiRequirement("MapRemoveTester");
-		addBiRequirement("MapReplaceAllTester");
-		addBiRequirement("MapReplaceEntryTester");
-		addBiRequirement("MapReplaceTester");
-		addBiRequirement("MapSizeTester");
-		addBiRequirement("MapSupplyIfAbsentTester");
-		addBiRequirement("MapSupplyIfAbsentNonDefaultTester");
-		addBiRequirement("MapToStringTester");
-		addBiRequirement("NavigableMapNavigationTester");
-		addBiRequirement("SortedMapNavigationTester");
-		addBiRequirement("OrderedMapNavigationTester");
-		addBiRequirement("OrderedMapMoveTester");
-		addBiRequirement("MapConstructorTester");
-		
-		addRemapper("TestMapGenerator", "Test%sMapGenerator");
-		addRemapper("TestSortedMapGenerator", "Test%sSortedMapGenerator");
-		addRemapper("TestOrderedMapGenerator", "Test%sOrderedMapGenerator");
-		addRemapper("SimpleMapTestGenerator", "Simple%sMapTestGenerator");
-		addRemapper("DerivedMapGenerators", "Derived%sMapGenerators");
-		addRemapper("AbstractMapTester", "Abstract%sMapTester");
-		addRemapper("TestMap", "Test%sMap");
-	}
-	
-	@Override
-	protected void loadFunctions()
-	{
-		addFunctionValueMapper("BULK_MERGE", "mergeAll");
-		addFunctionValueMappers("COMPUTE_IF_ABSENT", "compute%sIfAbsent");
-		addFunctionValueMappers("COMPUTE_IF_PRESENT", "compute%sIfPresent");
-		addFunctionValueMapper("COMPUTE", "compute");
-		addFunctionMapper("DEQUEUE_LAST", "dequeueLast");
-		addFunctionMapper("DEQUEUE", "dequeue");
-		addSimpleMapper("ENTRY_SET", keyType.getFileType().toLowerCase()+"2"+valueType.getFileType()+"EntrySet");
-		addFunctionMappers("FIRST_ENTRY_KEY", "first%sKey");
-		addFunctionValueMappers("FIRST_ENTRY_VALUE", "first%sValue");
-		if(keyType.isObject()) addFunctionValueMapper("GET_VALUE", valueType.isObject() ? "getObject" : "get");
-		else addSimpleMapper("GET_VALUE", "get");
-		addFunctionMappers("LAST_ENTRY_KEY", "last%sKey");
-		addFunctionValueMappers("LAST_ENTRY_VALUE", "last%sValue");
-		addFunctionValueMapper("MERGE", "merge");
-		addFunctionMappers("POLL_FIRST_ENTRY_KEY", "pollFirst%sKey");
-		addFunctionMappers("POLL_LAST_ENTRY_KEY", "pollLast%sKey");
-		if(keyType.isObject()) addFunctionMapper("REMOVE_VALUE", "rem");
-		else addSimpleMapper("REMOVE_VALUE", "remove");
-		addFunctionMapper("REMOVE", "remove");
-		addFunctionValueMappers("REPLACE_VALUES", valueType.isObject() ? "replaceObjects" : "replace%ss");
-		addFunctionValueMappers("SUPPLY_IF_ABSENT", "supply%sIfAbsent");
-	}
-	
-	@Override
-	protected void loadClasses()
-	{
-		//Implementation Classes
-		addAbstractBiMapper("IMMUTABLE_HASH_MAP", "Immutable%sOpenHashMap", "2");
-		addBiClassMapper("LINKED_CUSTOM_HASH_MAP", "LinkedOpenCustomHashMap", "2");
-		addBiClassMapper("LINKED_HASH_MAP", "LinkedOpenHashMap", "2");
-		addBiClassMapper("CUSTOM_HASH_MAP", "OpenCustomHashMap", "2");
-		addBiClassMapper("CONCURRENT_HASH_MAP", "ConcurrentOpenHashMap", "2");
-		addBiClassMapper("AVL_TREE_MAP", "AVLTreeMap", "2");
-		addBiClassMapper("RB_TREE_MAP", "RBTreeMap", "2");
-		addFunctionValueMappers("LINKED_ENUM_MAP", valueType.isObject() ? "LinkedEnum2ObjectMap" : "LinkedEnum2%sMap");
-		addFunctionValueMappers("ENUM_MAP", valueType.isObject() ? "Enum2ObjectMap" : "Enum2%sMap");
-		addBiClassMapper("HASH_MAP", "OpenHashMap", "2");
-		addBiClassMapper("ARRAY_MAP", "ArrayMap", "2");
-		
-		//Abstract Classes
-		addAbstractBiMapper("ABSTRACT_MAP", "Abstract%sMap", "2");
-		
-		//Helper Classes
-		addBiClassMapper("MAPS", "Maps", "2");
-		
-		//Interfaces
-		addBiClassMapper("NAVIGABLE_MAP", "NavigableMap", "2");
-		addBiClassMapper("ORDERED_MAP", "OrderedMap", "2");
-		addBiClassMapper("SORTED_MAP", "SortedMap", "2");
-		addBiClassMapper("CONCURRENT_MAP", "ConcurrentMap", "2");
-		addBiClassMapper("MAP", "Map", "2");
-	}
-	
-	@Override
-	protected void loadTestClasses()
-	{
-		//Implementation Classes
-		addAbstractBiMapper("SIMPLE_TEST_MAP", "Test%sMap", "2");
-		addBiClassMapper("MAP_TESTS", "MapTests", "2");
-		addAbstractBiMapper("NAVIGABLE_MAP_TEST_BUILDER", "%sNavigableMapTestSuiteBuilder", "2");
-		addAbstractBiMapper("SORTED_MAP_TEST_BUILDER", "%sSortedMapTestSuiteBuilder", "2");
-		addAbstractBiMapper("ORDERED_MAP_TEST_BUILDER", "%sOrderedMapTestSuiteBuilder", "2");
-		addAbstractBiMapper("MAP_TEST_BUILDER", "%sMapTestSuiteBuilder", "2");
-		
-		//Abstract Classes
-		addAbstractBiMapper("ABSTRACT_MAP_TESTER", "Abstract%sMapTester", "2");
-		
-		//Helper Classes
-		addAbstractBiMapper("MAP_CONSTRUCTOR_TESTS", "%sMapConstructorTests", "2");
-		addAbstractBiMapper("SIMPLE_MAP_TEST_GENERATOR", "Simple%sMapTestGenerator", "2");
-		addAbstractBiMapper("DERIVED_MAP_GENERATORS", "Derived%sMapGenerators", "2");
-		addAbstractBiMapper("TEST_ORDERED_MAP_GENERATOR", "Test%sOrderedMapGenerator", "2");
-		addAbstractBiMapper("TEST_SORTED_MAP_GENERATOR", "Test%sSortedMapGenerator", "2");
-		addAbstractBiMapper("TEST_MAP_GENERATOR", "Test%sMapGenerator", "2");
-	}
-}

src/builder/java/speiger/src/builder/modules/PairModule.java

@@ -1,60 +0,0 @@
-package speiger.src.builder.modules;
-
-import java.util.Arrays;
-import java.util.Set;
-import java.util.TreeSet;
-
-import speiger.src.builder.ClassType;
-
-@SuppressWarnings("javadoc")
-public class PairModule extends BaseModule
-{
-	public static final BaseModule INSTANCE = new PairModule();
-	@Override
-	public String getModuleName() { return "Pair"; }
-	@Override
-	public boolean isBiModule() { return true; }
-	@Override
-	protected void loadVariables() {}
-	@Override
-	protected void loadFunctions() {}
-	@Override
-	protected void loadTestClasses() {}
-	@Override
-	public Set<String> getModuleKeys(ClassType keyType, ClassType valueType) { return new TreeSet<>(Arrays.asList("Mutable", "Immutable")); }
-	
-	@Override
-	protected void loadFlags() {
-		if(isModuleEnabled()) addFlag("PAIR_MODULE");
-		if(isModuleEnabled("Mutable")) addFlag("MUTABLE_PAIR");
-		if(isModuleEnabled("Immutable")) addFlag("IMMUTABLE_PAIR");
-	}
-	
-	@Override
-	protected void loadBlockades() {
-		if(!isModuleEnabled()) addBlockedFiles("Pair");
-		if(!isModuleEnabled("Mutable")) addBlockedFiles("MutablePair");
-		if(!isModuleEnabled("Immutable")) addBlockedFiles("ImmutablePair");
-	}
-	
-	@Override
-	protected void loadRemappers() {
-		//Main Classes
-		addBiRequirement("Pair", "");
-		addBiRequirement("MutablePair", "");
-		addBiRequirement("ImmutablePair", "");
-		
-		//Test Classes
-		addBiRequirement("PairTester", "");
-	}
-	
-	@Override
-	protected void loadClasses() {
-		//Implementations
-		addBiClassMapper("IMMUTABLE_PAIR", "ImmutablePair", "");
-		addBiClassMapper("MUTABLE_PAIR", "MutablePair", "");
-		
-		//Interfaces
-		addBiClassMapper("PAIR", "Pair", "");
-	}
-}

src/builder/java/speiger/src/builder/modules/PrioQueueModule.java

@@ -1,101 +0,0 @@
-package speiger.src.builder.modules;
-
-import java.util.Arrays;
-import java.util.Set;
-import java.util.TreeSet;
-
-import speiger.src.builder.ClassType;
-
-@SuppressWarnings("javadoc")
-public class PrioQueueModule extends BaseModule
-{
-	public static final BaseModule INSTANCE = new PrioQueueModule();
-	
-	@Override
-	public String getModuleName() { return "PriorityQueue"; }
-	@Override
-	protected void loadVariables() {}
-	@Override
-	protected void loadFunctions() {}
-	@Override
-	public boolean areDependenciesLoaded() { return isDependencyLoaded(CollectionModule.INSTANCE); }
-	
-	@Override
-	public Set<String> getModuleKeys(ClassType keyType, ClassType valueType) {
-		return new TreeSet<>(Arrays.asList("Wrappers", "Implementations", "Dequeue", "FiFoQueue", "HeapQueue", "ArrayPrioQueue"));
-	}
-	
-	@Override
-	protected void loadFlags() {
-		if(isModuleEnabled()) addFlag("QUEUE_MODULE");
-		if(isModuleEnabled("Wrappers")) addKeyFlag("QUEUES_FEATURE");
-		boolean implementations = isModuleEnabled("Implementations");
-		if(isModuleEnabled("Dequeue")) {
-			addKeyFlag("DEQUEUE_FEATURE");
-			if(implementations && isModuleEnabled("FiFoQueue")) addKeyFlag("FIFO_QUEUE_FEATURE");
-		}
-		if(implementations && isModuleEnabled("HeapQueue")) addKeyFlag("HEAP_QUEUE_FEATURE");
-		if(implementations && isModuleEnabled("ArrayPrioQueue")) addKeyFlag("ARRAY_QUEUE_FEATURE");
-	}
-	
-	@Override
-	protected void loadBlockades() {
-		if(!isModuleEnabled()) addBlockedFiles("PriorityQueue", "AbstractPriorityQueue");
-		if(!isModuleEnabled("Wrappers")) addBlockedFiles("PriorityQueues");
-		boolean implementations = !isModuleEnabled("Implementations");
-		boolean dequeue = !isModuleEnabled("Dequeue");
-		if(dequeue) addBlockedFiles("PriorityDequeue"); 
-		if(dequeue || implementations || !isModuleEnabled("FiFoQueue")) addBlockedFiles("ArrayFIFOQueue");
-		if(implementations || !isModuleEnabled("HeapQueue")) addBlockedFiles("HeapPriorityQueue");
-		if(implementations || !isModuleEnabled("ArrayPrioQueue")) addBlockedFiles("ArrayPriorityQueue");
-		
-		if(keyType == ClassType.BOOLEAN) {
-			addBlockedFiles("QueueTests");
-		}
-	}
-	
-	@Override
-	protected void loadRemappers() {
-		//Main Classes
-		addRemapper("AbstractPriorityQueue", "Abstract%sPriorityQueue");
-		
-		//Test Classes
-		addRemapper("TestQueueGenerator", "Test%sQueueGenerator");
-		addRemapper("AbstractQueueTester", "Abstract%sQueueTester");
-		addRemapper("SimpleQueueTestGenerator", "Simple%sQueueTestGenerator");
-	}
-	
-	@Override
-	protected void loadClasses() {
-		//Implementation Classes
-		addClassMapper("ARRAY_FIFO_QUEUE", "ArrayFIFOQueue");
-		addClassMapper("ARRAY_PRIORITY_QUEUE", "ArrayPriorityQueue");
-		addClassMapper("HEAP_PRIORITY_QUEUE", "HeapPriorityQueue");
-		
-		//Abstract Classes
-		addAbstractMapper("ABSTRACT_PRIORITY_QUEUE", "Abstract%sPriorityQueue");
-		
-		//Helper Classes
-		addClassMapper("PRIORITY_QUEUES", "PriorityQueues");
-		
-		//Interfaces
-		addClassMapper("PRIORITY_QUEUE", "PriorityQueue");
-		addClassMapper("PRIORITY_DEQUEUE", "PriorityDequeue");	
-	}
-	
-	@Override
-	protected void loadTestClasses() 
-	{
-		//Implementation Classes
-		addClassMapper("DEQUEUE_TEST_BUILDER", "DequeueTestSuiteBuilder");
-		addClassMapper("QUEUE_TEST_BUILDER", "QueueTestSuiteBuilder");
-		addClassMapper("QUEUE_TESTS", "QueueTests");
-		
-		//Abstract Classes
-		addAbstractMapper("ABSTRACT_QUEUE_TESTER", "Abstract%sQueueTester");
-		
-		//Helper Classes
-		addAbstractMapper("SIMPLE_QUEUE_TEST_GENERATOR", "Simple%sQueueTestGenerator");
-		addAbstractMapper("TEST_QUEUE_GENERATOR", "Test%sQueueGenerator");
-	}
-}

src/builder/java/speiger/src/builder/modules/SetModule.java

@@ -1,174 +0,0 @@
-package speiger.src.builder.modules;
-
-import java.util.Arrays;
-import java.util.Set;
-import java.util.TreeSet;
-
-import speiger.src.builder.ClassType;
-
-@SuppressWarnings("javadoc")
-public class SetModule extends BaseModule
-{
-	public static final BaseModule INSTANCE = new SetModule();
-	
-	@Override
-	public String getModuleName() { return "Set"; }
-	@Override
-	protected void loadVariables() {}
-	
-	@Override
-	public boolean isModuleValid(ClassType keyType, ClassType valueType) { return keyType != ClassType.BOOLEAN; }
-	@Override
-	public boolean areDependenciesLoaded() { return isDependencyLoaded(CollectionModule.INSTANCE); }
-	@Override
-	public Set<String> getModuleKeys(ClassType keyType, ClassType valueType) {
-		Set<String> sets = new TreeSet<>();
-		sets.addAll(Arrays.asList("Wrappers", "Implementations"));
-		sets.addAll(Arrays.asList("OrderedSet", "SortedSet"));
-		sets.addAll(Arrays.asList("ArraySet", "ImmutableSet"));
-		sets.addAll(Arrays.asList("HashSet", "LinkedHashSet"));
-		sets.addAll(Arrays.asList("CustomHashSet", "LinkedCustomHashSet"));
-		sets.addAll(Arrays.asList("AVLTreeSet", "RBTreeSet"));
-		return sets;
-	}
-	
-	@Override
-	protected void loadFlags()
-	{
-		if(isModuleEnabled()) addFlag("SET_MODULE");
-		if(isModuleEnabled("Wrappers")) addFlag("SETS_FEATURE");
-		boolean implementations = isModuleEnabled("Implementations");
-		boolean hashSet = implementations && isModuleEnabled("HashSet");
-		boolean customHashSet = implementations && isModuleEnabled("CustomHashSet");
-		
-		if(isModuleEnabled("OrderedSet")) {
-			addFlag("ORDERED_SET_FEATURE");
-			if(implementations && isModuleEnabled("ArraySet")) addFlag("ARRAY_SET_FEATURE");
-			if(hashSet && isModuleEnabled("LinkedHashSet")) addFlag("LINKED_SET_FEATURE");
-			if(customHashSet && isModuleEnabled("LinkedCustomHashSet")) addFlag("LINKED_CUSTOM_SET_FEATURE");
-		}
-		if(isModuleEnabled("SortedSet")) {
-			addFlag("SORTED_SET_FEATURE");
-			if(implementations && isModuleEnabled("AVLTreeSet")) addFlag("AVL_TREE_SET_FEATURE");
-			if(implementations && isModuleEnabled("RBTreeSet")) addFlag("RB_TREE_SET_FEATURE");
-		}
-		if(implementations && isModuleEnabled("ImmutableSet")) addFlag("IMMUTABLE_SET_FEATURE");
-		if(hashSet) addFlag("HASH_SET_FEATURE");
-		if(customHashSet) addFlag("CUSTOM_HASH_SET_FEATURE");
-	}
-	
-	@Override
-	protected void loadBlockades()
-	{
-		if(!isModuleEnabled()) addBlockedFiles("Set", "AbstractSet");
-		if(!isModuleEnabled("Wrappers")) addBlockedFiles("Sets");
-		boolean implementations = !isModuleEnabled("Implementations");
-		if(implementations || !isModuleEnabled("ImmutableSet")) addBlockedFiles("ImmutableOpenHashSet");
-		
-		boolean ordered = !isModuleEnabled("OrderedSet");
-		if(ordered) addBlockedFiles("OrderedSet");
-		boolean hashSet = implementations || !isModuleEnabled("HashSet");
-		if(hashSet) addBlockedFiles("OpenHashSet");
-		if(hashSet || ordered || !isModuleEnabled("LinkedHashSet")) addBlockedFiles("LinkedOpenHashSet");
-		
-		boolean customHashSet = implementations || !isModuleEnabled("CustomHashSet");
-		if(customHashSet) addBlockedFiles("OpenCustomHashSet");
-		if(customHashSet || ordered || !isModuleEnabled("LinkedCustomHashSet")) addBlockedFiles("LinkedOpenCustomHashSet");
-		
-		if(implementations || ordered || !isModuleEnabled("ArraySet")) addBlockedFiles("ArraySet");
-		
-		boolean sorted = !isModuleEnabled("SortedSet");
-		if(sorted) addBlockedFiles("SortedSet", "NavigableSet");
-		if(implementations || sorted || !isModuleEnabled("AVLTreeSet")) addBlockedFiles("AVLTreeSet");
-		if(implementations || sorted || !isModuleEnabled("RBTreeSet")) addBlockedFiles("RBTreeSet");
-		
-		if(keyType == ClassType.BOOLEAN)
-		{
-			//Main Classes
-			addBlockedFiles("SortedSet", "NavigableSet", "AVLTreeSet", "RBTreeSet");
-			addBlockedFiles("OrderedSet", "ArraySet", "LinkedOpenHashSet", "LinkedOpenCustomHashSet");
-			addBlockedFiles("Set", "Sets", "AbstractSet", "OpenHashSet", "OpenCustomHashSet", "ImmutableOpenHashSet");
-			
-			//Test Classes
-			addBlockedFiles("SetTests", "SetTestSuiteBuilder", "TestSetGenerator");
-			addBlockedFiles("OrderedSetTestSuiteBuilder", "TestOrderedSetGenerator", "OrderedSetMoveTester", "OrderedSetNavigationTester", "OrderedSetIterationTester");
-			addBlockedFiles("SortedSetTestSuiteBuilder", "TestSortedSetGenerator", "SortedSetNaviationTester", "SortedSetSubsetTestSetGenerator", "SortedSetIterationTester", "SortedSetNaviationTester");
-			addBlockedFiles("NavigableSetTestSuiteBuilder", "TestNavigableSetGenerator", "NavigableSetNavigationTester");
-			addBlockedFiles("MinimalSet", "AbstractSetTester", "SetAddAllTester", "SetAddTester", "SetCreationTester", "SetEqualsTester", "SetRemoveTester");
-		}
-	}
-	
-	@Override
-	protected void loadRemappers()
-	{
-		//Main Classes
-		addRemapper("AbstractSet", "Abstract%sSet");
-		addRemapper("ImmutableOpenHashSet", "Immutable%sOpenHashSet");
-		
-		//Test Classes
-		addRemapper("MinimalSet", "Minimal%sSet");
-		addRemapper("TestNavigableSetGenerator", "Test%sNavigableSetGenerator");
-		addRemapper("TestSortedSetGenerator", "Test%sSortedSetGenerator");
-		addRemapper("TestOrderedSetGenerator", "Test%sOrderedSetGenerator");
-		addRemapper("TestSetGenerator", "Test%sSetGenerator");
-		addRemapper("AbstractSetTester", "Abstract%sSetTester");
-	}
-	
-	@Override
-	protected void loadFunctions()
-	{
-		addFunctionMapper("POLL_FIRST_KEY", "pollFirst");
-		addFunctionMapper("POLL_LAST_KEY", "pollLast");
-		addFunctionMapper("FIRST_KEY", "first");
-		addFunctionMapper("LAST_KEY", "last");	
-	}
-	
-	@Override
-	protected void loadTestClasses()
-	{
-		//Implementation Classes
-		addAbstractMapper("MINIMAL_SET", "Minimal%sSet");
-		addClassMapper("ORDERED_SET_TEST_BUILDER", "OrderedSetTestSuiteBuilder");
-		addClassMapper("SORTED_SET_TEST_BUILDER", "SortedSetTestSuiteBuilder");
-		addClassMapper("NAVIGABLE_SET_TEST_BUILDER", "NavigableSetTestSuiteBuilder");
-		addClassMapper("SET_TEST_BUILDER", "SetTestSuiteBuilder");
-		addClassMapper("SET_TESTS", "SetTests");
-
-		//Abstract Classes
-		addAbstractMapper("ABSTRACT_SET_TESTER", "Abstract%sSetTester");
-		
-		//Helper Classes
-		addClassMapper("SUB_SORTED_SET_CLASS_GENERATOR", "SortedSetSubsetTestSetGenerator");
-		addClassMapper("SUB_NAVIGABLE_SET_CLASS_GENERATOR", "NavigableSetSubsetTestSetGenerator");
-		addAbstractMapper("TEST_NAVIGABLE_SET_GENERATOR", "Test%sNavigableSetGenerator");
-		addAbstractMapper("TEST_SORTED_SET_GENERATOR", "Test%sSortedSetGenerator");
-		addAbstractMapper("TEST_ORDERED_SET_GENERATOR", "Test%sOrderedSetGenerator");
-		addAbstractMapper("TEST_SET_GENERATOR", "Test%sSetGenerator");
-	}
-	
-	@Override
-	protected void loadClasses()
-	{
-		//Implementation Classes
-		addClassMapper("LINKED_CUSTOM_HASH_SET", "LinkedOpenCustomHashSet");
-		addClassMapper("LINKED_HASH_SET", "LinkedOpenHashSet");
-		addAbstractMapper("IMMUTABLE_HASH_SET", "Immutable%sOpenHashSet");
-		addClassMapper("CUSTOM_HASH_SET", "OpenCustomHashSet");
-		addClassMapper("HASH_SET", "OpenHashSet");
-		addClassMapper("RB_TREE_SET", "RBTreeSet");
-		addClassMapper("AVL_TREE_SET", "AVLTreeSet");
-		addClassMapper("ARRAY_SET", "ArraySet");
-		
-		//Abstract Classes
-		addAbstractMapper("ABSTRACT_SET", "Abstract%sSet");
-		
-		//Helper Classes
-		addClassMapper("SETS", "Sets");
-		
-		//Interfaces
-		addClassMapper("NAVIGABLE_SET", "NavigableSet");
-		addClassMapper("SORTED_SET", "SortedSet");
-		addClassMapper("ORDERED_SET", "OrderedSet");
-		addClassMapper("SET", "Set");
-	}
-}

src/builder/resources/speiger/assets/collections/templates/collections/AbstractCollection.template

@@ -1,266 +1,209 @@
-package speiger.src.collections.PACKAGE.collections;
-
-import java.util.Collection;
-import java.util.Objects;
-import java.util.AbstractCollection;
-#if TYPE_OBJECT
-import java.util.function.Consumer;
-#endif
-
-#if !TYPE_OBJECT
-import speiger.src.collections.PACKAGE.functions.CONSUMER;
-import speiger.src.collections.PACKAGE.utils.ITERATORS;
-import speiger.src.collections.PACKAGE.utils.ARRAYS;
-#endif
-
-/**
- * Abstract Type Specific Collection that reduces boxing/unboxing
- * @Type(T)
- */
-public abstract class ABSTRACT_COLLECTION KEY_GENERIC_TYPE extends AbstractCollection<CLASS_TYPE> implements COLLECTION KEY_GENERIC_TYPE
-{
-	@Override
-	public abstract ITERATOR KEY_GENERIC_TYPE iterator();
-	
-#if !TYPE_OBJECT
-	/** {@inheritDoc}
-	 * <p>This default implementation delegates to the corresponding type-specific function.
-	 * @deprecated Please use the corresponding type-specific function instead. 
-	 */
-	@Override
-	@Deprecated
-	public boolean add(CLASS_TYPE e) { return COLLECTION.super.add(e); }
-
-#endif
-	@Override
-	public boolean addAll(COLLECTION KEY_GENERIC_TYPE c) {
-		boolean modified = false;
-		for(ITERATOR KEY_GENERIC_TYPE iter = c.iterator();iter.hasNext();modified |= add(iter.NEXT()));
-		return modified;
-	}
-	
-	@Override
-	public COLLECTION KEY_GENERIC_TYPE copy() { throw new UnsupportedOperationException(); }
-	
-#if !TYPE_OBJECT
-	/** {@inheritDoc}
-	 * <p>This default implementation delegates to the corresponding type-specific function.
-	 * @deprecated Please use the corresponding type-specific function instead. 
-	 */
-	@Override
-	@Deprecated
-	public boolean contains(Object e) { return COLLECTION.super.contains(e); }
-	
-	/**
-	 * A Type-Specific implementation of contains. This implementation iterates over the elements and returns true if the value match.
-	 * @param e the element that should be searched for.
-	 * @return true if the value was found.
-	 */
-	@Override
-	public boolean contains(KEY_TYPE e) {
-		for(ITERATOR KEY_GENERIC_TYPE iter = iterator();iter.hasNext();) { if(KEY_EQUALS(iter.NEXT(), e)) return true; }
-		return false;
-	}
-	
-	/** {@inheritDoc}
-	 * <p>This default implementation delegates to the corresponding type-specific function.
-	 * @deprecated Please use the corresponding type-specific function instead. 
-	 */
-	@Override
-	@Deprecated
-	public boolean addAll(Collection<? extends CLASS_TYPE> c)
-	{
-		return c instanceof COLLECTION ? addAll((COLLECTION KEY_GENERIC_TYPE)c) : super.addAll(c);
-	}
-#endif
-	
-	/**
-	 * A Type-Specific implementation of containsAll. This implementation iterates over all elements and checks all elements are present in the other collection.
-	 * @param c the collection that should be checked if it contains all elements.
-	 * @return true if all elements were found in the collection
-	 * @throws java.lang.NullPointerException if the collection is null
-	 */
-	@Override
-	public boolean containsAll(COLLECTION KEY_GENERIC_TYPE c) {
-		Objects.requireNonNull(c);
-		if(c.isEmpty()) return true;
-		for(ITERATOR KEY_GENERIC_TYPE iter = c.iterator();iter.hasNext();)
-			if(!contains(iter.NEXT()))
-				return false;
-		return true;
-	}
-	
-	@Override
-	public boolean containsAll(Collection<?> c) {
-		Objects.requireNonNull(c);
-		return c instanceof COLLECTION ? containsAll((COLLECTION KEY_GENERIC_TYPE)c) : super.containsAll(c);
-	}
-	
-	/**
-	 * This implementation iterates over the elements of the collection and checks if they are stored in this collection
-	 * @param c the elements that should be checked for
-	 * @return true if any element is in this collection
-	 * @throws java.lang.NullPointerException if the collection is null
-	 */
-	@Override
-	@Primitive
-	public boolean containsAny(Collection<?> c) {
-		Objects.requireNonNull(c);
-		if(c.isEmpty()) return false;
-		for(Object e : c) 
-			if(contains(e))
-				return true;
-		return false;
-	}
-	
-	/**
-	 * This implementation iterates over the elements of the collection and checks if they are stored in this collection.
-	 * @param c the elements that should be checked for
-	 * @return true if any element is in this collection
- 	 * @throws java.lang.NullPointerException if the collection is null
-	 */
-	@Override
-	public boolean containsAny(COLLECTION KEY_GENERIC_TYPE c) {
-		Objects.requireNonNull(c);
-		if(c.isEmpty()) return false;
-		for(ITERATOR KEY_GENERIC_TYPE iter = c.iterator();iter.hasNext();) 
-			if(contains(iter.NEXT()))
-				return true;
-		return false;
-	}
-		
-#if !TYPE_OBJECT
-	/** {@inheritDoc}
-	 * <p>This default implementation delegates to the corresponding type-specific function.
-	 * @deprecated Please use the corresponding type-specific function instead. 
-	 */
-	@Override
-	@Deprecated
-	public boolean remove(Object e) { return COLLECTION.super.remove(e); }
-	
-	/**
-	 * A Type-Specific implementation of remove. This implementation iterates over the elements until it finds the element that is searched for or it runs out of elements.
-	 * It stops after finding the first element
-	 * @param e the element that is searched for
-	 * @return true if the element was found and removed.
-	 */
-	@Override
-	public boolean REMOVE_KEY(KEY_TYPE e) {
-		for(ITERATOR KEY_GENERIC_TYPE iter = iterator();iter.hasNext();) {
-			if(KEY_EQUALS(iter.NEXT(), e)) {
-				iter.remove();
-				return true;
-			}
-		}
-		return false;
-	}
-	
-#endif
-	/**
-	 * A Type-Specific implementation of removeAll. This Implementation iterates over all elements and removes them as they were found in the other collection.
-	 * @param c the elements that should be deleted
-	 * @return true if the collection was modified.
-	 * @throws java.lang.NullPointerException if the collection is null
-	 */
-	@Override
-	public boolean removeAll(COLLECTION KEY_GENERIC_TYPE c) {
-		Objects.requireNonNull(c);
-		if(c.isEmpty()) return false;
-		boolean modified = false;
-		for(ITERATOR KEY_GENERIC_TYPE iter = iterator();iter.hasNext();) {
-			if(c.contains(iter.NEXT())) {
-				iter.remove();
-				modified = true;
-			}
-		}
-		return modified;
-	}
-
-	@Override
-	public boolean removeAll(COLLECTION KEY_GENERIC_TYPE c, CONSUMER KEY_GENERIC_TYPE r) {
-		Objects.requireNonNull(c);
-		if(c.isEmpty()) return false;
-		Objects.requireNonNull(r);
-		boolean modified = false;
-		for(ITERATOR KEY_GENERIC_TYPE iter = iterator();iter.hasNext();) {
-			KEY_TYPE e = iter.NEXT();
-			if(c.contains(e)) {
-				r.accept(e);
-				iter.remove();
-				modified = true;
-			}
-		}
-		return modified;
-	}
-	
-	/**
-	 * A Type-Specific implementation of retainAll. This Implementation iterates over all elements and removes them as they were not found in the other collection.
-	 * @param c the elements that should be kept
-	 * @return true if the collection was modified.
-	 * @throws java.lang.NullPointerException if the collection is null
-	 */
-	@Override
-	public boolean retainAll(COLLECTION KEY_GENERIC_TYPE c) {
-		Objects.requireNonNull(c);
-		if(c.isEmpty()) {
-			boolean modified = !isEmpty();
-			clear();
-			return modified;
-		}
-		boolean modified = false;
-		for(ITERATOR KEY_GENERIC_TYPE iter = iterator();iter.hasNext();) {
-			if(!c.contains(iter.NEXT())) {
-				iter.remove();
-				modified = true;
-			}
-		}
-		return modified;
-	}
-	
-	@Override
-	public boolean retainAll(COLLECTION KEY_GENERIC_TYPE c, CONSUMER KEY_GENERIC_TYPE r) {
-		Objects.requireNonNull(c);
-		Objects.requireNonNull(r);
-		if(c.isEmpty()) {
-			boolean modified = !isEmpty();
-			forEach(r);
-			clear();
-			return modified;
-		}
-		boolean modified = false;
-		for(ITERATOR KEY_GENERIC_TYPE iter = iterator();iter.hasNext();) {
-			KEY_TYPE e = iter.NEXT();
-			if(!c.contains(e)) {
-				r.accept(e);
-				iter.remove();
-				modified = true;
-			}
-		}
-		return modified;
-	}
-	
-#if !TYPE_OBJECT
-	/**
-	 * A Type-Specific implementation of toArray that links to {@link #TO_ARRAY(KEY_TYPE[])} with a newly created array.
-	 * @return an array containing all of the elements in this collection
-	 */
-	@Override
-	public KEY_TYPE[] TO_ARRAY() {
-		if(isEmpty()) return ARRAYS.EMPTY_ARRAY;
-		return TO_ARRAY(new KEY_TYPE[size()]);
-	}
-	
-	/**
-	 * A Type-Specific implementation of toArray. This implementation iterates over all elements and unwraps them into primitive type.
-	 * @param a array that the elements should be injected to. If null or to small a new array with the right size is created
-	 * @return an array containing all of the elements in this collection
-	 */
-	@Override
-	public KEY_TYPE[] TO_ARRAY(KEY_TYPE[] a) {
-		if(a == null || a.length < size()) a = new KEY_TYPE[size()];
-		ITERATORS.unwrap(a, iterator());
-		if (a.length > size()) a[size()] = EMPTY_KEY_VALUE;
-		return a;
-	}
-#endif
+package speiger.src.collections.PACKAGE.collections;
+
+import java.util.Collection;
+import java.util.Objects;
+import java.util.AbstractCollection;
+
+import speiger.src.collections.PACKAGE.collections.COLLECTION;
+#if !TYPE_OBJECT
+import speiger.src.collections.PACKAGE.utils.ITERATORS;
+#endif
+
+/**
+ * Abstract Type Specific Collection that reduces boxing/unboxing
+ * @Type(T)
+ */
+public abstract class ABSTRACT_COLLECTION KEY_GENERIC_TYPE extends AbstractCollection<CLASS_TYPE> implements COLLECTION KEY_GENERIC_TYPE
+{
+	@Override
+	public abstract ITERATOR KEY_GENERIC_TYPE iterator();
+	
+#if !TYPE_OBJECT
+	/** {@inheritDoc}
+	 * <p>This default implementation delegates to the corresponding type-specific function.
+	 * @deprecated Please use the corresponding type-specific function instead. 
+	 */
+	@Override
+	@Deprecated
+	public boolean add(CLASS_TYPE e) { return COLLECTION.super.add(e); }
+
+#endif
+	@Override
+	public boolean addAll(COLLECTION KEY_GENERIC_TYPE c) {
+		boolean modified = false;
+		for(ITERATOR KEY_GENERIC_TYPE iter = c.iterator();iter.hasNext();modified |= add(iter.NEXT()));
+		return modified;
+	}
+	
+#if !TYPE_OBJECT
+	/** {@inheritDoc}
+	 * <p>This default implementation delegates to the corresponding type-specific function.
+	 * @deprecated Please use the corresponding type-specific function instead. 
+	 */
+	@Override
+	@Deprecated
+	public boolean contains(Object e) { return COLLECTION.super.contains(e); }
+	
+	/**
+	 * A Type-Specific implementation of contains. This implementation iterates over the elements and returns true if the value match.
+	 * @param e the element that should be searched for.
+	 * @return true if the value was found.
+	 */
+	@Override
+	public boolean contains(KEY_TYPE e) {
+		for(ITERATOR KEY_GENERIC_TYPE iter = iterator();iter.hasNext();) { if(KEY_EQUALS(iter.NEXT(), e)) return true; }
+		return false;
+	}
+	
+	/** {@inheritDoc}
+	 * <p>This default implementation delegates to the corresponding type-specific function.
+	 * @deprecated Please use the corresponding type-specific function instead. 
+	 */
+	@Override
+	@Deprecated
+	public boolean addAll(Collection<? extends CLASS_TYPE> c)
+	{
+		return c instanceof COLLECTION ? addAll((COLLECTION KEY_GENERIC_TYPE)c) : super.addAll(c);
+	}
+#endif
+	
+	/**
+	 * A Type-Specific implementation of containsAll. This implementation iterates over all elements and checks all elements are present in the other collection.
+	 * @param c the collection that should be checked if it contains all elements.
+	 * @return true if all elements were found in the collection
+	 * @throws java.lang.NullPointerException if the collection is null
+	 */
+	@Override
+	public boolean containsAll(COLLECTION KEY_GENERIC_TYPE c) {
+		Objects.requireNonNull(c);
+		for(ITERATOR KEY_GENERIC_TYPE iter = c.iterator();iter.hasNext();)
+			if(!contains(iter.NEXT()))
+				return false;
+		return true;
+	}
+	
+	/**
+	 * This implementation iterates over the elements of the collection and checks if they are stored in this collection
+	 * @param c the elements that should be checked for
+	 * @return true if any element is in this collection
+	 * @deprecated if this is a primitive collection
+	 * @throws java.lang.NullPointerException if the collection is null
+	 */
+	@Override
+	@Primitive
+	public boolean containsAny(Collection<?> c) {
+		Objects.requireNonNull(c);
+		for(Object e : c) 
+			if(contains(e))
+				return true;
+		return false;
+	}
+	
+	/**
+	 * This implementation iterates over the elements of the collection and checks if they are stored in this collection.
+	 * @param c the elements that should be checked for
+	 * @return true if any element is in this collection
+ 	 * @throws java.lang.NullPointerException if the collection is null
+	 */
+	@Override
+	public boolean containsAny(COLLECTION KEY_GENERIC_TYPE c) {
+		Objects.requireNonNull(c);
+		for(ITERATOR KEY_GENERIC_TYPE iter = c.iterator();iter.hasNext();) 
+			if(contains(iter.NEXT()))
+				return true;
+		return false;
+	}
+		
+#if !TYPE_OBJECT
+	/** {@inheritDoc}
+	 * <p>This default implementation delegates to the corresponding type-specific function.
+	 * @deprecated Please use the corresponding type-specific function instead. 
+	 */
+	@Override
+	@Deprecated
+	public boolean remove(Object e) { return COLLECTION.super.remove(e); }
+	
+	/**
+	 * A Type-Specific implementation of remove. This implementation iterates over the elements until it finds the element that is searched for or it runs out of elements.
+	 * It stops after finding the first element
+	 * @param e the element that is searched for
+	 * @return true if the element was found and removed.
+	 */
+	@Override
+	public boolean REMOVE_KEY(KEY_TYPE e) {
+		for(ITERATOR KEY_GENERIC_TYPE iter = iterator();iter.hasNext();) {
+			if(KEY_EQUALS(iter.NEXT(), e)) {
+				iter.remove();
+				return true;
+			}
+		}
+		return false;
+	}
+	
+#endif
+	/**
+	 * A Type-Specific implementation of removeAll. This Implementation iterates over all elements and removes them as they were found in the other collection.
+	 * @param c the elements that should be deleted
+	 * @return true if the collection was modified.
+	 * @throws java.lang.NullPointerException if the collection is null
+	 */
+	@Override
+	public boolean removeAll(COLLECTION KEY_GENERIC_TYPE c) {
+		Objects.requireNonNull(c);
+		boolean modified = false;
+		for(ITERATOR KEY_GENERIC_TYPE iter = iterator();iter.hasNext();) {
+			if(c.contains(iter.NEXT())) {
+				iter.remove();
+				modified = true;
+			}
+		}
+		return modified;
+	}
+	
+	/**
+	 * A Type-Specific implementation of retainAll. This Implementation iterates over all elements and removes them as they were not found in the other collection.
+	 * @param c the elements that should be kept
+	 * @return true if the collection was modified.
+	 * @throws java.lang.NullPointerException if the collection is null
+	 */
+	@Override
+	public boolean retainAll(COLLECTION KEY_GENERIC_TYPE c) {
+		Objects.requireNonNull(c);
+		if(c.isEmpty()) {
+			boolean modified = !isEmpty();
+			clear();
+			return modified;
+		}
+		boolean modified = false;
+		for(ITERATOR KEY_GENERIC_TYPE iter = iterator();iter.hasNext();) {
+			if(!c.contains(iter.NEXT())) {
+				iter.remove();
+				modified = true;
+			}
+		}
+		return modified;
+	}
+	
+#if !TYPE_OBJECT
+	/**
+	 * A Type-Specific implementation of toArray that links to {@link #TO_ARRAY(KEY_TYPE[])} with a newly created array.
+	 * @return an array containing all of the elements in this collection
+	 */
+	@Override
+	public KEY_TYPE[] TO_ARRAY() {
+		return TO_ARRAY(new KEY_TYPE[size()]);
+	}
+	
+	/**
+	 * A Type-Specific implementation of toArray. This implementation iterates over all elements and unwraps them into primitive type.
+	 * @param a array that the elements should be injected to. If null or to small a new array with the right size is created
+	 * @return an array containing all of the elements in this collection
+	 */
+	@Override
+	public KEY_TYPE[] TO_ARRAY(KEY_TYPE[] a) {
+		if(a == null || a.length < size()) a = new KEY_TYPE[size()];
+		ITERATORS.unwrap(a, iterator());
+		return a;
+	}
+#endif
 }

src/builder/resources/speiger/assets/collections/templates/collections/BidirectionalIterator.template

@@ -57,7 +57,7 @@ public interface BI_ITERATOR KEY_GENERIC_TYPE extends ITERATOR KEY_GENERIC_TYPE
 	public default int back(int amount) {
 		if(amount < 0) throw new IllegalStateException("Can't go forward");
 		int i = 0;
-		for(;i<amount && hasPrevious();PREVIOUS(),i++);
+		for(;i<amount && hasPrevious();previous(),i++);
 		return i;
 	}
 }

src/builder/resources/speiger/assets/collections/templates/collections/Collection.template

@@ -1,323 +1,203 @@
-package speiger.src.collections.PACKAGE.collections;
-
-import java.util.Collection;
-#if PRIMITIVES
-import java.util.Objects;
-import java.util.function.JAVA_PREDICATE;
-import java.util.function.Predicate;
-#if SPLIT_ITERATOR_FEATURE && STREAM_FEATURE
-import java.util.stream.JAVA_STREAM;
-import java.util.stream.StreamSupport;
-#endif
-#endif
-#if TYPE_OBJECT
-import java.util.function.Consumer;
-import java.util.function.IntFunction;
-#else
-import speiger.src.collections.PACKAGE.functions.CONSUMER;
-#endif
-#if SPLIT_ITERATOR_FEATURE
-import speiger.src.collections.PACKAGE.utils.SPLIT_ITERATORS;
-#endif
-import speiger.src.collections.PACKAGE.utils.COLLECTIONS;
-import speiger.src.collections.utils.ISizeProvider;
-import speiger.src.collections.utils.SanityChecks;
-
-/**
- * A Type-Specific {@link Collection} that reduces (un)boxing
- * @Type(T)
- */
-public interface COLLECTION KEY_GENERIC_TYPE extends Collection<CLASS_TYPE>, ITERABLE KEY_GENERIC_TYPE, ISizeProvider
-{
-#if !TYPE_OBJECT
-	/**
-	 * A Type-Specific add function to reduce (un)boxing
-	 * @param o the element that should be added
-	 * @return true if the element was added to the collection
-	 */
-	public boolean add(KEY_TYPE o);
-	
-#endif
-	/**
-	 * A Type-Specific addAll function to reduce (un)boxing
-	 * @param c the collection of elements that should be added
-	 * @return true if elements were added into the collection
-	 */
-	public boolean addAll(COLLECTION KEY_GENERIC_TYPE c);
-	
-	/**
-	 * A Type-Specific Array based addAll method to reduce the amount of Wrapping
-	 * @param e the elements that should be added
-	 * @return if the collection was modified
-	 */
-	public default boolean addAll(KEY_TYPE... e) { return addAll(e, 0, e.length); }
-	
-	/**
-	 * A Type-Specific Array based addAll method to reduce the amount of Wrapping
-	 * @param e the elements that should be added
-	 * @param length how many elements of the array should be added
-	 * @return if the collection was modified
-	 */
-	public default boolean addAll(KEY_TYPE[] e, int length) { return addAll(e, 0, length); }
-	
-	/**
-	 * A Type-Specific Array based addAll method to reduce the amount of Wrapping
-	 * @param e the elements that should be added
-	 * @param offset where to start within the array
-	 * @param length how many elements of the array should be added
-	 * @return if the collection was modified
-	 */
-	public default boolean addAll(KEY_TYPE[] e, int offset, int length) {
-		if(length <= 0) return false;
-		SanityChecks.checkArrayCapacity(e.length, offset, length);
-		boolean added = false;
-		for(int i = 0;i<length;i++) {
-			if(add(e[offset+i])) added = true;
-		}
-		return added;
-	}
-	
-#if !TYPE_OBJECT
-	/**
-	 * A Type-Specific contains function to reduce (un)boxing
-	 * @param o the element that is checked for
-	 * @return true if the element is found in the collection
-	 */
-	public boolean contains(KEY_TYPE o);
-	
-#endif
-	/**
- 	 * A Type-Specific containsAll function to reduce (un)boxing
- 	 * @param c the collection of elements that should be tested for
- 	 * @return true if all the element is found in the collection
- 	 */
-	public boolean containsAll(COLLECTION KEY_GENERIC_TYPE c);
-	
-	/**
-	 * A Type-Specific containsAny function to reduce (un)boxing
- 	 * @param c the collection of elements that should be tested for
-	 * @return true if any element was found
-	 */
-	public boolean containsAny(COLLECTION KEY_GENERIC_TYPE c);
-	
-	/**
-	 * Returns true if any element of the Collection is found in the provided collection.
-	 * A Small Optimization function to find out of any element is present when comparing collections and not all of them.
- 	 * @param c the collection of elements that should be tested for
-	 * @return true if any element was found.
-	 */
-	@Primitive
-	public boolean containsAny(Collection<?> c);
-	
-#if !TYPE_OBJECT
-	/**
-	 * A Type-Specific remove function that reduces (un)boxing.
-	 * @param o the element that should be removed
-	 * @return true if the element was removed
-	 * @see Collection#remove(Object)
-	 */
-	public boolean REMOVE_KEY(KEY_TYPE o);
-	
-#endif
-	/**
-	 * A Type-Specific removeAll function that reduces (un)boxing.
-	 * @param c the collection of elements that should be removed
-	 * @return true if any element was removed
-	 * @see Collection#removeAll(Collection)
-	 */
-	public boolean removeAll(COLLECTION KEY_GENERIC_TYPE c);
-	
-	/**
-	 * A Type-Specific removeAll function that reduces (un)boxing.
-	 * It also notifies the remover of which exact element is going to be removed.
-	 * @param c the collection of elements that should be removed
-	 * @param r elements that got removed
-	 * @return true if any element was removed
-	 * @see Collection#removeAll(Collection)
-	 */
-	public boolean removeAll(COLLECTION KEY_GENERIC_TYPE c, CONSUMER KEY_GENERIC_TYPE r);
-	
-	/**
- 	 * A Type-Specific retainAll function that reduces (un)boxing.
-	 * @param c the collection of elements that should be kept
- 	 * @return true if any element was removed
- 	 * @see Collection#retainAll(Collection)
- 	 */
-	public boolean retainAll(COLLECTION KEY_GENERIC_TYPE c);
-	
-	/**
- 	 * A Type-Specific retainAll function that reduces (un)boxing.
-	 * It also notifies the remover of which exact element is going to be removed.
-	 * @param c the collection of elements that should be kept
-	 * @param r elements that got removed
- 	 * @return true if any element was removed
- 	 * @see Collection#retainAll(Collection)
- 	 */
-	public boolean retainAll(COLLECTION KEY_GENERIC_TYPE c, CONSUMER KEY_GENERIC_TYPE r);
-	
-	/**
-	 * A Helper function to reduce the usage of Streams and allows to collect all elements
-	 * @param collection that the elements should be inserted to
-	 * @param <E> the collection type
-	 * @return the input with the desired elements
-	 */
-	default <E extends COLLECTION KEY_GENERIC_TYPE> E pour(E collection) {
-		collection.addAll(this);
-		return collection;
-	}
-	
-	/**
-	 * A Function that does a shallow clone of the Collection itself.
-	 * This function is more optimized then a copy constructor since the Collection does not have to be unsorted/resorted.
-	 * It can be compared to Cloneable but with less exception risk
-	 * @return a Shallow Copy of the collection
-	 * @note Wrappers and view collections will not support this feature
-	 */
-	public COLLECTION KEY_GENERIC_TYPE copy();
-	
-#if TYPE_OBJECT
-	/**
-	 * A Helper function that simplifies the process of creating a new Array.
-	 * @param action the array creation function
-	 * @param <E> the returning arrayType
-	 * @return an array containing all of the elements in this collection
-	 * @see Collection#toArray(Object[])
-	 */
-	default <E> E[] TO_ARRAY(IntFunction<E[]> action) {
-		return TO_ARRAY(action.apply(size()));
-	}
-	
-#else
-	/**
-	 * A Type-Specific toArray function that delegates to {@link #TO_ARRAY(KEY_TYPE[])} with a newly created array.
-	 * @return an array containing all of the elements in this collection
-	 * @see Collection#toArray()
-	 */
-	public KEY_TYPE[] TO_ARRAY();
-	
-	/**
-	 * A Type-Specific toArray function that reduces (un)boxing.
-	 * @param a array that the elements should be injected to. If null or to small a new array with the right size is created
-	 * @return an array containing all of the elements in this collection
-	 * @see Collection#toArray(Object[])
-	 */
-	public KEY_TYPE[] TO_ARRAY(KEY_TYPE[] a);
-	
-#if PRIMITIVES
-	/** {@inheritDoc}
-	 * <p>This default implementation delegates to the corresponding type-specific function.
-	 * @deprecated Please use the corresponding type-specific function instead. 
-	 */
-	@Override
-	@Deprecated
-	public default boolean removeIf(Predicate<? super CLASS_TYPE> filter) {
-		Objects.requireNonNull(filter);
-#if TYPE_BYTE || TYPE_SHORT || TYPE_CHAR || TYPE_FLOAT
-		return remIf(v -> filter.test(KEY_TO_OBJ(SanityChecks.SANITY_CAST(v))));
-#else
-	return remIf(v -> filter.test(KEY_TO_OBJ(v)));
-#endif
-	}
-	
-	/**
-	 * A Type-Specific removeIf function to reduce (un)boxing.
-	 * <p>Removes elements that were selected by the filter
-	 * @see Collection#removeIf(Predicate)
-	 * @param filter Filters the elements that should be removed
-	 * @return true if the collection was modified
-	 * @throws java.lang.NullPointerException if filter is null
-	 */
-	public default boolean remIf(JAVA_PREDICATE filter) {
-		Objects.requireNonNull(filter);
-		boolean removed = false;
-		final ITERATOR each = iterator();
-		while (each.hasNext()) {
-			if (filter.test(each.NEXT())) {
-				each.remove();
-				removed = true;
-			}
-		}
-		return removed;
-	}
-	
-#endif
-	/** {@inheritDoc}
-	 * <p>This default implementation delegates to the corresponding type-specific function.
-	 * @deprecated Please use the corresponding type-specific function instead. 
-	 */
-	@Override
-	@Deprecated
-	public default boolean add(CLASS_TYPE o) { return add(OBJ_TO_KEY(o)); }
-	
-	/** {@inheritDoc}
-	 * <p>This default implementation delegates to the corresponding type-specific function.
-	 * @deprecated Please use the corresponding type-specific function instead. 
-	 */
-	@Override
-	@Deprecated
-	public default boolean contains(Object o) { return o != null && contains(CLASS_TO_KEY(o)); }
-	
-	/** {@inheritDoc}
- 	 * <p>This default implementation delegates to the corresponding type-specific function.
- 	 * @deprecated Please use the corresponding type-specific function instead. 
- 	 */
-	@Override
-	@Deprecated
-	public default boolean remove(Object o) { return o != null && REMOVE_KEY(CLASS_TO_KEY(o)); }
-	
-#endif
-	/**
-	 * Returns a Type-Specific Iterator to reduce (un)boxing
-	 * @return a iterator of the collection
-	 * @see Collection#iterator()
-	 */
-	@Override
-	public ITERATOR KEY_GENERIC_TYPE iterator();
-	
-	/**
-	 * Creates a Wrapped Collection that is Synchronized
-	 * @return a new Collection that is synchronized
-	 * @see COLLECTIONS#synchronize
-	 */
-	public default COLLECTION KEY_GENERIC_TYPE synchronize() { return COLLECTIONS.synchronize(this); }
-	
-	/**
-	 * Creates a Wrapped Collection that is Synchronized
-	 * @param mutex is the controller of the synchronization block
-	 * @return a new Collection Wrapper that is synchronized
-	 * @see COLLECTIONS#synchronize
-	 */
-	public default COLLECTION KEY_GENERIC_TYPE synchronize(Object mutex) { return COLLECTIONS.synchronize(this, mutex); }
-	
-	/**
-	 * Creates a Wrapped Collection that is unmodifiable
-	 * @return a new Collection Wrapper that is unmodifiable
-	 * @see COLLECTIONS#unmodifiable
-	 */
-	public default COLLECTION KEY_GENERIC_TYPE unmodifiable() { return COLLECTIONS.unmodifiable(this); }
-	
-#if SPLIT_ITERATOR_FEATURE
-#if PRIMITIVES
-	/**
-	 * Returns a Java-Type-Specific Stream to reduce boxing/unboxing.
-	 * @return a Stream of the closest java type
-	 */
-	default JAVA_STREAM primitiveStream() { return StreamSupport.NEW_STREAM(SPLIT_ITERATORS.createJavaSplititerator(this, 0), false); }
-	
-	/**
-	 * Returns a Java-Type-Specific Parallel Stream to reduce boxing/unboxing.
-	 * @return a Stream of the closest java type
-	 */
-	default JAVA_STREAM parallelPrimitiveStream() { return StreamSupport.NEW_STREAM(SPLIT_ITERATORS.createJavaSplititerator(this, 0), true); }
-	
-#endif
-#if STREAM_FEATURE
-	/**
-	 * A Type Specific Type Splititerator to reduce boxing/unboxing
-	 * @return type specific splititerator
-	 */
-	@Override
-	default SPLIT_ITERATOR KEY_GENERIC_TYPE spliterator() { return SPLIT_ITERATORS.createSplititerator(this, 0); }
-#endif
-#endif
+package speiger.src.collections.PACKAGE.collections;
+
+import java.util.Collection;
+#if PRIMITIVES
+import java.util.Objects;
+import java.util.function.JAVA_PREDICATE;
+import java.util.function.Predicate;
+import java.util.stream.JAVA_STREAM;
+import java.util.stream.StreamSupport;
+#endif
+import speiger.src.collections.PACKAGE.utils.SPLIT_ITERATORS;
+
+#if TYPE_BYTE || TYPE_SHORT || TYPE_CHAR || TYPE_FLOAT
+import speiger.src.collections.utils.SanityChecks;
+
+#endif
+/**
+ * A Type-Specific {@link Collection} that reduces (un)boxing
+ * @Type(T)
+ */
+public interface COLLECTION KEY_GENERIC_TYPE extends Collection<CLASS_TYPE>, ITERABLE KEY_GENERIC_TYPE
+{
+#if !TYPE_OBJECT
+	/**
+	 * A Type-Specific add function to reduce (un)boxing
+	 * @param o the element that should be added
+	 * @return true if the element was added to the collection
+	 */
+	public boolean add(KEY_TYPE o);
+	
+#endif
+	/**
+	 * A Type-Specific addAll function to reduce (un)boxing
+	 * @param c the collection of elements that should be added
+	 * @return true if elements were added into the collection
+	 */
+	public boolean addAll(COLLECTION KEY_GENERIC_TYPE c);
+	
+#if !TYPE_OBJECT
+	/**
+	 * A Type-Specific contains function to reduce (un)boxing
+	 * @param o the element that is checked for
+	 * @return true if the element is found in the collection
+	 */
+	public boolean contains(KEY_TYPE o);
+	
+#endif
+	/**
+ 	 * A Type-Specific containsAll function to reduce (un)boxing
+ 	 * @param c the collection of elements that should be tested for
+ 	 * @return true if all the element is found in the collection
+ 	 */
+	public boolean containsAll(COLLECTION KEY_GENERIC_TYPE c);
+	
+	/**
+	 * A Type-Specific containsAny function to reduce (un)boxing
+ 	 * @param c the collection of elements that should be tested for
+	 * @return true if any element was found
+	 */
+	public boolean containsAny(COLLECTION KEY_GENERIC_TYPE c);
+	
+	/**
+	 * Returns true if any element of the Collection is found in the provided collection.
+	 * A Small Optimization function to find out of any element is present when comparing collections and not all of them.
+ 	 * @param c the collection of elements that should be tested for
+	 * @return true if any element was found.
+	 */
+	@Primitive
+	public boolean containsAny(Collection<?> c);
+	
+#if !TYPE_OBJECT
+	/**
+	 * A Type-Specific remove function that reduces (un)boxing.
+	 * @param o the element that should be removed
+	 * @return true if the element was removed
+	 * @see Collection#remove(Object)
+	 */
+	public boolean REMOVE_KEY(KEY_TYPE o);
+	
+#endif
+	/**
+	 * A Type-Specific removeAll function that reduces (un)boxing.
+	 * @param c the collection of elements that should be removed
+	 * @return true if any element was removed
+	 * @see Collection#removeAll(Collection)
+	 */
+	public boolean removeAll(COLLECTION KEY_GENERIC_TYPE c);
+	
+	/**
+ 	 * A Type-Specific retainAll function that reduces (un)boxing.
+	 * @param c the collection of elements that should be kept
+ 	 * @return true if any element was removed
+ 	 * @see Collection#retainAll(Collection)
+ 	 */
+	public boolean retainAll(COLLECTION KEY_GENERIC_TYPE c);
+	
+#if !TYPE_OBJECT
+	/**
+	 * A Type-Specific toArray function that delegates to {@link #TO_ARRAY(KEY_TYPE[])} with a newly created array.
+	 * @return an array containing all of the elements in this collection
+	 * @see Collection#toArray()
+	 */
+	public KEY_TYPE[] TO_ARRAY();
+	
+	/**
+	 * A Type-Specific toArray function that reduces (un)boxing.
+	 * @param a array that the elements should be injected to. If null or to small a new array with the right size is created
+	 * @return an array containing all of the elements in this collection
+	 * @see Collection#toArray(Object[])
+	 */
+	public KEY_TYPE[] TO_ARRAY(KEY_TYPE[] a);
+	
+#if PRIMITIVES
+	/** {@inheritDoc}
+	 * <p>This default implementation delegates to the corresponding type-specific function.
+	 * @deprecated Please use the corresponding type-specific function instead. 
+	 */
+	@Override
+	@Deprecated
+	public default boolean removeIf(Predicate<? super CLASS_TYPE> filter) {
+		Objects.requireNonNull(filter);
+#if TYPE_BYTE || TYPE_SHORT || TYPE_CHAR || TYPE_FLOAT
+		return remIf(v -> filter.test(KEY_TO_OBJ(SanityChecks.SANITY_CAST(v))));
+#else
+	return remIf(v -> filter.test(KEY_TO_OBJ(v)));
+#endif
+	}
+	
+	/**
+	 * A Type-Specific removeIf function to reduce (un)boxing.
+	 * <p>Removes elements that were selected by the filter
+	 * @see Collection#removeIf(Predicate)
+	 * @param filter Filters the elements that should be removed
+	 * @return true if the collection was modified
+	 * @throws java.lang.NullPointerException if filter is null
+	 */
+	public default boolean remIf(JAVA_PREDICATE filter) {
+		Objects.requireNonNull(filter);
+		boolean removed = false;
+		final ITERATOR each = iterator();
+		while (each.hasNext()) {
+			if (filter.test(each.NEXT())) {
+				each.remove();
+				removed = true;
+			}
+		}
+		return removed;
+	}
+	
+#endif
+	/** {@inheritDoc}
+	 * <p>This default implementation delegates to the corresponding type-specific function.
+	 * @deprecated Please use the corresponding type-specific function instead. 
+	 */
+	@Override
+	@Deprecated
+	public default boolean add(CLASS_TYPE o) { return add(OBJ_TO_KEY(o)); }
+	
+	/** {@inheritDoc}
+	 * <p>This default implementation delegates to the corresponding type-specific function.
+	 * @deprecated Please use the corresponding type-specific function instead. 
+	 */
+	@Override
+	@Deprecated
+	public default boolean contains(Object o) { return o != null && contains(CLASS_TO_KEY(o)); }
+	
+	/** {@inheritDoc}
+ 	 * <p>This default implementation delegates to the corresponding type-specific function.
+ 	 * @deprecated Please use the corresponding type-specific function instead. 
+ 	 */
+	@Override
+	@Deprecated
+	public default boolean remove(Object o) { return o != null && REMOVE_KEY(CLASS_TO_KEY(o)); }
+	
+#endif
+	/**
+	 * Returns a Type-Specific Iterator to reduce (un)boxing
+	 * @return a iterator of the collection
+	 * @see Collection#iterator()
+	 */
+	@Override
+	public ITERATOR KEY_GENERIC_TYPE iterator();
+	
+#if PRIMITIVES
+	/**
+	 * Returns a Java-Type-Specific Stream to reduce boxing/unboxing.
+	 * @return a Stream of the closest java type
+	 */
+	default JAVA_STREAM primitiveStream() { return StreamSupport.NEW_STREAM(SPLIT_ITERATORS.createJavaSplititerator(this, 0), false); }
+	
+	/**
+	 * Returns a Java-Type-Specific Parallel Stream to reduce boxing/unboxing.
+	 * @return a Stream of the closest java type
+	 */
+	default JAVA_STREAM parallelPrimitiveStream() { return StreamSupport.NEW_STREAM(SPLIT_ITERATORS.createJavaSplititerator(this, 0), true); }
+#endif
+	/**
+	 * A Type Specific Type Splititerator to reduce boxing/unboxing
+	 * @return type specific splititerator
+	 */
+	@Override
+	default SPLIT_ITERATOR KEY_GENERIC_TYPE spliterator() { return SPLIT_ITERATORS.createSplititerator(this, 0); }
 }

src/builder/resources/speiger/assets/collections/templates/collections/Iterable.template

@@ -1,490 +1,173 @@
-package speiger.src.collections.PACKAGE.collections;
-
-import java.util.Objects;
-import java.util.function.Consumer;
-#if JDK_FUNCTION
-import java.util.function.PREDICATE;
-#endif
-
-#if !TYPE_OBJECT
-
-import speiger.src.collections.PACKAGE.functions.CONSUMER;
-import speiger.src.collections.PACKAGE.functions.COMPARATOR;
-import speiger.src.collections.objects.collections.ObjectIterable;
-#else
-import java.util.function.BiFunction;
-import java.util.function.IntFunction;
-import java.util.Comparator;
-
-#if BOOLEAN_COLLECTION_MODULE
-import speiger.src.collections.booleans.collections.BooleanIterable;
-#endif
-#iterate
-#argument OUTPUT_ITERABLE ByteIterable ShortIterable IntIterable LongIterable FloatIterable DoubleIterable
-#argument MAPPER ToByteFunction ToShortFunction ToIntFunction ToLongFunction ToFloatFunction ToDoubleFunction
-#argument PACKAGE bytes shorts ints longs floats doubles
-#argument FILTER_TYPE BYTE_COLLECTION_MODULE SHORT_COLLECTION_MODULE INT_COLLECTION_MODULE LONG_COLLECTION_MODULE FLOAT_COLLECTION_MODULE DOUBLE_COLLECTION_MODULE
-#if FILTER_TYPE
-import speiger.src.collections.objects.functions.function.MAPPER;
-import speiger.src.collections.PACKAGE.collections.OUTPUT_ITERABLE;
-#endif
-#enditerate
-#endif
-import speiger.src.collections.PACKAGE.functions.function.TO_OBJECT_FUNCTION;
-import speiger.src.collections.ints.functions.consumer.BI_FROM_INT_CONSUMER;
-import speiger.src.collections.objects.functions.consumer.BI_FROM_OBJECT_CONSUMER;
-#if !JDK_FUNCTION
-import speiger.src.collections.PACKAGE.functions.function.PREDICATE;
-#endif
-import speiger.src.collections.PACKAGE.functions.function.UNARY_OPERATOR;
-#if ARRAY_LIST_FEATURE || LINKED_LIST_FEATURE
-import speiger.src.collections.PACKAGE.lists.LIST;
-#if ARRAY_LIST_FEATURE
-import speiger.src.collections.PACKAGE.lists.ARRAY_LIST;
-#else
-import speiger.src.collections.PACKAGE.lists.LINKED_LIST;
-#endif
-#endif
-#if SET_MODULE && !TYPE_BOOLEAN
-#if LINKED_SET_FEATURE || LINKED_CUSTOM_SET_FEATURE || SET_FEATURE || CUSTOM_SET_FEATURE || RB_TREE_SET_FEATURE || AVL_TREE_SET_FEATURE || ARRAY_SET_FEATURE
-import speiger.src.collections.PACKAGE.sets.SET;
-#if LINKED_SET_FEATURE
-import speiger.src.collections.PACKAGE.sets.LINKED_HASH_SET;
-#else if LINKED_CUSTOM_SET_FEATURE
-import speiger.src.collections.PACKAGE.sets.LINKED_CUSTOM_HASH_SET;
-#else if SET_FEATURE
-import speiger.src.collections.PACKAGE.sets.HASH_SET;
-#else if CUSTOM_SET_FEATURE
-import speiger.src.collections.PACKAGE.sets.CUSTOM_HASH_SET;
-#else if RB_TREE_SET_FEATURE
-import speiger.src.collections.PACKAGE.sets.RB_TREE_SET;
-#else if AVL_TREE_SET_FEATURE
-import speiger.src.collections.PACKAGE.sets.AVL_TREE_SET;
-#else if ARRAY_SET_FEATURE
-import speiger.src.collections.PACKAGE.sets.ARRAY_SET;
-#endif
-#endif
-#endif
-import speiger.src.collections.PACKAGE.utils.ARRAYS;
-#if ASYNC_MODULE
-import speiger.src.collections.PACKAGE.utils.ASYNC_BUILDER;
-#endif
-#if SPLIT_ITERATOR_FEATURE
-import speiger.src.collections.PACKAGE.utils.SPLIT_ITERATORS;
-#endif
-import speiger.src.collections.PACKAGE.utils.ITERABLES;
-import speiger.src.collections.PACKAGE.utils.ITERATORS;
-#if !LINKED_HASH_SET_FEATURE && LINKED_CUSTOM_HASH_SET_FEATURE
-import speiger.src.collections.PACKAGE.utils.STRATEGY;
-#endif
-import speiger.src.collections.utils.ISizeProvider;
-
-/**
- * A Type-Specific {@link Iterable} that reduces (un)boxing
- * @Type(T)
- */
-public interface ITERABLE KEY_GENERIC_TYPE extends Iterable<CLASS_TYPE>
-{
-	/**
-	 * Returns an iterator over elements of type {@code T}.
-	 *
-	 * @return an Iterator.
-	 */
-	@Override
-	ITERATOR KEY_GENERIC_TYPE iterator();
-	
-#if !TYPE_OBJECT
-	/**
-	 * A Type Specific foreach function that reduces (un)boxing
-	 * 
-	 * @implSpec
-	 * <p>The default implementation behaves as if:
-	 * <pre>{@code
-	 *	iterator().forEachRemaining(action);
-	 * }</pre>
-	 *
-	 * @param action The action to be performed for each element
-	 * @throws NullPointerException if the specified action is null
-	 * @see Iterable#forEach(Consumer)
-	 */
-	default void forEach(CONSUMER action) {
-		Objects.requireNonNull(action);
-		iterator().forEachRemaining(action);
-	}
-	
-	/** {@inheritDoc}
-	* <p>This default implementation delegates to the corresponding type-specific function.
-	* @deprecated Please use the corresponding type-specific function instead. 
-	*/
-	@Deprecated
-	@Override
-	default void forEach(Consumer<? super CLASS_TYPE> action) {
-		Objects.requireNonNull(action);
-		iterator().forEachRemaining(action);
-	}
-	
-#endif
-	/**
-	 * A Indexed forEach implementation that allows you to keep track of how many elements were already iterated over.
-	 * @param action The action to be performed for each element
-	 * @throws java.lang.NullPointerException if the specified action is null
-	 */
-	public default void forEachIndexed(BI_FROM_INT_CONSUMER KEY_GENERIC_TYPE action) {
-		Objects.requireNonNull(action);
-		int index = 0;
-		for(ITERATOR KEY_GENERIC_TYPE iter = iterator();iter.hasNext();action.accept(index++, iter.NEXT()));
-	}
-	
-	/**
-	 * Helper function to reduce Lambda usage and allow for more method references, since these are faster/cleaner.
-	 * @param input the object that should be included
-	 * @param action The action to be performed for each element
-	 * @param <E> the generic type of the Object
-	 * @throws java.lang.NullPointerException if the specified action is null
-	 */
-	default <E> void forEach(E input, BI_FROM_OBJECT_CONSUMER KSK_GENERIC_TYPE<E> action) {
-		Objects.requireNonNull(action);
-		iterator().forEachRemaining(input, action);
-	}
-	
-#if SPLIT_ITERATOR_FEATURE
-	/**
-	 * A Type Specific Type Splititerator to reduce boxing/unboxing
-	 * @return type specific splititerator
-	 */
-	@Override
-	default SPLIT_ITERATOR KEY_GENERIC_TYPE spliterator() { return SPLIT_ITERATORS.createUnknownSplititerator(iterator(), 0); }
-	
-#endif
-#if ASYNC_MODULE
-	/**
-	 * Creates a Async Builder for moving work of the thread.
-	 * It is not designed to split the work to multithreaded work, so using this keep it singlethreaded, but it allows to be moved to another thread.
-	 * @see ASYNC_BUILDER
-	 * @return a AsyncBuilder
-	 */
-	default ASYNC_BUILDER KEY_GENERIC_TYPE asAsync() {
-		return new ASYNC_BUILDERBRACES(this);
-	}
-
-#endif
-	/**
-	 * A Helper function to reduce the usage of Streams and allows to convert a Iterable to something else.
-	 * @param mapper the mapping function
-	 * @param <E> The return type.
-	 * @return a new Iterable that returns the desired result
-	 */
-	default <E> ObjectIterable<E> map(TO_OBJECT_FUNCTION KKS_GENERIC_TYPE<E> mapper) {
-		return ITERABLES.map(this, mapper);
-	}
-	
-#if TYPE_OBJECT
-#iterate
-#argument OUTPUT_ITERABLE BooleanIterable ByteIterable ShortIterable IntIterable LongIterable FloatIterable DoubleIterable
-#argument MAPPER Predicate ToByteFunction ToShortFunction ToIntFunction ToLongFunction ToFloatFunction ToDoubleFunction
-#argument DATA_TYPE Boolean Byte Short Int Long Float Double
-#argument FILTER_TYPE BOOLEAN_COLLECTION_MODULE BYTE_COLLECTION_MODULE SHORT_COLLECTION_MODULE INT_COLLECTION_MODULE LONG_COLLECTION_MODULE FLOAT_COLLECTION_MODULE DOUBLE_COLLECTION_MODULE
-#if FILTER_TYPE
-	/**
-	 * A Helper function to reduce the usage of Streams and allows to convert a Iterable to something else.
-	 * @param mapper the mapping function
-	 * @return a new Iterable that returns the desired result
-	 */
-	default OUTPUT_ITERABLE mapToDATA_TYPE(MAPPER<T> mapper) {
-		return ITERABLES.mapToDATA_TYPE(this, mapper);
-	}
-	
-#endif
-#enditerate
-#endif
-	/**
-	 * A Helper function to reduce the usage of Streams and allows to convert a Iterable to something else.
-	 * @param mapper the flatMapping function
-	 * @param <V> The return type supplier.
-	 * @param <E> The return type.
-	 * @return a new Iterable that returns the desired result
-	 * @note does not support TO_ARRAY optimizations.
-	 */
-	default <E, V extends Iterable<E>> ObjectIterable<E> flatMap(TO_OBJECT_FUNCTION KKS_GENERIC_TYPE<V> mapper) {
-		return ITERABLES.flatMap(this, mapper);
-	}
-	
-	/**
-	 * A Helper function to reduce the usage of Streams and allows to convert a Iterable to something else.
-	 * @param mapper the flatMapping function
-	 * @param <E> The return type.
-	 * @return a new Iterable that returns the desired result
-	 * @note does not support TO_ARRAY optimizations.
-	 */
-	default <E> ObjectIterable<E> arrayflatMap(TO_OBJECT_FUNCTION KKS_GENERIC_TYPE<E[]> mapper) {
-		return ITERABLES.arrayFlatMap(this, mapper);
-	}
-	
-	/**
-	 * A Helper function to reduce the usage of Streams and allows to filter out unwanted elements
-	 * @param filter the elements that should be kept.
-	 * @return a Iterable that filtered out all unwanted elements
-	 * @note does not support TO_ARRAY optimizations.
-	 */
-	default ITERABLE KEY_GENERIC_TYPE filter(PREDICATE KEY_GENERIC_TYPE filter) {
-		return ITERABLES.filter(this, filter);
-	}
-	
-	/**
-	 * A Helper function to reduce the usage of Streams and allows to filter out duplicated elements
-	 * @return a Iterable that filtered out all duplicated elements
-	 * @note does not support TO_ARRAY optimizations.
-	 */
-	default ITERABLE KEY_GENERIC_TYPE distinct() {
-		return ITERABLES.distinct(this);
-	}
-	
-	/**
-	 * A Helper function to reduce the usage of Streams and allows to repeat elements a desired amount of times
-	 * @param repeats how many times the elements should be repeated
-	 * @return a Iterable that is repeating multiple times
-	 */
-	default ITERABLE KEY_GENERIC_TYPE repeat(int repeats) {
-		return ITERABLES.repeat(this, repeats);
-	}
-	
-	/**
-	 * A Helper function to reduce the usage of Streams and allows to limit the amount of elements
-	 * @param limit the amount of elements it should be limited to
-	 * @return a Iterable that is limited in length
-	 */
-	default ITERABLE KEY_GENERIC_TYPE limit(long limit) {
-		return ITERABLES.limit(this, limit);
-	}
-	
-	/**
-	 * A Helper function to reduce the usage of Streams and allows to sort the elements
-	 * @param sorter that sorts the elements.
-	 * @return a Iterable that is sorted
-	 */
-	default ITERABLE KEY_GENERIC_TYPE sorted(COMPARATOR KEY_GENERIC_TYPE sorter) {
-		return ITERABLES.sorted(this, sorter);
-	}
-	
-	/**
-	 * A Helper function to reduce the usage of Streams and allows to preview elements before they are iterated through
-	 * @param action the action that should be applied
-	 * @return a Peeked Iterable
-	 */
-	default ITERABLE KEY_GENERIC_TYPE peek(CONSUMER KEY_GENERIC_TYPE action) {
-		return ITERABLES.peek(this, action);
-	}
-	
-	/**
-	 * A Helper function to reduce the usage of Streams and allows to collect all elements
-	 * @param collection that the elements should be inserted to
-	 * @param <E> the collection type
-	 * @return the input with the desired elements
-	 */
-	default <E extends COLLECTION KEY_GENERIC_TYPE> E pour(E collection) {
-		ITERATORS.pour(iterator(), collection);
-		return collection;
-	}
-	
-#if ARRAY_LIST_FEATURE || LINKED_LIST_FEATURE
-	/**
-	 * A Helper function that reduces the usage of streams and allows to collect all elements as a ArrayList
-	 * @return a new ArrayList of all elements
-	 */
-	default LIST KEY_GENERIC_TYPE pourAsList() {
-#if ARRAY_LIST_FEATURE
-		return pour(new ARRAY_LISTBRACES());
-#else
-		return pour(new LINKED_LISTBRACES());
-#endif
-	}
-	
-#endif
-#if !TYPE_BOOLEAN && SET_MODULE
-#if LINKED_SET_FEATURE || LINKED_CUSTOM_SET_FEATURE || SET_FEATURE || CUSTOM_SET_FEATURE || RB_TREE_SET_FEATURE || AVL_TREE_SET_FEATURE || ARRAY_SET_FEATURE
-	/**
-	 * A Helper function that reduces the usage of streams and allows to collect all elements as a LinkedHashSet
-	 * @return a new LinkedHashSet of all elements
-	 */
-	default SET KEY_GENERIC_TYPE pourAsSet() { 
-#if LINKED_SET_FEATURE
-		return pour(new LINKED_HASH_SETBRACES());
-#else if LINKED_CUSTOM_SET_FEATURE
-		return pour(new LINKED_CUSTOM_HASH_SETBRACES(STRATEGY.normalStrategy()));
-#else if SET_FEATURE
-		return pour(new HASH_SETBRACES());
-#else if CUSTOM_SET_FEATURE
-		return pour(new CUSTOM_HASH_SETBRACES(STRATEGY.normalStrategy()));
-#else if RB_TREE_SET_FEATURE
-		return pour(new RB_Tree_SETBRACES());
-#else if AVL_TREE_SET_FEATURE
-		return pour(new AVL_Tree_SETBRACES());
-#else if ARRAY_SET_FEATURE
-		return pour(new ARRAY_SETBRACES());
-#endif
-	}
-	
-#endif
-#endif	
-#if TYPE_OBJECT
-	/**
-	 * A Helper function that reduces the usage of streams and allows to collect all elements as a Array
-	 * @param action is the creator function of said Array to ensure type is kept.
-	 * @param <E> the returning arrayType
-	 * @return a new Array of all elements
-	 */
-	default <E> E[] TO_ARRAY(IntFunction<E[]> action) {
-		ISizeProvider prov = ISizeProvider.of(this);
-		if(prov != null) {
-			int size = prov.size();
-			if(size >= 0) {
-				E[] array = action.apply(size);
-				ITERATORS.unwrap(array, iterator());
-				return array;
-			}
-		}
-		return ARRAYS.pour(iterator(), action);
-	}
-#else
-	/**
-	 * A Helper function that reduces the usage of streams and allows to collect all elements as a Array
-	 * @return a new Array of all elements
-	 */
-	default KEY_TYPE[] TO_ARRAY() {
-		ISizeProvider prov = ISizeProvider.of(this);
-		if(prov != null) {
-			int size = prov.size();
-			if(size >= 0) {
-				KEY_TYPE[] array = NEW_KEY_ARRAY(size);
-				ITERATORS.unwrap(array, iterator());
-				return array;
-			}
-		}
-		return ARRAYS.pour(iterator());
-	}
-	
-#endif
-	/**
-	 * Helper function to reduce stream usage that allows to filter for any matches.
-	 * @param filter that should be applied
-	 * @return true if any matches were found
-	 */
-	default boolean matchesAny(PREDICATE KEY_GENERIC_TYPE filter) {
-		Objects.requireNonNull(filter);
-		for(ITERATOR KEY_GENERIC_TYPE iter = iterator();iter.hasNext();) {
-			if(filter.test(iter.NEXT())) return true;
-		}
-		return false;
-	}
-	
-	/**
-	 * Helper function to reduce stream usage that allows to filter for no matches.
-	 * @param filter that should be applied
-	 * @return true if no matches were found
-	 */
-	default boolean matchesNone(PREDICATE KEY_GENERIC_TYPE filter) {
-		Objects.requireNonNull(filter);
-		for(ITERATOR KEY_GENERIC_TYPE iter = iterator();iter.hasNext();) {
-			if(filter.test(iter.NEXT())) return false;
-		}
-		return true;
-	}
-	
-	/**
-	 * Helper function to reduce stream usage that allows to filter for all matches.
-	 * @param filter that should be applied
-	 * @return true if all matches.
-	 */
-	default boolean matchesAll(PREDICATE KEY_GENERIC_TYPE filter) {
-		Objects.requireNonNull(filter);
-		for(ITERATOR KEY_GENERIC_TYPE iter = iterator();iter.hasNext();) {
-			if(!filter.test(iter.NEXT())) return false;
-		}
-		return true;
-	}
-	
-	/**
-	 * Helper function to reduce stream usage that allows to filter for the first match.
-	 * @param filter that should be applied
-	 * @return the found value or the null equivalent variant.
-	 */
-	default KEY_TYPE findFirst(PREDICATE KEY_GENERIC_TYPE filter) {
-		Objects.requireNonNull(filter);
-		for(ITERATOR KEY_GENERIC_TYPE iter = iterator();iter.hasNext();) {
-			KEY_TYPE entry = iter.NEXT();
-			if(filter.test(entry)) return entry;
-		}
-		return EMPTY_VALUE;
-	}
-	
-#if !TYPE_OBJECT
-	/**
-	 * Performs a <a href="package-summary.html#Reduction">reduction</a> on the
-     * elements of this Iterable
-	 * @param operator the operation that should be applied
-	 * @param identity the start value
-	 * @return the reduction result, returns identity if nothing was found
-	 */
-	default KEY_TYPE reduce(KEY_TYPE identity, UNARY_OPERATOR KEY_KEY_GENERIC_TYPE operator) {
-		Objects.requireNonNull(operator);
-		KEY_TYPE state = identity;
-		for(ITERATOR KEY_GENERIC_TYPE iter = iterator();iter.hasNext();) {
-			state = operator.APPLY_VALUE(state, iter.NEXT());
-		}
-		return state;
-	}
-	
-#else
-	/**
-	 * Performs a <a href="package-summary.html#Reduction">reduction</a> on the
-     * elements of this Iterable
-	 * @param operator the operation that should be applied
-	 * @param identity the start value
-	 * @Type(E)
-	 * @return the reduction result, returns identity if nothing was found
-	 */
-	default <KEY_SPECIAL_TYPE> KEY_SPECIAL_TYPE reduce(KEY_SPECIAL_TYPE identity, BiFunction<KEY_SPECIAL_TYPE, KEY_TYPE, KEY_SPECIAL_TYPE> operator) {
-		Objects.requireNonNull(operator);
-		KEY_SPECIAL_TYPE state = identity;
-		for(ITERATOR KEY_GENERIC_TYPE iter = iterator();iter.hasNext();) {
-			state = operator.APPLY_VALUE(state, iter.NEXT());
-		}
-		return state;
-	}
-	
-#endif
-	/**
-	 * Performs a <a href="package-summary.html#Reduction">reduction</a> on the
-	 * elements of this Iterable
-	 * @param operator the operation that should be applied
-	 * @return the reduction result, returns null value if nothing was found
-	 */
-	default KEY_TYPE reduce(UNARY_OPERATOR KEY_KEY_GENERIC_TYPE operator) {
-		Objects.requireNonNull(operator);
-		KEY_TYPE state = EMPTY_VALUE;
-		boolean empty = true;
-		for(ITERATOR KEY_GENERIC_TYPE iter = iterator();iter.hasNext();) {
-			if(empty) {
-				empty = false;
-				state = iter.NEXT();
-				continue;
-			}
-			state = operator.APPLY_VALUE(state, iter.NEXT());
-		}
-		return state;
-	}	
-	
-	/**
-	 * Helper function to reduce stream usage that allows to count the valid elements.
-	 * @param filter that should be applied
-	 * @return the amount of Valid Elements
-	 */
-	default int count(PREDICATE KEY_GENERIC_TYPE filter) {
-		Objects.requireNonNull(filter);
-		int result = 0;
-		for(ITERATOR KEY_GENERIC_TYPE iter = iterator();iter.hasNext();) {
-			if(filter.test(iter.NEXT())) result++;
-		}
-		return result;
-	}
+package speiger.src.collections.PACKAGE.collections;
+
+import java.util.Objects;
+#if !TYPE_OBJECT
+import java.util.function.Consumer;
+
+import speiger.src.collections.PACKAGE.functions.CONSUMER;
+import speiger.src.collections.objects.collections.ObjectIterable;
+#endif
+import speiger.src.collections.PACKAGE.functions.function.TO_OBJECT_FUNCTION;
+import speiger.src.collections.PACKAGE.functions.consumer.BI_OBJECT_CONSUMER;
+import speiger.src.collections.PACKAGE.functions.function.PREDICATE;
+import speiger.src.collections.PACKAGE.collections.SPLIT_ITERATOR;
+import speiger.src.collections.PACKAGE.utils.SPLIT_ITERATORS;
+import speiger.src.collections.PACKAGE.utils.ITERABLES;
+
+/**
+ * A Type-Specific {@link Iterable} that reduces (un)boxing
+ * @Type(T)
+ */
+public interface ITERABLE KEY_GENERIC_TYPE extends Iterable<CLASS_TYPE>
+{
+	/**
+	 * Returns an iterator over elements of type {@code T}.
+	 *
+	 * @return an Iterator.
+	 */
+	@Override
+	ITERATOR KEY_GENERIC_TYPE iterator();
+	
+#if !TYPE_OBJECT
+	/**
+	 * A Type Specific foreach function that reduces (un)boxing
+	 * 
+	 * @implSpec
+	 * <p>The default implementation behaves as if:
+	 * <pre>{@code
+	 *	iterator().forEachRemaining(action);
+	 * }</pre>
+	 *
+	 * @param action The action to be performed for each element
+	 * @throws NullPointerException if the specified action is null
+	 * @see Iterable#forEach(Consumer)
+	 */
+	default void forEach(CONSUMER action) {
+		Objects.requireNonNull(action);
+		iterator().forEachRemaining(action);
+	}
+	
+	/** {@inheritDoc}
+	* <p>This default implementation delegates to the corresponding type-specific function.
+	* @deprecated Please use the corresponding type-specific function instead. 
+	*/
+	@Deprecated
+	@Override
+	default void forEach(Consumer<? super CLASS_TYPE> action) {
+		Objects.requireNonNull(action);
+		iterator().forEachRemaining(action);
+	}
+	
+#endif
+	/**
+	 * Helper function to reduce Lambda usage and allow for more method references, since these are faster/cleaner.
+	 * @param input the object that should be included
+	 * @param action The action to be performed for each element
+	 * @param <E> the generic type of the Object
+	 * @throws java.lang.NullPointerException if the specified action is null
+	 */
+	default <E> void forEach(E input, BI_OBJECT_CONSUMER KKS_GENERIC_TYPE<E> action) {
+		Objects.requireNonNull(action);
+		iterator().forEachRemaining(input, action);
+	}
+	
+	/**
+	 * A Type Specific Type Splititerator to reduce boxing/unboxing
+	 * @return type specific splititerator
+	 */
+	@Override
+	default SPLIT_ITERATOR KEY_GENERIC_TYPE spliterator() { return SPLIT_ITERATORS.createUnknownSplititerator(iterator(), 0); }
+
+	/**
+	 * A Helper function to reduce the usage of Streams and allows to convert a Iterable to something else.
+	 * @param mapper the mapping function
+	 * @param <E> The return type.
+	 * @return a new Iterable that returns the desired result
+	 */
+	default <E> ObjectIterable<E> map(TO_OBJECT_FUNCTION KKS_GENERIC_TYPE<E> mapper) {
+		return ITERABLES.map(this, mapper);
+	}
+	
+	/**
+	 * A Helper function to reduce the usage of Streams and allows to convert a Iterable to something else.
+	 * @param mapper the flatMapping function
+	 * @param <V> The return type supplier.
+	 * @param <E> The return type.
+	 * @return a new Iterable that returns the desired result
+	 */
+	default <E, V extends Iterable<E>> ObjectIterable<E> flatMap(TO_OBJECT_FUNCTION KKS_GENERIC_TYPE<V> mapper) {
+		return ITERABLES.flatMap(this, mapper);
+	}
+	
+	/**
+	 * A Helper function to reduce the usage of Streams and allows to convert a Iterable to something else.
+	 * @param mapper the flatMapping function
+	 * @param <E> The return type.
+	 * @return a new Iterable that returns the desired result
+	 */
+	default <E> ObjectIterable<E> arrayflatMap(TO_OBJECT_FUNCTION KKS_GENERIC_TYPE<E[]> mapper) {
+		return ITERABLES.arrayFlatMap(this, mapper);
+	}
+	
+	/**
+	 * A Helper function to reduce the usage of Streams and allows to filter out unwanted elements
+	 * @param filter the elements that should be kept.
+	 * @return a Iterable that filtered out all unwanted elements
+	 */
+	default ITERABLE KEY_GENERIC_TYPE filter(PREDICATE KEY_GENERIC_TYPE filter) {
+		return ITERABLES.filter(this, filter);
+	}
+	
+	/**
+	 * Helper function to reduce stream usage that allows to filter for any matches.
+	 * @param filter that should be applied
+	 * @return true if any matches were found
+	 */
+	default boolean matchesAny(PREDICATE KEY_GENERIC_TYPE filter) {
+		Objects.requireNonNull(filter);
+		for(ITERATOR KEY_GENERIC_TYPE iter = iterator();iter.hasNext();) {
+			if(filter.TEST_VALUE(iter.NEXT())) return true;
+		}
+		return false;
+	}
+	
+	/**
+	 * Helper function to reduce stream usage that allows to filter for no matches.
+	 * @param filter that should be applied
+	 * @return true if no matches were found
+	 */
+	default boolean matchesNone(PREDICATE KEY_GENERIC_TYPE filter) {
+		Objects.requireNonNull(filter);
+		for(ITERATOR KEY_GENERIC_TYPE iter = iterator();iter.hasNext();) {
+			if(filter.TEST_VALUE(iter.NEXT())) return false;
+		}
+		return true;
+	}
+	
+	/**
+	 * Helper function to reduce stream usage that allows to filter for all matches.
+	 * @param filter that should be applied
+	 * @return true if all matches.
+	 */
+	default boolean matchesAll(PREDICATE KEY_GENERIC_TYPE filter) {
+		Objects.requireNonNull(filter);
+		for(ITERATOR KEY_GENERIC_TYPE iter = iterator();iter.hasNext();) {
+			if(!filter.TEST_VALUE(iter.NEXT())) return false;
+		}
+		return true;
+	}
+	
+	/**
+	 * Helper function to reduce stream usage that allows to filter for the first match.
+	 * @param filter that should be applied
+	 * @return the found value or the null equivalent variant.
+	 */
+	default KEY_TYPE findFirst(PREDICATE KEY_GENERIC_TYPE filter) {
+		Objects.requireNonNull(filter);
+		for(ITERATOR KEY_GENERIC_TYPE iter = iterator();iter.hasNext();) {
+			KEY_TYPE entry = iter.NEXT();
+			if(filter.TEST_VALUE(entry)) return entry;
+		}
+		return EMPTY_VALUE;
+	}
 }

src/builder/resources/speiger/assets/collections/templates/collections/Iterator.template

@@ -8,7 +8,7 @@ import java.util.function.Consumer;
 import speiger.src.collections.PACKAGE.functions.CONSUMER;
 
 #endif
-import speiger.src.collections.objects.functions.consumer.BI_FROM_OBJECT_CONSUMER;
+import speiger.src.collections.PACKAGE.functions.consumer.BI_OBJECT_CONSUMER;
 
 /**
  * A Type-Specific {@link Iterator} that reduces (un)boxing
@@ -74,9 +74,9 @@ public interface ITERATOR KEY_GENERIC_TYPE extends Iterator<CLASS_TYPE>
 	 * @param <E> the generic type of the Object
 	 * @throws java.lang.NullPointerException if the specified action is null
 	 */
-	default <E> void forEachRemaining(E input, BI_FROM_OBJECT_CONSUMER KSK_GENERIC_TYPE<E> action) {
+	default <E> void forEachRemaining(E input, BI_OBJECT_CONSUMER KKS_GENERIC_TYPE<E> action) {
 		Objects.requireNonNull(action);
-		while(hasNext()) { action.accept(input, NEXT()); }
+		while(hasNext()) { action.accept(NEXT(), input); }
 	}
 	
 	/**

src/builder/resources/speiger/assets/collections/templates/collections/Stack.template

@@ -1,7 +1,5 @@
 package speiger.src.collections.PACKAGE.collections;
 
-import java.util.NoSuchElementException;
-
 import speiger.src.collections.utils.Stack;
 
 /**
@@ -16,14 +14,6 @@ public interface STACK
 	 */
 	public void push(KEY_TYPE e);
 	
-	/**
-	 * Helper function that pushes the top element on top of the stack again.
-	 * @throws NoSuchElementException if the stack is empty
-	 */
-	public default void pushTop() {
-		push(top());
-	}
-	
 	/**
 	 * Removes the Object on top of the stack.
 	 * @return the element that is on top of the stack
@@ -69,19 +59,4 @@ public interface STACK
 	public default boolean isEmpty() {
 		return size() == 0;
 	}
-	
-	/**
-	 * A method to drop the contents of the Stack without clearing the stack
-	 * @Type(E)
-	 * @return the contents of the stack into a seperate array.
-	 */
-	public default GENERIC_SPECIAL_KEY_BRACES<E> KEY_SPECIAL_TYPE[] TO_ARRAY() { return TO_ARRAY(NEW_SPECIAL_KEY_ARRAY(size())); }
-	/**
-	 * A method to drop the contents of the Stack without clearing the stack
-	 * @param input where the elements should be inserted to. If it does not fit then it creates a new appropiatly created array
-	 * @Type(E)
-	 * @return the contents of the stack into a seperate array.
-	 * @note if the Type is generic then a Object Array is created instead of a Type Array
-	 */
-	public GENERIC_SPECIAL_KEY_BRACES<E> KEY_SPECIAL_TYPE[] TO_ARRAY(KEY_SPECIAL_TYPE[] input);
 }

src/builder/resources/speiger/assets/collections/templates/functions/Comparator.template

@@ -1,70 +1,66 @@
-package speiger.src.collections.PACKAGE.functions;
-
-import java.util.Comparator;
-import java.util.Objects;
-
-/**
- * Type-Specific Class for Comparator to reduce (un)boxing
- */
-public interface COMPARATOR extends Comparator<CLASS_TYPE> 
-{
-	/**
-	 * Type-Specific compare function to reduce (un)boxing
-	 * @param o1 the first object to be compared.
-	 * @param o2 the second object to be compared.
-	 * @return a negative integer, zero, or a positive integer as the first argument is less than, equal to, or greater than the second.
-	 * @see Comparator#compare(Object, Object)
-	 */
-	int compare(KEY_TYPE o1, KEY_TYPE o2);
-	
-	/** {@inheritDoc}
-	 * <p>This default implementation delegates to the corresponding type-specific function.
-	 * @deprecated Please use the corresponding type-specific function instead. 
-	 */
-	@Override
-	@Deprecated
-	default int compare(CLASS_TYPE o1, CLASS_TYPE o2) {
-		return compare(OBJ_TO_KEY(o1), OBJ_TO_KEY(o2));
-	}
-	
-	/**
-	 * A Wrapper function to convert a Non-Type-Specific Comparator to a Type-Specific-Comparator
-	 * @param c comparator to convert
-	 * @return the wrapper of the comparator
-	 * @throws NullPointerException if the comparator is null
-	 */
-	public static COMPARATOR of(Comparator<CLASS_TYPE> c) {
-		Objects.requireNonNull(c);
-		return (K, V) -> c.compare(KEY_TO_OBJ(K), KEY_TO_OBJ(V));
-	}
-	
-	@Override
-	public default COMPARATOR reversed() {
-		return new Reversed(this);
-	}
-	
-	/**
-	 * A Type Specific Reversed Comparator to reduce boxing/unboxing
-	 */
-	static class Reversed implements COMPARATOR
-	{
-		COMPARATOR original;
-		
-		/**
-		 * default constructor
-		 * @param original that is going to be reversed
-		 */
-		public Reversed(COMPARATOR original) {
-			this.original = original;
-		}
-		
-		public int compare(KEY_TYPE o1, KEY_TYPE o2) {
-			return original.compare(o2, o1);
-		}
-		
-		@Override
-		public COMPARATOR reversed() {
-			return original;
-		}
-	}
+package speiger.src.collections.PACKAGE.functions;
+
+import java.util.Comparator;
+import java.util.Objects;
+
+/**
+ * Type-Specific Class for Comparator to reduce (un)boxing
+ */
+public interface COMPARATOR extends Comparator<CLASS_TYPE> 
+{
+	/**
+	 * Type-Specific compare function to reduce (un)boxing
+	 * @param o1 the first object to be compared.
+	 * @param o2 the second object to be compared.
+	 * @return a negative integer, zero, or a positive integer as the first argument is less than, equal to, or greater than the second.
+	 * @see Comparator#compare(Object, Object)
+	 */
+	int compare(KEY_TYPE o1, KEY_TYPE o2);
+	
+	/** {@inheritDoc}
+	 * <p>This default implementation delegates to the corresponding type-specific function.
+	 * @deprecated Please use the corresponding type-specific function instead. 
+	 */
+	@Override
+	@Deprecated
+	default int compare(CLASS_TYPE o1, CLASS_TYPE o2) {
+		return compare(OBJ_TO_KEY(o1), OBJ_TO_KEY(o2));
+	}
+	
+	/**
+	 * A Wrapper function to convert a Non-Type-Specific Comparator to a Type-Specific-Comparator
+	 * @param c comparator to convert
+	 * @return the wrapper of the comparator
+	 * @throws NullPointerException if the comparator is null
+	 */
+	public static COMPARATOR of(Comparator<CLASS_TYPE> c) {
+		Objects.requireNonNull(c);
+		return (K, V) -> c.compare(KEY_TO_OBJ(K), KEY_TO_OBJ(V));
+	}
+	
+	@Override
+	public default COMPARATOR reversed() {
+		return new Reversed(this);
+	}
+	
+	/**
+	 * A Type Specific Reversed Comparator to reduce boxing/unboxing
+	 */
+	static class Reversed implements COMPARATOR
+	{
+		COMPARATOR original;
+		
+		public Reversed(COMPARATOR original) {
+			this.original = original;
+		}
+		
+		public int compare(KEY_TYPE o1, KEY_TYPE o2) {
+			return original.compare(o2, o1);
+		}
+		
+		@Override
+		public COMPARATOR reversed() {
+			return original;
+		}
+	}
 }

src/builder/resources/speiger/assets/collections/templates/functions/Supplier.template

@@ -1,19 +0,0 @@
-package speiger.src.collections.PACKAGE.functions;
-
-/**
- * Type-Specific Supplier interface that reduces (un)boxing and allows to merge other consumer types into this interface
- * @Type(T)
- */
-#if TYPE_OBJECT
-public interface SUPPLIER KEY_GENERIC_TYPE extends java.util.function.Supplier<KEY_TYPE>
-#else if JDK_TYPE && !TYPE_BOOLEAN
-public interface SUPPLIER KEY_GENERIC_TYPE extends JAVA_SUPPLIER
-#else
-public interface SUPPLIER KEY_GENERIC_TYPE
-#endif
-{
-	/**
-	 * @return the supplied value
-	 */
-	public KEY_TYPE SUPPLY_GET();
-}

src/builder/resources/speiger/assets/collections/templates/functions/Task.template

@@ -1,92 +0,0 @@
-package speiger.src.collections.PACKAGE.functions;
-
-import java.util.concurrent.RunnableFuture;
-#if !TYPE_OBJECT
-import java.util.concurrent.CancellationException;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-#endif
-
-/**
- * 
- * A Type Specific Task interface that allows you to keep track of the task that is currently running.<br>
- * It extends Runnable future and supports said functions but also provides quality of life functions like:<br>
- * 
- * - isSuccesfull: which allows to detect if the task was completed properly and not interrupted or crashed.
- * - pause/resume: which allows to pause/resume the task at any moment, making it easier to create thread-safe actions.
- * @Type(T)
- */
-public interface TASK KEY_GENERIC_TYPE extends RunnableFuture<CLASS_TYPE> {
-	/**
-	 * Helper function to detect if the task is currently paused.
-	 * @return true if paused
-	 */
-	public boolean isPaused();
-	
-	/**
-	 * Pauses the task, which lets the thread finish without completing the task.
-	 * Tasks are written in the way where they can pause without any issues.
-	 * This won't be instant, as this function is applied asynchronous and doesn't check if the thread paused.
-	 * So make sure it had the time to pause.
-	 */
-	public void pause();
-	
-	/**
-	 * Pauses the task, which lets the thread finish without completing the task.
-	 * Tasks are written in the way where they can pause without any issues.
-	 * This won't be instant, as this function is applied asynchronous.
-	 * It will await the pausing of the task.
-	 */
-	public void awaitPausing();
-	
-	/**
-	 * Continues the task if it wasn't already completed.
-	 * This is done by resubmitting the task to the executor provided.
-	 */
-	public void resume();
-	
-	/**
-	 * Quality of life function that allows to detect if no cancellation/exception was applied to this task and it completed on its own.
-	 * @return true if it was properly completed
-	 */
-	public boolean isSuccessful();
-	
-#if !TYPE_OBJECT
-	/**
-	 * A Type Specific get method that allows to reduce (un)boxing of primtives.
-	 * 
-	 * Waits if necessary for the computation to complete, and then
-	 * retrieves its result.
-	 *
-	 * @return the computed result as primitive
-	 * @throws CancellationException if the computation was cancelled
-	 * @throws ExecutionException if the computation threw an exception
-	 * @throws InterruptedException if the current thread was interrupted
-	 * while waiting
-	 */
-	public KEY_TYPE GET_KEY() throws InterruptedException, ExecutionException;
-
-	/**
-	 * Waits if necessary for at most the given time for the computation
-	 * to complete, and then retrieves its result, if available.
-	 *
-	 * @param timeout the maximum time to wait
-	 * @param unit the time unit of the timeout argument
-	 * @return the computed result as primitive
-	 * @throws CancellationException if the computation was cancelled
-	 * @throws ExecutionException if the computation threw an exception
-	 * @throws InterruptedException if the current thread was interrupted while waiting
-	 * @throws TimeoutException if the wait timed out
-	 */
-	public KEY_TYPE GET_KEY(long timeout, TimeUnit unit) throws InterruptedException, ExecutionException, TimeoutException;
-	
-	@Override
-	@Deprecated
-	public default CLASS_TYPE get() throws InterruptedException, ExecutionException { return KEY_TO_OBJ(GET_KEY()); }
-	
-	@Override
-	@Deprecated
-	public default CLASS_TYPE get(long timeout, TimeUnit unit) throws InterruptedException, ExecutionException, TimeoutException { return KEY_TO_OBJ(GET_KEY(timeout, unit)); }
-#endif
-}

src/builder/resources/speiger/assets/collections/templates/functions/function/Function.template

@@ -1,134 +1,79 @@
-package speiger.src.collections.PACKAGE.functions.function;
-
-#if VALUE_BOOLEAN || SAME_TYPE
-import java.util.Objects;
-#endif
-
-/**
- * A Type Specific Function interface that reduces boxing/unboxing and fills the gaps of interfaces that are missing.
- * @Type(T)
- * @ValueType(V)
- */
-@FunctionalInterface
-#if JDK_FUNCTION
-public interface FUNCTION KEY_VALUE_GENERIC_TYPE extends JAVA_FUNCTION KEY_VALUE_GENERIC_TYPE
-#else
-public interface FUNCTION KEY_VALUE_GENERIC_TYPE
-#endif
-{
-	/**
-	 * Type Specific get function to reduce boxing/unboxing
-	 * @param k the value that should be processed
-	 * @return the result of the function
-	 */
-	public VALUE_TYPE APPLY(KEY_TYPE k);
-	
-#if SAME_TYPE
-	/**
-	 * Creates a Default function that returns the input provided.
-	 * @Type(T)
-	 * @return a input returning function
-	 */
-	public static GENERIC_KEY_BRACES FUNCTION KEY_SAME_GENERIC_TYPE identity() {
-		return T -> T;
-	}
-	
-	/**
-	 * Returns a composed function that first applies the {@code before}
-     * function to its input, and then applies this function to the result.
-     * If evaluation of either function throws an exception, it is relayed to
-     * the caller of the composed function.
-     * 
-     * @Type(I)
-     * @param before the function that should be used first
-     * @return a composed function with a different starting function.
-	 */
-	public default GENERIC_SPECIAL_VALUE_BRACES<I> FUNCTION SV_GENERIC_TYPE<I> compose(FUNCTION SK_GENERIC_TYPE<I> before) {
-        Objects.requireNonNull(before);
-		return T -> APPLY(before.APPLY(T));
-	}
-	
-	/**
-     * Returns a composed function that first applies this function to
-     * its input, and then applies the {@code after} function to the result.
-     * If evaluation of either function throws an exception, it is relayed to
-     * the caller of the composed function.
-     * 
-     * @Type(I)
-     * @param after the function that should be used last
-     * @return a composed function with a different starting function.
-	 */
-	public default GENERIC_SPECIAL_VALUE_BRACES<I> FUNCTION KS_GENERIC_TYPE<I> andThen(FUNCTION VS_GENERIC_TYPE<I> after) {
-        Objects.requireNonNull(after);
-		return T -> after.APPLY(APPLY(T));
-	}
-	
-#endif
-#if VALUE_BOOLEAN
-	/**
-	 * Creates a Always true function that may be useful if you don't need to process information or just want a default.
-	 * @Type(T)
-	 * @return a default returning function
-	 */
-	public static GENERIC_KEY_BRACES FUNCTION KEY_GENERIC_TYPE alwaysTrue() {
-		return T -> true;
-	}
-	
-	/**
-	 * Creates a Always false function that may be useful if you don't need to process information or just want a default.
-	 * @Type(T)
-	 * @return a default returning function
-	 */
-	public static GENERIC_KEY_BRACES FUNCTION KEY_GENERIC_TYPE alwaysFalse() {
-		return T -> false;
-	}
-	
-	/**
-	 * A Type specific and-function helper function that reduces boxing/unboxing
-	 * @param other the other function that should be merged with.
-	 * @return a function that compares values in a and comparason
-	 */
-	public default FUNCTION KEY_VALUE_GENERIC_TYPE andType(FUNCTION KEY_VALUE_GENERIC_TYPE other) {
-		Objects.requireNonNull(other);
-		return T -> APPLY(T) && other.APPLY(T);
-	}
-	
-#if JDK_FUNCTION
-	@Override
-	@Deprecated
-	public default FUNCTION KEY_VALUE_GENERIC_TYPE and(JAVA_FUNCTION KEY_VALUE_SUPER_GENERIC_TYPE other) {
-		Objects.requireNonNull(other);
-		return T -> APPLY(T) && other.APPLY(T);
-	}
-	
-	@Override
-#else
-	/**
-	 * A type specific inverter function
-	 * @return the same function but inverts the result
-	 */
-#endif
-	public default FUNCTION KEY_VALUE_GENERIC_TYPE negate() {
-		return T -> !APPLY(T);
-	}
-	
-	/**
-	 * A Type specific or-function helper function that reduces boxing/unboxing
-	 * @param other the other function that should be merged with.
-	 * @return a function that compares values in a or comparason
-	 */
-	public default FUNCTION KEY_VALUE_GENERIC_TYPE orType(FUNCTION KEY_VALUE_GENERIC_TYPE other) {
-		Objects.requireNonNull(other);
-		return T -> APPLY(T) || other.APPLY(T);
-	}
-	
-#if JDK_FUNCTION
-	@Override
-	@Deprecated
-	public default FUNCTION KEY_VALUE_GENERIC_TYPE or(JAVA_FUNCTION KEY_VALUE_SUPER_GENERIC_TYPE other) {
-		Objects.requireNonNull(other);
-		return T -> APPLY(T) || other.APPLY(T);
-	}
-#endif
-#endif
+package speiger.src.collections.PACKAGE.functions.function;
+
+#if JDK_FUNCTION && VALUE_BOOLEAN
+import java.util.Objects;
+#endif
+
+/**
+ * A Type Specific Function interface that reduces boxing/unboxing and fills the gaps of interfaces that are missing.
+ * @Type(T)
+ * @ValueType(V)
+ */
+@FunctionalInterface
+#if JDK_FUNCTION
+public interface FUNCTION KEY_VALUE_GENERIC_TYPE extends JAVA_FUNCTION KEY_VALUE_GENERIC_TYPE
+#else
+public interface FUNCTION KEY_VALUE_GENERIC_TYPE
+#endif
+{
+	/**
+	 * Type Specific get function to reduce boxing/unboxing
+	 * @param k the value that should be processed
+	 * @return the result of the function
+	 */
+	public VALUE_TYPE GET_VALUE(KEY_TYPE k);
+	
+#if JDK_FUNCTION
+#if VALUE_BOOLEAN
+	@Override
+	public default VALUE_TYPE test(KEY_TYPE k) { return GET_VALUE(k); }
+	
+	/**
+	 * A Type specific and-function helper function that reduces boxing/unboxing
+	 * @param other the other function that should be merged with.
+	 * @return a function that compares values in a and comparason
+	 */
+	public default FUNCTION KEY_VALUE_GENERIC_TYPE andType(FUNCTION KEY_VALUE_GENERIC_TYPE other) {
+		Objects.requireNonNull(other);
+		return T -> GET_VALUE(T) && other.GET_VALUE(T);
+	}
+	
+	@Override
+	@Deprecated
+	public default FUNCTION KEY_VALUE_GENERIC_TYPE and(JAVA_FUNCTION KEY_VALUE_SUPER_GENERIC_TYPE other) {
+		Objects.requireNonNull(other);
+		return T -> GET_VALUE(T) && other.test(T);
+	}
+	
+	@Override
+	public default FUNCTION KEY_VALUE_GENERIC_TYPE negate() {
+		return T -> !GET_VALUE(T);
+	}
+	
+	/**
+	 * A Type specific or-function helper function that reduces boxing/unboxing
+	 * @param other the other function that should be merged with.
+	 * @return a function that compares values in a or comparason
+	 */
+	public default FUNCTION KEY_VALUE_GENERIC_TYPE orType(FUNCTION KEY_VALUE_GENERIC_TYPE other) {
+		Objects.requireNonNull(other);
+		return T -> GET_VALUE(T) || other.GET_VALUE(T);
+	}
+	
+	@Override
+	@Deprecated
+	public default FUNCTION KEY_VALUE_GENERIC_TYPE or(JAVA_FUNCTION KEY_VALUE_SUPER_GENERIC_TYPE other) {
+		Objects.requireNonNull(other);
+		return T -> GET_VALUE(T) || other.test(T);
+	}
+#else if VALUE_OBJECT
+	
+	@Override
+	public default VALUE_TYPE apply(KEY_TYPE k) { return GET_VALUE(k); }
+#else
+	
+	@Override
+	public default VALUE_TYPE APPLY_VALUE(KEY_TYPE k) { return GET_VALUE(k); }
+#endif
+#endif
 }

src/builder/resources/speiger/assets/collections/templates/lists/AbstractList.template

@@ -1,22 +1,13 @@
 package speiger.src.collections.PACKAGE.lists;
 
 import java.util.Collection;
-import java.util.Iterator;
 import java.util.List;
 import java.util.ListIterator;
-import java.util.NoSuchElementException;
 import java.util.Objects;
-import java.util.RandomAccess;
 
 import speiger.src.collections.PACKAGE.collections.ABSTRACT_COLLECTION;
 import speiger.src.collections.PACKAGE.collections.COLLECTION;
 import speiger.src.collections.PACKAGE.collections.ITERATOR;
-import speiger.src.collections.PACKAGE.collections.SPLIT_ITERATOR;
-#if INT_LIST_MODULE && !TYPE_INT
-import speiger.src.collections.ints.lists.IntList;
-#endif
-import speiger.src.collections.PACKAGE.utils.SPLIT_ITERATORS;
-import speiger.src.collections.utils.SanityChecks;
 
 /**
  * Abstract implementation of the {@link LIST} interface.
@@ -24,8 +15,9 @@ import speiger.src.collections.utils.SanityChecks;
  */
 public abstract class ABSTRACT_LIST KEY_GENERIC_TYPE extends ABSTRACT_COLLECTION KEY_GENERIC_TYPE implements LIST KEY_GENERIC_TYPE 
 {
+#if !TYPE_OBJECT
 	/**
-	 * A Type-Specific implementation of add function that delegates to {@link List#add(int, Object)}
+	 * A Type-Specific implementation of add function that delegates to {@link #add(int, KEY_TYPE)}
 	 */
 	@Override
 	public boolean add(KEY_TYPE e) {
@@ -33,7 +25,6 @@ public abstract class ABSTRACT_LIST KEY_GENERIC_TYPE extends ABSTRACT_COLLECTION
 		return true;
 	}
 	
-#if !TYPE_OBJECT
 	/** {@inheritDoc}
 	 * <p>This default implementation delegates to the corresponding type-specific function.
 	 * @deprecated Please use the corresponding type-specific function instead. 
@@ -71,7 +62,8 @@ public abstract class ABSTRACT_LIST KEY_GENERIC_TYPE extends ABSTRACT_COLLECTION
 	 */
 	@Override
 	@Deprecated
-	public boolean addAll(Collection<? extends CLASS_TYPE> c) {
+	public boolean addAll(Collection<? extends CLASS_TYPE> c)
+	{
 		return c instanceof COLLECTION ? addAll((COLLECTION KEY_GENERIC_TYPE)c) : addAll(size(), c);
 	}
 	
@@ -79,7 +71,7 @@ public abstract class ABSTRACT_LIST KEY_GENERIC_TYPE extends ABSTRACT_COLLECTION
 	 * The IndexOf implementation iterates over all elements and compares them to the search value.
 	 * @param o the value that the index is searched for.
 	 * @return index of the value that was searched for. -1 if not found
-	 * @note it is highly suggested not to use this with Primitives because of boxing. But it is still supported because of ObjectComparason that are custom objects and allow to find the contents.
+	 * @deprecated it is highly suggested not to use this with Primitives because of boxing. But it is still supported because of ObjectComparason that are custom objects and allow to find the contents.
 	 */
 	@Override
 	@Primitive
@@ -107,7 +99,7 @@ public abstract class ABSTRACT_LIST KEY_GENERIC_TYPE extends ABSTRACT_COLLECTION
 	 * The lastIndexOf implementation iterates over all elements and compares them to the search value.
 	 * @param o the value that the index is searched for.
 	 * @return the last index of the value that was searched for. -1 if not found
-	 * @note it is highly suggested not to use this with Primitives because of boxing. But it is still supported because of ObjectComparason that are custom objects and allow to find the contents.
+	 * @deprecated it is highly suggested not to use this with Primitives because of boxing. But it is still supported because of ObjectComparason that are custom objects and allow to find the contents.
 	 */
 	@Override
 	@Primitive
@@ -163,14 +155,6 @@ public abstract class ABSTRACT_LIST KEY_GENERIC_TYPE extends ABSTRACT_COLLECTION
 	}
 	
 #endif
-	@Override
-	public boolean REMOVE_SWAP(KEY_TYPE e) {
-		int index = indexOf(e);
-		if(index == -1) return false;
-		swapRemove(index);
-		return true;
-	}
-	
 	/**
 	 * Compares if the list are the same.
 	 */
@@ -221,13 +205,7 @@ public abstract class ABSTRACT_LIST KEY_GENERIC_TYPE extends ABSTRACT_COLLECTION
 	
 	@Override
 	public LIST KEY_GENERIC_TYPE subList(int fromIndex, int toIndex) {
-		SanityChecks.checkArrayCapacity(size(), fromIndex, toIndex-fromIndex);
-		return new SubList(this, 0, fromIndex, toIndex);
-	}
-	
-	@Override
-	public LIST KEY_GENERIC_TYPE reversed() {
-		return new ReversedList(this);
+		return new SUB_LIST(this, fromIndex, toIndex);
 	}
 	
 	@Override
@@ -239,293 +217,128 @@ public abstract class ABSTRACT_LIST KEY_GENERIC_TYPE extends ABSTRACT_COLLECTION
 	public LIST_ITERATOR KEY_GENERIC_TYPE listIterator() {
 		return listIterator(0);
 	}
-		
+
 	@Override
 	public LIST_ITERATOR KEY_GENERIC_TYPE listIterator(int index) {
-		if(index < 0 || index > size()) throw new IndexOutOfBoundsException();
 		return new LIST_ITER(index);
 	}
 	
-	@Override
-	public LIST_ITERATOR KEY_GENERIC_TYPE indexedIterator(int...indecies) {
-		return new IndexedIterator(indecies);
-	}
-	
-#if INT_LIST_MODULE
-	@Override
-	public LIST_ITERATOR KEY_GENERIC_TYPE indexedIterator(IntList indecies) {
-		return new ListIndexedIterator(indecies);
-	}
-	
-#endif
 	@Override
 	public void size(int size) {
 		while(size > size()) add(EMPTY_KEY_VALUE);
 		while(size < size()) REMOVE(size() - 1);
 	}
 	
-	public ABSTRACT_LIST KEY_GENERIC_TYPE copy() { throw new UnsupportedOperationException(); }
-	
-	private class ReversedList extends ABSTRACT_LIST KEY_GENERIC_TYPE
-	{
-		final ABSTRACT_LIST KEY_GENERIC_TYPE list;
-		
-		public ReversedList(ABSTRACT_LIST KEY_GENERIC_TYPE list) {
-			this.list = list;
-		}
-
-		@Override
-		public void add(int index, KEY_TYPE e) {
-			list.add(list.size() - index - 1, e);
-		}
-		
-		@Override
-		public boolean addAll(int index, COLLECTION KEY_GENERIC_TYPE c) {
-			return addCollection(index, c);
-		}
-		
-		@Override
-		public boolean addAll(int index, LIST KEY_GENERIC_TYPE c) {
-			if(c instanceof RandomAccess) {
-				for(int i = 0,m=c.size();i<m;i++) {
-					list.add(list.size() - index - i - 1, c.GET_KEY(i));
-				}
-				return true;
-			}
-			return addCollection(index, c);
-		}
-		
-		private boolean addCollection(int index, COLLECTION KEY_GENERIC_TYPE c) {
-			int i = 0;
-			for(ITERATOR KEY_GENERIC_TYPE iter = c.iterator();iter.hasNext();i++) {
-				list.add(list.size() - index - i - 1, iter.NEXT());
-			}
-			return true;
-		}
-		
-		@Override
-		public boolean addAll(int index, Collection<? extends CLASS_TYPE> c) {
-			int i = 0;
-			for(Iterator<? extends CLASS_TYPE> iter = c.iterator();iter.hasNext();i++) {
-				list.add(list.size() - index - i - 1, iter.next());
-			}
-			return true;
-		}
-		
-		@Override
-		public KEY_TYPE GET_KEY(int index) {
-			return list.GET_KEY(list.size() - index - 1);
-		}
-
-		@Override
-		public KEY_TYPE set(int index, KEY_TYPE e) {
-			return list.set(list.size() - index - 1, e);
-		}
-
-		@Override
-		public KEY_TYPE REMOVE(int index) {
-			return list.REMOVE(list.size() - index - 1);
-		}
-		
-		@Override
-		public void addElements(int from, KEY_TYPE[] a, int offset, int length) {
-			for(int i = 0,m=length;i<m;i++) {
-				list.add(list.size() - from - i - 1, a[i+offset]);
-			}
-		}
-		
-		@Override
-		public KEY_TYPE[] getElements(int from, KEY_TYPE[] a, int offset, int length) {
-			return reverse(list.getElements(list.size() - from - 1, a, offset, length));
-		}
-
-		@Override
-		public void removeElements(int from, int to) {
-			list.removeElements(list.size() - to - 1, list.size() - from - 1);
-		}
-
-		@Override
-		public KEY_TYPE swapRemove(int index) {
-			return list.swapRemove(list.size() - index - 1);
-		}
-#if TYPE_OBJECT
-		@Override
-		public <K> K[] extractElements(int from, int to, Class<K> type) {
-			return reverse(list.extractElements(list.size() - to - 1, list.size() - from - 1, type));
-		}
-		
-#else
-		@Override
-		public KEY_TYPE[] extractElements(int from, int to) {
-			return reverse(list.extractElements(list.size() - to - 1, list.size() - from - 1));
-		}
-		
-#endif
-		@Override
-		public int size() {
-			return list.size();
-		}
-		
-		@Override
-		public void clear() {
-			list.clear();
-		}
-		
-		@Override
-		public LIST KEY_GENERIC_TYPE reversed() {
-			return list;
-		}
-		
-#if TYPE_OBJECT
-		private <K> K[] reverse(K[] data) {
-			for (int i = 0, mid = data.length >> 1, j = data.length - 1; i < mid; i++, j--) {
-				K t = data[i];
-				data[i] = data[j];
-				data[j] = t;
-			}
-			return data;
-		}
-#else
-		private KEY_TYPE[] reverse(KEY_TYPE[] data) {
-			for (int i = 0, mid = data.length >> 1, j = data.length - 1; i < mid; i++, j--) {
-				KEY_TYPE t = data[i];
-				data[i] = data[j];
-				data[j] = t;
-			}
-			return data;
-		}
-	
-#endif
-	}
-	
-	private class SubList extends ABSTRACT_LIST KEY_GENERIC_TYPE
-	{
-		final ABSTRACT_LIST KEY_GENERIC_TYPE list;
-		final int parentOffset;
-		final int offset;
+	private class SUB_LIST extends ABSTRACT_LIST KEY_GENERIC_TYPE {
+		ABSTRACT_LIST KEY_GENERIC_TYPE l;
+		int offset;
 		int size;
 		
-		public SubList(ABSTRACT_LIST KEY_GENERIC_TYPE list, int offset, int from, int to) {
-			this.list = list;
-			this.parentOffset = from;
-			this.offset = offset + from;
-			this.size = to - from;
+		SUB_LIST(ABSTRACT_LIST KEY_GENERIC_TYPE l, int from, int to) {
+			if (from < 0) throw new IndexOutOfBoundsException("fromIndex = " + from);
+			else if (to > l.size()) throw new IndexOutOfBoundsException("toIndex = " + to);
+			else if (from > to)	throw new IllegalArgumentException("fromIndex(" + from + ") > toIndex(" + to + ")");
+			this.l = l;
+			offset = from;
+			size = to - from;
 		}
 		
 		@Override
-		public void add(int index, KEY_TYPE element) {
-			checkAddSubRange(index);
-			list.add(parentOffset+index, element);
+		public void add(int index, KEY_TYPE e) {
+			checkAddRange(index);
+			l.add(index+offset, e);
 			size++;
 		}
 		
 		@Override
 		public boolean addAll(int index, Collection<? extends CLASS_TYPE> c) {
-			checkAddSubRange(index);
-			int add = c.size();
-			if(add <= 0) return false;
-			list.addAll(parentOffset+index, c);
-			this.size += add;
+			checkAddRange(index);
+			int size = c.size();
+			if(size == 0) return false;
+			l.addAll(index + offset, l);
+			offset += size;
 			return true;
 		}
 		
 		@Override
 		public boolean addAll(int index, COLLECTION KEY_GENERIC_TYPE c) {
-			checkAddSubRange(index);
-			int add = c.size();
-			if(add <= 0) return false;
-			list.addAll(parentOffset+index, c);
-			this.size += add;
+			checkAddRange(index);
+			int size = c.size();
+			if(size == 0) return false;
+			l.addAll(index + offset, l);
+			offset += size;
 			return true;
 		}
-
+		
 		@Override
 		public boolean addAll(int index, LIST KEY_GENERIC_TYPE c) {
-			checkAddSubRange(index);
-			int add = c.size();
-			if(add <= 0) return false;
-			list.addAll(parentOffset+index, c);
-			this.size += add;
+			checkAddRange(index);
+			int size = c.size();
+			if(size == 0) return false;
+			l.addAll(index + offset, l);
+			offset += size;
 			return true;
 		}
 		
 		@Override
 		public void addElements(int from, KEY_TYPE[] a, int offset, int length) {
-			checkAddSubRange(from);
-			if(length <= 0) return;
-			list.addElements(parentOffset+from, a, offset, length);
-			this.size += length;
+			checkRange(from);
+			l.addElements(from + this.offset, a, offset, length);
+			size += length;
 		}
 		
 		@Override
 		public KEY_TYPE[] getElements(int from, KEY_TYPE[] a, int offset, int length) {
-			SanityChecks.checkArrayCapacity(size, from, length);
-			SanityChecks.checkArrayCapacity(a.length, offset, length);
-			return list.getElements(from+parentOffset, a, offset, length);
+			checkRange(from);
+			return l.getElements(from + this.offset, a, offset, length);
 		}
 		
 		@Override
 		public void removeElements(int from, int to) {
-			if(to-from <= 0) return;
-			checkSubRange(from);
-			checkAddSubRange(to);
-			list.removeElements(from+parentOffset, to+parentOffset);
+			checkRange(from);
+			checkRange(to);
+			l.removeElements(from + offset, to + offset);
 			size -= to - from;
 		}
 		
 #if TYPE_OBJECT
 		@Override
-		public <K> K[] extractElements(int from, int to, Class<K> type) {
-			checkSubRange(from);
-			checkAddSubRange(to);
-			K[] result = list.extractElements(from+parentOffset, to+parentOffset, type);
-			size -= result.length;
-			return result;
+		public <K> K[] extractElements(int from, int to, Class<K> clz) {
+			checkRange(from);
+			checkRange(to);
+			K[] a = l.extractElements(from + offset, to + offset, clz);
+			size -= to - from;
+			return a;
 		}
-
+		
 #else
 		@Override
 		public KEY_TYPE[] extractElements(int from, int to) {
-			checkSubRange(from);
-			checkAddSubRange(to);
-			KEY_TYPE[] result = list.extractElements(from+parentOffset, to+parentOffset);
-			size -= result.length;
-			return result;
+			checkRange(from);
+			checkRange(to);
+			KEY_TYPE[] a = l.extractElements(from + offset, to + offset);
+			size -= to - from;
+			return a;
 		}
 		
 #endif
 		@Override
 		public KEY_TYPE GET_KEY(int index) {
-			checkSubRange(index);
-			return list.GET_KEY(parentOffset+index);
-		}
-
-		@Override
-		public KEY_TYPE set(int index, KEY_TYPE element) {
-			checkSubRange(index);
-			return list.set(parentOffset+index, element);
+			checkRange(index);
+			return l.GET_KEY(index + offset);
 		}
 		
 		@Override
-		public KEY_TYPE swapRemove(int index) {
-			checkSubRange(index);
-			if(index == size-1) {
-				KEY_TYPE result = list.REMOVE(parentOffset+size-1);
-				size--;
-				return result;
-			}
-			KEY_TYPE result = list.set(index+parentOffset, list.GET_KEY(parentOffset+size-1));
-			list.REMOVE(parentOffset+size-1);
-			size--;
-			return result;
+		public KEY_TYPE set(int index, KEY_TYPE e) {
+			checkRange(index);
+			return l.set(index + offset, e);
 		}
 		
 		@Override
 		public KEY_TYPE REMOVE(int index) {
-			checkSubRange(index);
-			KEY_TYPE result = list.REMOVE(index+parentOffset);
+			checkRange(index);
 			size--;
-			return result;
+			return l.REMOVE(index + offset);
 		}
 		
 		@Override
@@ -533,263 +346,15 @@ public abstract class ABSTRACT_LIST KEY_GENERIC_TYPE extends ABSTRACT_COLLECTION
 			return size;
 		}
 		
-		@Override
-		public SPLIT_ITERATOR KEY_GENERIC_TYPE spliterator() { return SPLIT_ITERATORS.createSplititerator(this, 16464); }
-		
-		@Override
-		public LIST_ITERATOR KEY_GENERIC_TYPE listIterator(int index) {
-			if(index < 0 || index > size()) throw new IndexOutOfBoundsException();
-			return new SubListIterator(this, index);
-		}
-		
-		@Override
-		public LIST KEY_GENERIC_TYPE subList(int fromIndex, int toIndex) {
-			SanityChecks.checkArrayCapacity(size, fromIndex, toIndex-fromIndex);
-			return new SubList(this, offset, fromIndex, toIndex);
-		}
-		
-		protected void checkSubRange(int index) {
+		private void checkRange(int index) {
 			if (index < 0 || index >= size)
 				throw new IndexOutOfBoundsException("Index: " + index + ", Size: " + size);
 		}
 		
-		protected void checkAddSubRange(int index) {
+		private void checkAddRange(int index) {
 			if (index < 0 || index > size)
 				throw new IndexOutOfBoundsException("Index: " + index + ", Size: " + size);
 		}
-		
-		private class SubListIterator implements LIST_ITERATOR KEY_GENERIC_TYPE
-		{
-			ABSTRACT_LIST KEY_GENERIC_TYPE list;
-			int index;
-			int lastReturned = -1;
-			
-			SubListIterator(ABSTRACT_LIST KEY_GENERIC_TYPE list, int index) {
-				this.list = list;
-				this.index = index;
-			}
-			
-			@Override
-			public boolean hasNext() {
-				return index < list.size();
-			}
-			
-			@Override
-			public KEY_TYPE NEXT() {
-				if(!hasNext()) throw new NoSuchElementException();
-				int i = index++;
-				return list.GET_KEY((lastReturned = i));
-			}
-			
-			@Override
-			public boolean hasPrevious() {
-				return index > 0;
-			}
-			
-			@Override
-			public KEY_TYPE PREVIOUS() {
-				if(!hasPrevious()) throw new NoSuchElementException();
-				index--;
-				return list.GET_KEY((lastReturned = index));
-			}
-			
-			@Override
-			public int nextIndex() {
-				return index;
-			}
-			
-			@Override
-			public int previousIndex() {
-				return index-1;
-			}
-			
-			@Override
-			public void remove() {
-				if(lastReturned == -1) throw new IllegalStateException();
-				list.REMOVE(lastReturned);
-				index = lastReturned;
-				lastReturned = -1;
-			}
-			
-			@Override
-			public void set(KEY_TYPE e) {
-				if(lastReturned == -1) throw new IllegalStateException();
-				list.set(lastReturned, e);
-			}
-			
-			@Override
-			public void add(KEY_TYPE e) {
-				list.add(index, e);
-				index++;
-				lastReturned = -1;
-			}
-			
-			@Override
-			public int skip(int amount) {
-				if(amount < 0) throw new IllegalStateException("Negative Numbers are not allowed");
-				int steps = Math.min(amount, size() - index);
-				index += steps;
-				if(steps > 0) lastReturned = Math.min(index-1, size()-1);
-				return steps;
-			}
-			
-			@Override
-			public int back(int amount) {
-				if(amount < 0) throw new IllegalStateException("Negative Numbers are not allowed");
-				int steps = Math.min(amount, index);
-				index -= steps;
-				if(steps > 0) lastReturned = Math.min(index, size()-1);
-				return steps;
-			}
-		}
-	}
-	
-#if INT_LIST_MODULE
-	private class ListIndexedIterator implements LIST_ITERATOR KEY_GENERIC_TYPE {
-		IntList indecies;
-		int index;
-		int lastReturned = -1;
-		
-		ListIndexedIterator(IntList indecies) {
-			this.indecies = indecies;
-		}
-		
-		@Override
-		public boolean hasNext() {
-			return index < indecies.size();
-		}
-		
-		@Override
-		public KEY_TYPE NEXT() {
-			if(!hasNext()) throw new NoSuchElementException();
-			int i = index++;
-			return GET_KEY((lastReturned = indecies.getInt(i)));
-		}
-		
-		@Override
-		public boolean hasPrevious() {
-			return index > 0;
-		}
-		
-		@Override
-		public KEY_TYPE PREVIOUS() {
-			if(!hasPrevious()) throw new NoSuchElementException();
-			index--;
-			return GET_KEY((lastReturned = indecies.getInt(index)));
-		}
-		
-		@Override
-		public int nextIndex() {
-			return index;
-		}
-		
-		@Override
-		public int previousIndex() {
-			return index-1;
-		}
-		
-		@Override
-		public void remove() { throw new UnsupportedOperationException(); }
-		@Override
-		public void add(KEY_TYPE e) { throw new UnsupportedOperationException(); }
-		
-		@Override
-		public void set(KEY_TYPE e) {
-			if(lastReturned == -1) throw new IllegalStateException();
-			ABSTRACT_LIST.this.set(lastReturned, e);
-		}
-		
-		@Override
-		public int skip(int amount) {
-			if(amount < 0) throw new IllegalStateException("Negative Numbers are not allowed");
-			int steps = Math.min(amount, indecies.size() - index);
-			index += steps;
-			if(steps > 0) lastReturned = Math.min(index-1, indecies.size()-1);
-			return steps;
-		}
-		
-		@Override
-		public int back(int amount) {
-			if(amount < 0) throw new IllegalStateException("Negative Numbers are not allowed");
-			int steps = Math.min(amount, index);
-			index -= steps;
-			if(steps > 0) lastReturned = Math.max(index, 0);
-			return steps;
-		}
-	}
-	
-#endif
-	private class IndexedIterator implements LIST_ITERATOR KEY_GENERIC_TYPE {
-		int[] indecies;
-		int index;
-		int lastReturned = -1;
-		
-		IndexedIterator(int[] indecies) {
-			this.indecies = indecies;
-		}
-		
-		@Override
-		public boolean hasNext() {
-			return index < indecies.length;
-		}
-		
-		@Override
-		public KEY_TYPE NEXT() {
-			if(!hasNext()) throw new NoSuchElementException();
-			int i = index++;
-			return GET_KEY((lastReturned = indecies[i]));
-		}
-		
-		@Override
-		public boolean hasPrevious() {
-			return index > 0;
-		}
-		
-		@Override
-		public KEY_TYPE PREVIOUS() {
-			if(!hasPrevious()) throw new NoSuchElementException();
-			index--;
-			return GET_KEY((lastReturned = indecies[index]));
-		}
-		
-		@Override
-		public int nextIndex() {
-			return index;
-		}
-		
-		@Override
-		public int previousIndex() {
-			return index-1;
-		}
-		
-		@Override
-		public void remove() { throw new UnsupportedOperationException(); }
-		@Override
-		public void add(KEY_TYPE e) { throw new UnsupportedOperationException(); }
-		
-		@Override
-		public void set(KEY_TYPE e) {
-			if(lastReturned == -1) throw new IllegalStateException();
-			ABSTRACT_LIST.this.set(lastReturned, e);
-		}
-		
-		@Override
-		public int skip(int amount) {
-			if(amount < 0) throw new IllegalStateException("Negative Numbers are not allowed");
-			int steps = Math.min(amount, indecies.length - index);
-			index += steps;
-			if(steps > 0) lastReturned = Math.min(index-1, indecies.length-1);
-			return steps;
-		}
-		
-		@Override
-		public int back(int amount) {
-			if(amount < 0) throw new IllegalStateException("Negative Numbers are not allowed");
-			int steps = Math.min(amount, index);
-			index -= steps;
-			if(steps > 0) lastReturned = Math.max(index, 0);
-			return steps;
-		}
 	}
 	
 	private class LIST_ITER implements LIST_ITERATOR KEY_GENERIC_TYPE {
@@ -807,9 +372,8 @@ public abstract class ABSTRACT_LIST KEY_GENERIC_TYPE extends ABSTRACT_COLLECTION
 		
 		@Override
 		public KEY_TYPE NEXT() {
-			if(!hasNext()) throw new NoSuchElementException();
-			int i = index++;
-			return GET_KEY((lastReturned = i));
+			lastReturned = index;
+			return GET_KEY(index++);
 		}
 		
 		@Override
@@ -819,9 +383,8 @@ public abstract class ABSTRACT_LIST KEY_GENERIC_TYPE extends ABSTRACT_COLLECTION
 		
 		@Override
 		public KEY_TYPE PREVIOUS() {
-			if(!hasPrevious()) throw new NoSuchElementException();
-			index--;
-			return GET_KEY((lastReturned = index));
+			lastReturned = index;
+			return GET_KEY(index--);
 		}
 		
 		@Override
@@ -836,31 +399,34 @@ public abstract class ABSTRACT_LIST KEY_GENERIC_TYPE extends ABSTRACT_COLLECTION
 		
 		@Override
 		public void remove() {
-			if(lastReturned == -1) throw new IllegalStateException();
+			if(lastReturned == -1)
+				throw new IllegalStateException();
 			ABSTRACT_LIST.this.REMOVE(lastReturned);
-			index = lastReturned;
+			if(lastReturned < index)
+				index--;
 			lastReturned = -1;
 		}
 		
 		@Override
 		public void set(KEY_TYPE e) {
-			if(lastReturned == -1) throw new IllegalStateException();
+			if(lastReturned == -1)
+				throw new IllegalStateException();
 			ABSTRACT_LIST.this.set(lastReturned, e);
 		}
 		
 		@Override
 		public void add(KEY_TYPE e) {
-			ABSTRACT_LIST.this.add(index, e);
-			index++;
+			if(lastReturned == -1)
+				throw new IllegalStateException();
+			ABSTRACT_LIST.this.add(index++, e);
 			lastReturned = -1;
 		}
 		
 		@Override
 		public int skip(int amount) {
 			if(amount < 0) throw new IllegalStateException("Negative Numbers are not allowed");
-			int steps = Math.min(amount, size() - index);
+			int steps = Math.min(amount, (size() - 1) - index);
 			index += steps;
-			if(steps > 0) lastReturned = Math.min(index-1, size()-1);
 			return steps;
 		}
 		
@@ -869,7 +435,6 @@ public abstract class ABSTRACT_LIST KEY_GENERIC_TYPE extends ABSTRACT_COLLECTION
 			if(amount < 0) throw new IllegalStateException("Negative Numbers are not allowed");
 			int steps = Math.min(amount, index);
 			index -= steps;
-			if(steps > 0) lastReturned = Math.max(index, 0);
 			return steps;
 		}
 	}

src/builder/resources/speiger/assets/collections/templates/lists/ImmutableList.template

@@ -5,21 +5,14 @@ import java.util.Arrays;
 import java.util.Comparator;
 #endif
 import java.util.Collection;
-import java.util.NoSuchElementException;
 import java.util.Objects;
 #if TYPE_OBJECT
-import java.util.function.BiFunction;
 import java.util.function.Consumer;
 #endif
 import java.util.function.Predicate;
 import java.util.function.UnaryOperator;
-#if !TYPE_OBJECT && JDK_FUNCTION
-import java.util.function.PREDICATE;
-#endif
 #if PRIMITIVES
-#if !JDK_FUNCTION
 import java.util.function.JAVA_PREDICATE;
-#endif
 import java.util.function.JAVA_UNARY_OPERATOR;
 #endif
 
@@ -29,21 +22,16 @@ import speiger.src.collections.PACKAGE.functions.COMPARATOR;
 import speiger.src.collections.PACKAGE.functions.CONSUMER;
 import speiger.src.collections.PACKAGE.utils.ARRAYS;
 #endif
-import speiger.src.collections.objects.functions.consumer.BI_FROM_OBJECT_CONSUMER;
-#if !JDK_FUNCTION
+import speiger.src.collections.PACKAGE.functions.consumer.BI_OBJECT_CONSUMER;
 import speiger.src.collections.PACKAGE.functions.function.PREDICATE;
-#endif
-import speiger.src.collections.PACKAGE.functions.function.UNARY_OPERATOR;
 import speiger.src.collections.objects.utils.ObjectArrays;
 import speiger.src.collections.PACKAGE.utils.ITERATORS;
-#if PRIMITIVES && SPLIT_ITERATOR_FEATURE && STREAM_FEATURE
+#if PRIMITIVES
 import java.util.stream.JAVA_STREAM;
 import java.util.stream.StreamSupport;
 #endif
-#if SPLIT_ITERATOR_FEATURE
 import speiger.src.collections.PACKAGE.collections.SPLIT_ITERATOR;
 import speiger.src.collections.PACKAGE.utils.SPLIT_ITERATORS;
-#endif
 import speiger.src.collections.utils.SanityChecks;
 
 #if TYPE_OBJECT
@@ -132,14 +120,11 @@ public class IMMUTABLE_LIST KEY_GENERIC_TYPE extends ABSTRACT_LIST KEY_GENERIC_T
 	@Override
 	public boolean addAll(int index, LIST KEY_GENERIC_TYPE c) { throw new UnsupportedOperationException(); }
 	@Override
-	public boolean addAll(KEY_TYPE[] e, int offset, int length) { throw new UnsupportedOperationException(); }
-	@Override
 	public void addElements(int from, KEY_TYPE[] a, int offset, int length) { throw new UnsupportedOperationException(); }
 	
 	@Override
 	public KEY_TYPE[] getElements(int from, KEY_TYPE[] a, int offset, int length) {
-		SanityChecks.checkArrayCapacity(a.length, offset, length);
-		SanityChecks.checkArrayCapacity(data.length, from, length);
+		SanityChecks.checkArrayCapacity(data.length, offset, length);
 		System.arraycopy(data, from, a, offset, length);
 		return a;
 	}
@@ -274,11 +259,6 @@ public class IMMUTABLE_LIST KEY_GENERIC_TYPE extends ABSTRACT_LIST KEY_GENERIC_T
 		return data[index];
 	}
 	
-	@Override
-	public IMMUTABLE_LIST KEY_GENERIC_TYPE copy() {
-		return new IMMUTABLE_LISTBRACES(Arrays.copyOf(data, data.length));
-	}
-	
 	/**
 	 * A Type Specific foreach function that reduces (un)boxing
 	 * 
@@ -301,17 +281,17 @@ public class IMMUTABLE_LIST KEY_GENERIC_TYPE extends ABSTRACT_LIST KEY_GENERIC_T
 	}
 	
 	@Override
-	public <E> void forEach(E input, BI_FROM_OBJECT_CONSUMER KSK_GENERIC_TYPE<E> action) {
+	public <E> void forEach(E input, BI_OBJECT_CONSUMER KKS_GENERIC_TYPE<E> action) {
 		Objects.requireNonNull(action);
 		for(int i = 0,m=data.length;i<m;i++)
-			action.accept(input, data[i]);		
+			action.accept(data[i], input);		
 	}
 	
 	@Override
 	public boolean matchesAny(PREDICATE KEY_GENERIC_TYPE filter) {
 		Objects.requireNonNull(filter);
 		for(int i = 0,m=data.length;i<m;i++) {
-			if(filter.test(data[i])) return true;
+			if(filter.TEST_VALUE(data[i])) return true;
 		}
 		return false;
 	}
@@ -320,7 +300,7 @@ public class IMMUTABLE_LIST KEY_GENERIC_TYPE extends ABSTRACT_LIST KEY_GENERIC_T
 	public boolean matchesNone(PREDICATE KEY_GENERIC_TYPE filter) {
 		Objects.requireNonNull(filter);
 		for(int i = 0,m=data.length;i<m;i++) {
-			if(filter.test(data[i])) return false;
+			if(filter.TEST_VALUE(data[i])) return false;
 		}
 		return true;
 	}
@@ -329,7 +309,7 @@ public class IMMUTABLE_LIST KEY_GENERIC_TYPE extends ABSTRACT_LIST KEY_GENERIC_T
 	public boolean matchesAll(PREDICATE KEY_GENERIC_TYPE filter) {
 		Objects.requireNonNull(filter);
 		for(int i = 0,m=data.length;i<m;i++) {
-			if(!filter.test(data[i])) return false;
+			if(!filter.TEST_VALUE(data[i])) return false;
 		}
 		return true;
 	}
@@ -338,66 +318,11 @@ public class IMMUTABLE_LIST KEY_GENERIC_TYPE extends ABSTRACT_LIST KEY_GENERIC_T
 	public KEY_TYPE findFirst(PREDICATE KEY_GENERIC_TYPE filter) {
 		Objects.requireNonNull(filter);
 		for(int i = 0,m=data.length;i<m;i++) {
-			if(filter.test(data[i])) return data[i];
+			if(filter.TEST_VALUE(data[i])) return data[i];
 		}
 		return EMPTY_VALUE;
 	}
 	
-#if !TYPE_OBJECT
-	@Override
-	public KEY_TYPE reduce(KEY_TYPE identity, UNARY_OPERATOR KEY_KEY_GENERIC_TYPE operator) {
-		Objects.requireNonNull(operator);
-		KEY_TYPE state = identity;
-		for(int i = 0,m=data.length;i<m;i++) {
-			state = operator.APPLY_VALUE(state, data[i]);
-		}
-		return state;
-	}
-	
-#else
-	@Override
-	public <KEY_SPECIAL_TYPE> KEY_SPECIAL_TYPE reduce(KEY_SPECIAL_TYPE identity, BiFunction<KEY_SPECIAL_TYPE, KEY_TYPE, KEY_SPECIAL_TYPE> operator) {
-		Objects.requireNonNull(operator);
-		KEY_SPECIAL_TYPE state = identity;
-		for(int i = 0,m=data.length;i<m;i++) {
-			state = operator.APPLY_VALUE(state, data[i]);
-		}
-		return state;
-	}
-
-#endif
-	@Override
-	public KEY_TYPE reduce(UNARY_OPERATOR KEY_KEY_GENERIC_TYPE operator) {
-		Objects.requireNonNull(operator);
-		KEY_TYPE state = EMPTY_VALUE;
-		boolean empty = true;
-		for(int i = 0,m=data.length;i<m;i++) {
-			if(empty) {
-				empty = false;
-				state = data[i];
-				continue;
-			}
-			state = operator.APPLY_VALUE(state, data[i]);
-		}
-		return state;
-	}
-	
-	@Override
-	public int count(PREDICATE KEY_GENERIC_TYPE filter) {
-		Objects.requireNonNull(filter);
-		int result = 0;
-		for(int i = 0,m=data.length;i<m;i++) {
-			if(filter.test(data[i])) result++;
-		}
-		return result;
-	}
-	
-	@Override
-	public LIST_ITERATOR KEY_GENERIC_TYPE listIterator(int index) {
-		if(index < 0 || index > size()) throw new IndexOutOfBoundsException();
-		return new LIST_ITER(index);
-	}
-	
 	@Override
 	public KEY_TYPE set(int index, KEY_TYPE e) { throw new UnsupportedOperationException(); }
 	@Override
@@ -409,8 +334,7 @@ public class IMMUTABLE_LIST KEY_GENERIC_TYPE extends ABSTRACT_LIST KEY_GENERIC_T
 #endif
 	@Override
 	public KEY_TYPE REMOVE(int index) { throw new UnsupportedOperationException(); }
-	@Override
-	public KEY_TYPE swapRemove(int index) { throw new UnsupportedOperationException(); }
+
 #if !TYPE_OBJECT
 	@Override
 	public boolean REMOVE_KEY(KEY_TYPE type) { throw new UnsupportedOperationException(); }
@@ -429,10 +353,6 @@ public class IMMUTABLE_LIST KEY_GENERIC_TYPE extends ABSTRACT_LIST KEY_GENERIC_T
 	public boolean removeAll(COLLECTION KEY_GENERIC_TYPE c) { throw new UnsupportedOperationException(); }
 	@Override
 	public boolean retainAll(COLLECTION KEY_GENERIC_TYPE c) { throw new UnsupportedOperationException(); }
-	@Override
-	public boolean removeAll(COLLECTION KEY_GENERIC_TYPE c, CONSUMER KEY_GENERIC_TYPE r) { throw new UnsupportedOperationException(); }
-	@Override
-	public boolean retainAll(COLLECTION KEY_GENERIC_TYPE c, CONSUMER KEY_GENERIC_TYPE r) { throw new UnsupportedOperationException(); }
 	
 #if PRIMITIVES
 	@Override
@@ -446,7 +366,6 @@ public class IMMUTABLE_LIST KEY_GENERIC_TYPE extends ABSTRACT_LIST KEY_GENERIC_T
 	@Override
 	@Primitive
 	public Object[] toArray() {
-		if(data.length == 0) return ObjectArrays.EMPTY_ARRAY;
 		Object[] obj = new Object[data.length];
 		for(int i = 0,m=data.length;i<m;i++)
 			obj[i] = KEY_TO_OBJ(data[i]);
@@ -465,7 +384,6 @@ public class IMMUTABLE_LIST KEY_GENERIC_TYPE extends ABSTRACT_LIST KEY_GENERIC_T
 		else if(a.length < data.length) a = (E[])ObjectArrays.newArray(a.getClass().getComponentType(), data.length);
 		for(int i = 0,m=data.length;i<m;i++)
 			a[i] = (E)KEY_TO_OBJ(data[i]);
-		if (a.length > data.length) a[data.length] = null;
 		return a;
 	}
 	
@@ -474,7 +392,6 @@ public class IMMUTABLE_LIST KEY_GENERIC_TYPE extends ABSTRACT_LIST KEY_GENERIC_T
 	public KEY_TYPE[] TO_ARRAY(KEY_TYPE[] a) {
 		if(a.length < data.length) a = new KEY_TYPE[data.length];
 		System.arraycopy(data, 0, a, 0, data.length);
-		if (a.length > data.length) a[data.length] = EMPTY_KEY_VALUE;
 		return a;
 	}
 	
@@ -498,8 +415,7 @@ public class IMMUTABLE_LIST KEY_GENERIC_TYPE extends ABSTRACT_LIST KEY_GENERIC_T
 			throw new IndexOutOfBoundsException("Index: " + index + ", Size: " + data.length);
 	}
 	
-#if SPLIT_ITERATOR_FEATURE
-#if PRIMITIVES && STREAM_FEATURE
+#if PRIMITIVES
 	/**
 	 * Returns a Java-Type-Specific Stream to reduce boxing/unboxing.
 	 * @return a Stream of the closest java type
@@ -516,70 +432,4 @@ public class IMMUTABLE_LIST KEY_GENERIC_TYPE extends ABSTRACT_LIST KEY_GENERIC_T
 	 */
 	@Override
 	public SPLIT_ITERATOR KEY_GENERIC_TYPE spliterator() { return SPLIT_ITERATORS.createArraySplititerator(data, data.length, 16464); }
-	
-#endif
-	private class LIST_ITER implements LIST_ITERATOR KEY_GENERIC_TYPE {
-		int index;
-		
-		LIST_ITER(int index) {
-			this.index = index;
-		}
-		
-		@Override
-		public boolean hasNext() {
-			return index < size();
-		}
-		
-		@Override
-		public KEY_TYPE NEXT() {
-			if(!hasNext()) throw new NoSuchElementException();
-			return GET_KEY(index++);
-		}
-		
-		@Override
-		public boolean hasPrevious() {
-			return index > 0;
-		}
-		
-		@Override
-		public KEY_TYPE PREVIOUS() {
-			if(!hasPrevious()) throw new NoSuchElementException();
-			return GET_KEY(--index);
-		}
-		
-		@Override
-		public int nextIndex() {
-			return index;
-		}
-		
-		@Override
-		public int previousIndex() {
-			return index-1;
-		}
-		
-		@Override
-		public void remove() { throw new UnsupportedOperationException(); }
-		
-		@Override
-		public void set(KEY_TYPE e) { throw new UnsupportedOperationException(); }
-		
-		@Override
-		public void add(KEY_TYPE e) { throw new UnsupportedOperationException(); }
-		
-		@Override
-		public int skip(int amount) {
-			if(amount < 0) throw new IllegalStateException("Negative Numbers are not allowed");
-			int steps = Math.min(amount, size() - index);
-			index += steps;
-			return steps;
-		}
-		
-		@Override
-		public int back(int amount) {
-			if(amount < 0) throw new IllegalStateException("Negative Numbers are not allowed");
-			int steps = Math.min(amount, index);
-			index -= steps;
-			return steps;
-		}
-	}
 }

src/builder/resources/speiger/assets/collections/templates/maps/abstracts/AbstractMap.template

@@ -3,30 +3,21 @@ package speiger.src.collections.PACKAGE.maps.abstracts;
 import java.util.AbstractMap;
 import java.util.Map;
 import java.util.Objects;
-#if VALUE_BOOLEAN && JDK_FUNCTION
-import java.util.function.PREDICATE;
-#endif
 
 import speiger.src.collections.PACKAGE.collections.ITERATOR;
 import speiger.src.collections.PACKAGE.functions.consumer.BI_CONSUMER;
-#if !VALUE_BOOLEAN || !JDK_FUNCTION
 import speiger.src.collections.PACKAGE.functions.function.FUNCTION;
-#endif
 import speiger.src.collections.PACKAGE.functions.function.UNARY_OPERATOR;
 import speiger.src.collections.PACKAGE.maps.interfaces.MAP;
 import speiger.src.collections.PACKAGE.sets.ABSTRACT_SET;
 import speiger.src.collections.PACKAGE.sets.SET;
-#if MAPS_FEATURE
 import speiger.src.collections.PACKAGE.utils.maps.MAPS;
-#endif
 import speiger.src.collections.VALUE_PACKAGE.collections.VALUE_ABSTRACT_COLLECTION;
 import speiger.src.collections.VALUE_PACKAGE.collections.VALUE_COLLECTION;
 #if !SAME_TYPE
 import speiger.src.collections.VALUE_PACKAGE.collections.VALUE_ITERATOR;
 import speiger.src.collections.VALUE_PACKAGE.functions.function.VALUE_UNARY_OPERATOR;
 #endif
-import speiger.src.collections.VALUE_PACKAGE.functions.VALUE_SUPPLIER;
-import speiger.src.collections.objects.collections.ObjectIterable;
 #if !TYPE_OBJECT && !VALUE_OBJECT
 import speiger.src.collections.objects.collections.ObjectIterator;
 #endif
@@ -55,27 +46,6 @@ public abstract class ABSTRACT_MAP KEY_VALUE_GENERIC_TYPE extends AbstractMap<CL
 		return this;
 	}
 	
-	protected ObjectIterable<MAP.Entry KEY_VALUE_GENERIC_TYPE> getFastIterable(MAP KEY_VALUE_GENERIC_TYPE map) {
-#if MAPS_FEATURE
-		return MAPS.fastIterable(map);
-#else
-		return map.ENTRY_SET();
-#endif
-	}
-	
-	protected ObjectIterator<MAP.Entry KEY_VALUE_GENERIC_TYPE> getFastIterator(MAP KEY_VALUE_GENERIC_TYPE map) {
-#if MAPS_FEATURE
-		return MAPS.fastIterator(map);
-#else
-		return map.ENTRY_SET().iterator();
-#endif
-	}
-	
-	@Override
-	public MAP KEY_VALUE_GENERIC_TYPE copy() { 
-		throw new UnsupportedOperationException();
-	}
-	
 #if !TYPE_OBJECT || !VALUE_OBJECT
 	@Override
 	@Deprecated
@@ -87,14 +57,14 @@ public abstract class ABSTRACT_MAP KEY_VALUE_GENERIC_TYPE extends AbstractMap<CL
 #if VALUE_PRIMITIVES
 	@Override
 	public void addToAll(MAP KEY_VALUE_GENERIC_TYPE m) {
-		for(MAP.Entry KEY_VALUE_GENERIC_TYPE entry : getFastIterable(m))
+		for(MAP.Entry KEY_VALUE_GENERIC_TYPE entry : MAPS.fastIterable(m))
 			addTo(entry.ENTRY_KEY(), entry.ENTRY_VALUE());
 	}
 	
 #endif
 	@Override
 	public void putAll(MAP KEY_VALUE_GENERIC_TYPE m) {
-		for(ObjectIterator<MAP.Entry KEY_VALUE_GENERIC_TYPE> iter = getFastIterator(m);iter.hasNext();) {
+		for(ObjectIterator<MAP.Entry KEY_VALUE_GENERIC_TYPE> iter = MAPS.fastIterator(m);iter.hasNext();) {
 			MAP.Entry KEY_VALUE_GENERIC_TYPE entry = iter.next();
 			put(entry.ENTRY_KEY(), entry.ENTRY_VALUE());
 		}
@@ -114,18 +84,9 @@ public abstract class ABSTRACT_MAP KEY_VALUE_GENERIC_TYPE extends AbstractMap<CL
 		for(int i = 0;i<size;i++) put(keys[i], values[i]);
 	}
 	
-#if !TYPE_OBJECT || !VALUE_OBJECT
-	@Override
-	public void putAll(CLASS_TYPE[] keys, CLASS_VALUE_TYPE[] values, int offset, int size) {
-		SanityChecks.checkArrayCapacity(keys.length, offset, size);
-		SanityChecks.checkArrayCapacity(values.length, offset, size);
-		for(int i = 0;i<size;i++) put(keys[i], values[i]);		
-	}
-	
-#endif
 	@Override
 	public void putAllIfAbsent(MAP KEY_VALUE_GENERIC_TYPE m) {
-		for(MAP.Entry KEY_VALUE_GENERIC_TYPE entry : getFastIterable(m))
+		for(MAP.Entry KEY_VALUE_GENERIC_TYPE entry : MAPS.fastIterable(m))
 			putIfAbsent(entry.ENTRY_KEY(), entry.ENTRY_VALUE());
 	}
 	
@@ -185,14 +146,14 @@ public abstract class ABSTRACT_MAP KEY_VALUE_GENERIC_TYPE extends AbstractMap<CL
 	
 	@Override
 	public void REPLACE_VALUES(MAP KEY_VALUE_GENERIC_TYPE m) {
-		for(MAP.Entry KEY_VALUE_GENERIC_TYPE entry : getFastIterable(m))
+		for(MAP.Entry KEY_VALUE_GENERIC_TYPE entry : MAPS.fastIterable(m))
 			replace(entry.ENTRY_KEY(), entry.ENTRY_VALUE());
 	}
 	
 	@Override
 	public void REPLACE_VALUES(UNARY_OPERATOR KEY_VALUE_GENERIC_TYPE mappingFunction) {
 		Objects.requireNonNull(mappingFunction);
-		for(ObjectIterator<MAP.Entry KEY_VALUE_GENERIC_TYPE> iter = getFastIterator(this);iter.hasNext();) {
+		for(ObjectIterator<MAP.Entry KEY_VALUE_GENERIC_TYPE> iter = MAPS.fastIterator(this);iter.hasNext();) {
 			MAP.Entry KEY_VALUE_GENERIC_TYPE entry = iter.next();
 			entry.setValue(mappingFunction.APPLY_VALUE(entry.ENTRY_KEY(), entry.ENTRY_VALUE()));
 		}
@@ -201,9 +162,6 @@ public abstract class ABSTRACT_MAP KEY_VALUE_GENERIC_TYPE extends AbstractMap<CL
 	@Override
 	public VALUE_TYPE COMPUTE(KEY_TYPE key, UNARY_OPERATOR KEY_VALUE_GENERIC_TYPE mappingFunction) {
 		Objects.requireNonNull(mappingFunction);
-#if !VALUE_OBJECT
-		VALUE_TYPE newValue = mappingFunction.APPLY_VALUE(key, GET_VALUE(key));
-#else
 		VALUE_TYPE value = GET_VALUE(key);
 		VALUE_TYPE newValue = mappingFunction.APPLY_VALUE(key, value);
 		if(VALUE_EQUALS(newValue, getDefaultReturnValue())) {
@@ -213,7 +171,6 @@ public abstract class ABSTRACT_MAP KEY_VALUE_GENERIC_TYPE extends AbstractMap<CL
 			}
 			return getDefaultReturnValue();
 		}
-#endif
 		put(key, newValue);
 		return newValue;
 	}
@@ -221,120 +178,20 @@ public abstract class ABSTRACT_MAP KEY_VALUE_GENERIC_TYPE extends AbstractMap<CL
 	@Override
 	public VALUE_TYPE COMPUTE_IF_ABSENT(KEY_TYPE key, FUNCTION KEY_VALUE_GENERIC_TYPE mappingFunction) {
 		Objects.requireNonNull(mappingFunction);
-#if VALUE_OBJECT
 		VALUE_TYPE value;
 		if((value = GET_VALUE(key)) == getDefaultReturnValue() || !containsKey(key)) {
-			VALUE_TYPE newValue = mappingFunction.APPLY(key);
+			VALUE_TYPE newValue = mappingFunction.GET_VALUE(key);
 			if(VALUE_EQUALS_NOT(newValue, getDefaultReturnValue())) {
 				put(key, newValue);
 				return newValue;
 			}
 		}
 		return value;
-#else
-		if(!containsKey(key)) {
-			VALUE_TYPE newValue = mappingFunction.APPLY(key);
-			put(key, newValue);
-			return newValue;
-		}
-		return get(key);
-#endif
-	}
-	
-	@Override
-	public VALUE_TYPE SUPPLY_IF_ABSENT(KEY_TYPE key, VALUE_SUPPLIER VALUE_GENERIC_TYPE valueProvider) {
-		Objects.requireNonNull(valueProvider);
-#if VALUE_OBJECT
-		VALUE_TYPE value;
-		if((value = GET_VALUE(key)) == getDefaultReturnValue() || !containsKey(key)) {
-			VALUE_TYPE newValue = valueProvider.VALUE_SUPPLY_GET();
-			if(VALUE_EQUALS_NOT(newValue, getDefaultReturnValue())) {
-				put(key, newValue);
-				return newValue;
-			}
-		}
-		return value;
-#else
-		if(!containsKey(key)) {
-			VALUE_TYPE newValue = valueProvider.VALUE_SUPPLY_GET();
-			put(key, newValue);
-			return newValue;
-		}
-		return get(key);
-#endif
 	}
 	
 	@Override
 	public VALUE_TYPE COMPUTE_IF_PRESENT(KEY_TYPE key, UNARY_OPERATOR KEY_VALUE_GENERIC_TYPE mappingFunction) {
 		Objects.requireNonNull(mappingFunction);
-#if VALUE_OBJECT
-		VALUE_TYPE value;
-		if(VALUE_EQUALS_NOT((value = GET_VALUE(key)), getDefaultReturnValue()) || containsKey(key)) {
-			VALUE_TYPE newValue = mappingFunction.APPLY_VALUE(key, value);
-			if(VALUE_EQUALS_NOT(newValue, getDefaultReturnValue())) {
-				put(key, newValue);
-				return newValue;
-			}
-			remove(key);
-		}
-#else
-		if(containsKey(key)) {
-			VALUE_TYPE newValue = mappingFunction.APPLY_VALUE(key, GET_VALUE(key));
-			put(key, newValue);
-			return newValue;
-		}
-#endif
-		return getDefaultReturnValue();
-	}
-	
-#if !VALUE_OBJECT
-	@Override
-	public VALUE_TYPE COMPUTENonDefault(KEY_TYPE key, UNARY_OPERATOR KEY_VALUE_GENERIC_TYPE mappingFunction) {
-		Objects.requireNonNull(mappingFunction);
-		VALUE_TYPE value = GET_VALUE(key);
-		VALUE_TYPE newValue = mappingFunction.APPLY_VALUE(key, value);
-		if(VALUE_EQUALS(newValue, getDefaultReturnValue())) {
-			if(VALUE_EQUALS_NOT(value, getDefaultReturnValue()) || containsKey(key)) {
-				remove(key);
-				return getDefaultReturnValue();
-			}
-			return getDefaultReturnValue();
-		}
-		put(key, newValue);
-		return newValue;
-	}
-	
-	@Override
-	public VALUE_TYPE COMPUTE_IF_ABSENTNonDefault(KEY_TYPE key, FUNCTION KEY_VALUE_GENERIC_TYPE mappingFunction) {
-		Objects.requireNonNull(mappingFunction);
-		VALUE_TYPE value;
-		if((value = GET_VALUE(key)) == getDefaultReturnValue() || !containsKey(key)) {
-			VALUE_TYPE newValue = mappingFunction.APPLY(key);
-			if(VALUE_EQUALS_NOT(newValue, getDefaultReturnValue())) {
-				put(key, newValue);
-				return newValue;
-			}
-		}
-		return value;
-	}
-	
-	@Override
-	public VALUE_TYPE SUPPLY_IF_ABSENTNonDefault(KEY_TYPE key, VALUE_SUPPLIER VALUE_GENERIC_TYPE valueProvider) {
-		Objects.requireNonNull(valueProvider);
-		VALUE_TYPE value;
-		if((value = GET_VALUE(key)) == getDefaultReturnValue() || !containsKey(key)) {
-			VALUE_TYPE newValue = valueProvider.VALUE_SUPPLY_GET();
-			if(VALUE_EQUALS_NOT(newValue, getDefaultReturnValue())) {
-				put(key, newValue);
-				return newValue;
-			}
-		}
-		return value;
-	}
-	
-	@Override
-	public VALUE_TYPE COMPUTE_IF_PRESENTNonDefault(KEY_TYPE key, UNARY_OPERATOR KEY_VALUE_GENERIC_TYPE mappingFunction) {
-		Objects.requireNonNull(mappingFunction);
 		VALUE_TYPE value;
 		if(VALUE_EQUALS_NOT((value = GET_VALUE(key)), getDefaultReturnValue()) || containsKey(key)) {
 			VALUE_TYPE newValue = mappingFunction.APPLY_VALUE(key, value);
@@ -346,8 +203,7 @@ public abstract class ABSTRACT_MAP KEY_VALUE_GENERIC_TYPE extends AbstractMap<CL
 		}
 		return getDefaultReturnValue();
 	}
-	
-#endif
+
 	@Override
 	public VALUE_TYPE MERGE(KEY_TYPE key, VALUE_TYPE value, VALUE_UNARY_OPERATOR VALUE_VALUE_GENERIC_TYPE mappingFunction) {
 		Objects.requireNonNull(mappingFunction);
@@ -361,7 +217,7 @@ public abstract class ABSTRACT_MAP KEY_VALUE_GENERIC_TYPE extends AbstractMap<CL
 	@Override
 	public void BULK_MERGE(MAP KEY_VALUE_GENERIC_TYPE m, VALUE_UNARY_OPERATOR VALUE_VALUE_GENERIC_TYPE mappingFunction) {
 		Objects.requireNonNull(mappingFunction);
-		for(MAP.Entry KEY_VALUE_GENERIC_TYPE entry : getFastIterable(m)) {
+		for(MAP.Entry KEY_VALUE_GENERIC_TYPE entry : MAPS.fastIterable(m)) {
 			KEY_TYPE key = entry.ENTRY_KEY();
 			VALUE_TYPE oldValue = GET_VALUE(key);
 			VALUE_TYPE newValue = VALUE_EQUALS(oldValue, getDefaultReturnValue()) ? entry.ENTRY_VALUE() : mappingFunction.APPLY_VALUE(oldValue, entry.ENTRY_VALUE());
@@ -400,20 +256,10 @@ public abstract class ABSTRACT_MAP KEY_VALUE_GENERIC_TYPE extends AbstractMap<CL
 	}
 	
 #endif
-	
-	@Override
-	public CLASS_VALUE_TYPE remove(Object key) {
-#if TYPE_OBJECT
-		return VALUE_TO_OBJ(REMOVE_VALUE((CLASS_TYPE)key));
-#else
-		return key instanceof CLASS_TYPE ? VALUE_TO_OBJ(REMOVE_VALUE(CLASS_TO_KEY(key))) : VALUE_TO_OBJ(getDefaultReturnValue());
-#endif
-	}
-	
 	@Override
 	public void forEach(BI_CONSUMER KEY_VALUE_GENERIC_TYPE action) {
 		Objects.requireNonNull(action);
-		for(ObjectIterator<MAP.Entry KEY_VALUE_GENERIC_TYPE> iter = getFastIterator(this);iter.hasNext();) {
+		for(ObjectIterator<MAP.Entry KEY_VALUE_GENERIC_TYPE> iter = MAPS.fastIterator(this);iter.hasNext();) {
 			MAP.Entry KEY_VALUE_GENERIC_TYPE entry = iter.next();
 			action.accept(entry.ENTRY_KEY(), entry.ENTRY_VALUE());
 		}
@@ -431,11 +277,7 @@ public abstract class ABSTRACT_MAP KEY_VALUE_GENERIC_TYPE extends AbstractMap<CL
 #else
 			@Override
 			public boolean remove(Object o) {
-				if(ABSTRACT_MAP.this.containsKey(o)) {
-					ABSTRACT_MAP.this.remove(o);
-					return true;
-				}
-				return false;
+				return VALUE_EQUALS_NOT(ABSTRACT_MAP.this.remove(o), getDefaultReturnValue());
 			}
 			
 #endif
@@ -447,7 +289,7 @@ public abstract class ABSTRACT_MAP KEY_VALUE_GENERIC_TYPE extends AbstractMap<CL
 			@Override
 			public ITERATOR KEY_GENERIC_TYPE iterator() {
 				return new ITERATOR KEY_GENERIC_TYPE() {
-					ObjectIterator<MAP.Entry KEY_VALUE_GENERIC_TYPE> iter = getFastIterator(ABSTRACT_MAP.this);
+					ObjectIterator<MAP.Entry KEY_VALUE_GENERIC_TYPE> iter = MAPS.fastIterator(ABSTRACT_MAP.this);
 					@Override
 					public boolean hasNext() {
 						return iter.hasNext();
@@ -498,7 +340,7 @@ public abstract class ABSTRACT_MAP KEY_VALUE_GENERIC_TYPE extends AbstractMap<CL
 			@Override
 			public VALUE_ITERATOR VALUE_GENERIC_TYPE iterator() {
 				return new VALUE_ITERATOR VALUE_GENERIC_TYPE() {
-					ObjectIterator<MAP.Entry KEY_VALUE_GENERIC_TYPE> iter = getFastIterator(ABSTRACT_MAP.this);
+					ObjectIterator<MAP.Entry KEY_VALUE_GENERIC_TYPE> iter = MAPS.fastIterator(ABSTRACT_MAP.this);
 					@Override
 					public boolean hasNext() {
 						return iter.hasNext();
@@ -538,7 +380,7 @@ public abstract class ABSTRACT_MAP KEY_VALUE_GENERIC_TYPE extends AbstractMap<CL
 	@Override
 	public int hashCode() {
 		int hash = 0;
-		ObjectIterator<MAP.Entry KEY_VALUE_GENERIC_TYPE> iter = getFastIterator(this);
+		ObjectIterator<MAP.Entry KEY_VALUE_GENERIC_TYPE> iter = MAPS.fastIterator(this);
 		while(iter.hasNext()) hash += iter.next().hashCode();
 		return hash;
 	}
@@ -633,7 +475,7 @@ public abstract class ABSTRACT_MAP KEY_VALUE_GENERIC_TYPE extends AbstractMap<CL
 		
 		@Override
 		public String toString() {
-			return KEY_TO_STRING(key) + "=" + VALUE_TO_STRING(value);
+			return KEY_TO_STRING(key) + "->" + VALUE_TO_STRING(value);
 		}
 	}
 }

src/builder/resources/speiger/assets/collections/templates/maps/interfaces/ConcurrentMap.template

@@ -1,95 +0,0 @@
-package speiger.src.collections.PACKAGE.maps.interfaces;
-
-import java.util.concurrent.ConcurrentMap;
-import java.util.function.BiConsumer;
-import java.util.function.BiFunction;
-import java.util.function.Function;
-
-/**
- * A type specific ConcurrentMap interface that reduces boxing/unboxing.
- * Since the interface adds nothing new. It is there just for completion sake.
- * @Type(T)
- * @ValueType(V)
- */
-public interface CONCURRENT_MAP KEY_VALUE_GENERIC_TYPE extends ConcurrentMap<CLASS_TYPE, CLASS_VALUE_TYPE>, MAP KEY_VALUE_GENERIC_TYPE
-{
-	@Override
-	@Primitive
-	public default CLASS_VALUE_TYPE compute(CLASS_TYPE key, BiFunction<? super CLASS_TYPE, ? super CLASS_VALUE_TYPE, ? extends CLASS_VALUE_TYPE> mappingFunction) {
-		return MAP.super.compute(key, mappingFunction);
-	}
-
-	@Override
-	@Primitive
-	public default CLASS_VALUE_TYPE computeIfAbsent(CLASS_TYPE key, Function<? super CLASS_TYPE, ? extends CLASS_VALUE_TYPE> mappingFunction) {
-		return MAP.super.computeIfAbsent(key, mappingFunction);
-	}
-
-	@Override
-	@Primitive
-	public default CLASS_VALUE_TYPE computeIfPresent(CLASS_TYPE key, BiFunction<? super CLASS_TYPE, ? super CLASS_VALUE_TYPE, ? extends CLASS_VALUE_TYPE> mappingFunction) {
-		return MAP.super.computeIfPresent(key, mappingFunction);
-	}
-
-	@Override
-	@Primitive
-	public default void forEach(BiConsumer<? super CLASS_TYPE, ? super CLASS_VALUE_TYPE> action) {
-		MAP.super.forEach(action);
-	}
-
-	@Override
-	@Primitive
-	public default CLASS_VALUE_TYPE merge(CLASS_TYPE key, CLASS_VALUE_TYPE value, BiFunction<? super CLASS_VALUE_TYPE, ? super CLASS_VALUE_TYPE, ? extends CLASS_VALUE_TYPE> mappingFunction) {
-		return MAP.super.merge(key, value, mappingFunction);
-	}
-	
-#if TYPE_OBJECT && VALUE_OBJECT
-	@Override
-	public CLASS_VALUE_TYPE getOrDefault(Object key, CLASS_VALUE_TYPE defaultValue);
-	@Override
-	public CLASS_VALUE_TYPE putIfAbsent(CLASS_TYPE key, CLASS_VALUE_TYPE value);
-	@Override
-	public boolean remove(Object key, Object value);
-	@Override
-	public boolean replace(CLASS_TYPE key, CLASS_VALUE_TYPE oldValue, CLASS_VALUE_TYPE newValue);
-	@Override
-	public CLASS_VALUE_TYPE replace(CLASS_TYPE key, CLASS_VALUE_TYPE value);
-	
-#else
-	@Primitive
-	@Override
-	public default CLASS_VALUE_TYPE getOrDefault(Object key, CLASS_VALUE_TYPE defaultValue) {
-		return MAP.super.getOrDefault(key, defaultValue);
-	}
-	
-	@Override
-	@Primitive
-	public default CLASS_VALUE_TYPE putIfAbsent(CLASS_TYPE key, CLASS_VALUE_TYPE value) {
-		return MAP.super.putIfAbsent(key, value);
-	}
-	
-	@Override
-	@Deprecated
-	public default boolean remove(Object key, Object value) {
-		return MAP.super.remove(key, value);
-	}
-	
-	@Override
-	@Deprecated
-	public default boolean replace(CLASS_TYPE key, CLASS_VALUE_TYPE oldValue, CLASS_VALUE_TYPE newValue) {
-		return MAP.super.replace(key, oldValue, newValue);
-	}
-	
-	@Override
-	@Deprecated
-	public default CLASS_VALUE_TYPE replace(CLASS_TYPE key, CLASS_VALUE_TYPE value) {
-		return MAP.super.replace(key, value);
-	}
-	
-#endif
-	@Override
-	@Deprecated
-	public default void replaceAll(BiFunction<? super CLASS_TYPE, ? super CLASS_VALUE_TYPE, ? extends CLASS_VALUE_TYPE> mappingFunction) {
-		MAP.super.replaceAll(mappingFunction);
-	}
-}

src/builder/resources/speiger/assets/collections/templates/maps/interfaces/NavigableMap.template

@@ -2,9 +2,6 @@ package speiger.src.collections.PACKAGE.maps.interfaces;
 
 import java.util.NavigableMap;
 import speiger.src.collections.PACKAGE.sets.NAVIGABLE_SET;
-#if MAPS_FEATURE
-import speiger.src.collections.PACKAGE.utils.maps.MAPS;
-#endif
 
 /**
  * A Type Specific Navigable Map interface with a couple helper methods
@@ -13,8 +10,6 @@ import speiger.src.collections.PACKAGE.utils.maps.MAPS;
  */
 public interface NAVIGABLE_MAP KEY_VALUE_GENERIC_TYPE extends SORTED_MAP KEY_VALUE_GENERIC_TYPE, NavigableMap<CLASS_TYPE, CLASS_VALUE_TYPE>
 {
-	@Override
-	public NAVIGABLE_MAP KEY_VALUE_GENERIC_TYPE copy();
 	/** @return a Type Specific desendingMap */
 	@Override
 	public NAVIGABLE_MAP KEY_VALUE_GENERIC_TYPE descendingMap();
@@ -36,34 +31,7 @@ public interface NAVIGABLE_MAP KEY_VALUE_GENERIC_TYPE extends SORTED_MAP KEY_VAL
 	/** @return a Type Specific pollLastEntry */
 	@Override
 	public MAP.Entry KEY_VALUE_GENERIC_TYPE pollLastEntry();
-	/** @return a Type Specific Navigable Key Set */
-	@Override
-	public NAVIGABLE_SET KEY_GENERIC_TYPE keySet();
 	
-#if MAPS_FEATURE
-	/**
-	 * Creates a Wrapped NavigableMap that is Synchronized
-	 * @return a new NavigableMap that is synchronized
-	 * @see MAPS#synchronize
-	 */
-	public default NAVIGABLE_MAP KEY_VALUE_GENERIC_TYPE synchronize() { return MAPS.synchronize(this); }
-	
-	/**
-	 * Creates a Wrapped NavigableMap that is Synchronized
-	 * @param mutex is the controller of the synchronization block
-	 * @return a new NavigableMap Wrapper that is synchronized
-	 * @see MAPS#synchronize
-	 */
-	public default NAVIGABLE_MAP KEY_VALUE_GENERIC_TYPE synchronize(Object mutex) { return MAPS.synchronize(this, mutex); }
-	
-	/**
-	 * Creates a Wrapped NavigableMap that is unmodifiable
-	 * @return a new NavigableMap Wrapper that is unmodifiable
-	 * @see MAPS#unmodifiable
-	 */
-	public default NAVIGABLE_MAP KEY_VALUE_GENERIC_TYPE unmodifiable() { return MAPS.unmodifiable(this); }
-	
-#endif
 #if !TYPE_OBJECT
 	/**
 	 * A Type Specific SubMap method to reduce boxing/unboxing
@@ -214,13 +182,13 @@ public interface NAVIGABLE_MAP KEY_VALUE_GENERIC_TYPE extends SORTED_MAP KEY_VAL
 	default NAVIGABLE_MAP KEY_VALUE_GENERIC_TYPE tailMap(CLASS_TYPE fromKey) { return tailMap(OBJ_TO_KEY(fromKey), true); }
 #else
 	@Override
-	MAP.Entry KEY_VALUE_GENERIC_TYPE lowerEntry(CLASS_TYPE key);
+	default MAP.Entry KEY_VALUE_GENERIC_TYPE lowerEntry(CLASS_TYPE key) { return lowerEntry(OBJ_TO_KEY(key)); }
 	@Override
-	MAP.Entry KEY_VALUE_GENERIC_TYPE floorEntry(CLASS_TYPE key);
+	default MAP.Entry KEY_VALUE_GENERIC_TYPE floorEntry(CLASS_TYPE key) { return floorEntry(OBJ_TO_KEY(key)); }
 	@Override
-	MAP.Entry KEY_VALUE_GENERIC_TYPE ceilingEntry(CLASS_TYPE key);
+	default MAP.Entry KEY_VALUE_GENERIC_TYPE ceilingEntry(CLASS_TYPE key) { return ceilingEntry(OBJ_TO_KEY(key)); }
 	@Override
-	MAP.Entry KEY_VALUE_GENERIC_TYPE higherEntry(CLASS_TYPE key);
+	default MAP.Entry KEY_VALUE_GENERIC_TYPE higherEntry(CLASS_TYPE key) { return higherEntry(OBJ_TO_KEY(key)); }
 	
 	@Override
 	public NAVIGABLE_MAP KEY_VALUE_GENERIC_TYPE subMap(CLASS_TYPE fromKey, boolean fromInclusive, CLASS_TYPE toKey, boolean toInclusive);

src/builder/resources/speiger/assets/collections/templates/maps/interfaces/OrderedMap.template

@@ -1,149 +0,0 @@
-package speiger.src.collections.PACKAGE.maps.interfaces;
-
-#if MAPS_FEATURE
-import speiger.src.collections.PACKAGE.utils.maps.MAPS;
-#endif
-#if !TYPE_OBJECT
-import speiger.src.collections.PACKAGE.sets.ORDERED_SET;
-#endif
-import speiger.src.collections.objects.collections.ObjectBidirectionalIterator;
-import speiger.src.collections.objects.sets.ObjectOrderedSet;
-/**
- * A Special Map Interface giving Access to some really usefull functions
- * The Idea behind this interface is to allow access to functions that give control to the Order of elements.
- * Since Linked implementations as examples can be reordered outside of the Insertion Order.
- * This interface provides basic access to such functions while also providing some Sorted/NaivgableMap implementations that still fit into here.
- * 
- * @Type(T)
- * @ValueType(V)
- */
-public interface ORDERED_MAP KEY_VALUE_GENERIC_TYPE extends MAP KEY_VALUE_GENERIC_TYPE
-{
-	/**
-	 * A customized put method that allows you to insert into the first index.
-	 * @param key the key that should be inserted
-	 * @param value the value that should be inserted
-	 * @return the previous present or default return value
-	 * @see java.util.Map#put(Object, Object)
-	 */
-	public VALUE_TYPE putAndMoveToFirst(KEY_TYPE key, VALUE_TYPE value);
-	
-	/**
-	 * A customized put method that allows you to insert into the last index. (This may be nessesary depending on the implementation)
-	 * @param key the key that should be inserted
-	 * @param value the value that should be inserted
-	 * @return the previous present or default return value
-	 * @see java.util.Map#put(Object, Object)
-	 */
-	public VALUE_TYPE putAndMoveToLast(KEY_TYPE key, VALUE_TYPE value);
-	
-	/**
-	 * A specific move method to move a given key/value to the first index.
-	 * @param key that should be moved to the first index
-	 * @return true if the value was moved.
-	 * @note returns false if the value was not present in the first place
-	 */
-	public boolean moveToFirst(KEY_TYPE key);
-	/**
-	 * A specific move method to move a given key/value to the last index.
-	 * @param key that should be moved to the first last
-	 * @return true if the value was moved.
-	 * @note returns false if the value was not present in the first place
-	 */
-	public boolean moveToLast(KEY_TYPE key);
-	
-	/**
-	 * A Specific get method that allows to move teh given key/value int the first index.
-	 * @param key that is searched for
-	 * @return the given value for the requested key or default return value
-	 */
-	public VALUE_TYPE getAndMoveToFirst(KEY_TYPE key);
-	/**
-	 * A Specific get method that allows to move teh given key/value int the last index.
-	 * @param key that is searched for
-	 * @return the given value for the requested key or default return value
-	 */
-	public VALUE_TYPE getAndMoveToLast(KEY_TYPE key);
-	
-	/**
-	 * A method to get the first Key of a Map.
-	 * @return the first key in the map
-	 */
-	public KEY_TYPE FIRST_ENTRY_KEY();
-	/**
-	 * A method to get and remove the first Key of a Map.
-	 * @return the first key in the map
-	 */
-	public KEY_TYPE POLL_FIRST_ENTRY_KEY();
-	/**
-	 * A method to get the last Key of a Map.
-	 * @return the last key in the map
-	 */
-	public KEY_TYPE LAST_ENTRY_KEY();
-	/**
-	 * A method to get and remove the last Key of a Map.
-	 * @return the last key in the map
-	 */
-	public KEY_TYPE POLL_LAST_ENTRY_KEY();
-	
-	/**
-	 * A method to get the first Value of a Map.
-	 * @return the first key in the map
-	 */
-	public VALUE_TYPE FIRST_ENTRY_VALUE();
-	/**
-	 * A method to get the last Value of a Map.
-	 * @return the last key in the map
-	 */
-	public VALUE_TYPE LAST_ENTRY_VALUE();
-	
-	@Override
-	public ORDERED_MAP KEY_VALUE_GENERIC_TYPE copy();
-	@Override
-	public ORDERED_SET KEY_GENERIC_TYPE keySet();
-	@Override
-	public ObjectOrderedSet<MAP.Entry KEY_VALUE_GENERIC_TYPE> ENTRY_SET();
-	
-#if MAPS_FEATURE
-	/**
-	 * Creates a Wrapped SortedMap that is Synchronized
-	 * @return a new SortedMap that is synchronized
-	 * @see MAPS#synchronize
-	 */
-	@Override
-	public default ORDERED_MAP KEY_VALUE_GENERIC_TYPE synchronize() { return MAPS.synchronize(this); }
-	
-	/**
-	 * Creates a Wrapped SortedMap that is Synchronized
-	 * @param mutex is the controller of the synchronization block
-	 * @return a new SortedMap Wrapper that is synchronized
-	 * @see MAPS#synchronize
-	 */
-	@Override
-	public default ORDERED_MAP KEY_VALUE_GENERIC_TYPE synchronize(Object mutex) { return MAPS.synchronize(this, mutex); }
-	
-	/**
-	 * Creates a Wrapped SortedMap that is unmodifiable
-	 * @return a new SortedMap Wrapper that is unmodifiable
-	 * @see MAPS#unmodifiable
-	 */
-	@Override
-	public default ORDERED_MAP KEY_VALUE_GENERIC_TYPE unmodifiable() { return MAPS.unmodifiable(this); }
-	
-#endif
-	/**
-	 * Fast Ordered Entry Set that allows for a faster Entry Iterator by recycling the Entry Object and just exchanging 1 internal value
-	 * @Type(T)
-	 * @ValueType(V)
-	 */
-	interface FastOrderedSet KEY_VALUE_GENERIC_TYPE extends MAP.FastEntrySet KEY_VALUE_GENERIC_TYPE, ObjectOrderedSet<MAP.Entry KEY_VALUE_GENERIC_TYPE> {
-		@Override
-		public ObjectBidirectionalIterator<MAP.Entry KEY_VALUE_GENERIC_TYPE> fastIterator();
-		/**
-		 * Fast iterator that recycles the given Entry object to improve speed and reduce object allocation
-		 * @param fromElement that is going to be started from.
-		 * @return a improved iterator that starts from the desired element
-		 */
-		public ObjectBidirectionalIterator<MAP.Entry KEY_VALUE_GENERIC_TYPE> fastIterator(KEY_TYPE fromElement);
-	}
-}

src/builder/resources/speiger/assets/collections/templates/maps/interfaces/SortedMap.template

@@ -9,13 +9,8 @@ import speiger.src.collections.VALUE_PACKAGE.collections.VALUE_COLLECTION;
 #if !TYPE_OBJECT
 import speiger.src.collections.PACKAGE.functions.COMPARATOR;
 #endif
-import speiger.src.collections.PACKAGE.sets.SORTED_SET;
-#if MAPS_FEATURE
-import speiger.src.collections.PACKAGE.utils.maps.MAPS;
-#endif
-#if !TYPE_OBJECT
+import speiger.src.collections.PACKAGE.sets.SET;
 import speiger.src.collections.objects.sets.ObjectSortedSet;
-#endif
 import speiger.src.collections.objects.collections.ObjectBidirectionalIterator;
 
 /**
@@ -23,46 +18,68 @@ import speiger.src.collections.objects.collections.ObjectBidirectionalIterator;
  * 
  * @Type(T)
  * @ValueType(V)
- * @note ORDERED_MAP is only extended until 0.6.0 for Compat reasons.
- * The supported classes already implement ORDERED_MAP directly and will remove SORTED_MAP implementations in favor of ORDERED_MAP instead
  */
 public interface SORTED_MAP KEY_VALUE_GENERIC_TYPE extends SortedMap<CLASS_TYPE, CLASS_VALUE_TYPE>, MAP KEY_VALUE_GENERIC_TYPE
 {
+	/**
+	 * A customized put method that allows you to insert into the first index.
+	 * @param key the key that should be inserted
+	 * @param value the value that should be inserted
+	 * @return the previous present or default return value
+	 * @see java.util.Map#put(Object, Object)
+	 * @note some implementations do not support this method
+	 */
+	public VALUE_TYPE putAndMoveToFirst(KEY_TYPE key, VALUE_TYPE value);
+	/**
+	 * A customized put method that allows you to insert into the last index. (This may be nessesary depending on the implementation)
+	 * @param key the key that should be inserted
+	 * @param value the value that should be inserted
+	 * @return the previous present or default return value
+	 * @see java.util.Map#put(Object, Object)
+	 * @note some implementations do not support this method
+	 */
+	public VALUE_TYPE putAndMoveToLast(KEY_TYPE key, VALUE_TYPE value);
+	
+	/**
+	 * A specific move method to move a given key/value to the first index.
+	 * @param key that should be moved to the first index
+	 * @return true if the value was moved.
+	 * @note returns false if the value was not present in the first place
+	 * @note some implementations do not support this method
+	 */
+	public boolean moveToFirst(KEY_TYPE key);
+	/**
+	 * A specific move method to move a given key/value to the last index.
+	 * @param key that should be moved to the first last
+	 * @return true if the value was moved.
+	 * @note returns false if the value was not present in the first place
+	 * @note some implementations do not support this method
+	 */
+	public boolean moveToLast(KEY_TYPE key);
+	
+	/**
+	 * A Specific get method that allows to move teh given key/value int the first index.
+	 * @param key that is searched for
+	 * @return the given value for the requested key or default return value
+	 * @note some implementations do not support this method
+	 */
+	public VALUE_TYPE getAndMoveToFirst(KEY_TYPE key);
+	/**
+	 * A Specific get method that allows to move teh given key/value int the last index.
+	 * @param key that is searched for
+	 * @return the given value for the requested key or default return value
+	 * @note some implementations do not support this method
+	 */
+	public VALUE_TYPE getAndMoveToLast(KEY_TYPE key);
+	
 	@Override
 	public COMPARATOR KEY_GENERIC_TYPE comparator();
 	
 	@Override
-	public SORTED_MAP KEY_VALUE_GENERIC_TYPE copy();
-	
-	@Override
-	public SORTED_SET KEY_GENERIC_TYPE keySet();
+	public SET KEY_GENERIC_TYPE keySet();
 	@Override
 	public VALUE_COLLECTION VALUE_GENERIC_TYPE values();
 	
-#if MAPS_FEATURE
-	/**
-	 * Creates a Wrapped SortedMap that is Synchronized
-	 * @return a new SortedMap that is synchronized
-	 * @see MAPS#synchronize
-	 */
-	public default SORTED_MAP KEY_VALUE_GENERIC_TYPE synchronize() { return MAPS.synchronize(this); }
-	
-	/**
-	 * Creates a Wrapped SortedMap that is Synchronized
-	 * @param mutex is the controller of the synchronization block
-	 * @return a new SortedMap Wrapper that is synchronized
-	 * @see MAPS#synchronize
-	 */
-	public default SORTED_MAP KEY_VALUE_GENERIC_TYPE synchronize(Object mutex) { return MAPS.synchronize(this, mutex); }
-	
-	/**
-	 * Creates a Wrapped SortedMap that is unmodifiable
-	 * @return a new SortedMap Wrapper that is unmodifiable
-	 * @see MAPS#unmodifiable
-	 */
-	public default SORTED_MAP KEY_VALUE_GENERIC_TYPE unmodifiable() { return MAPS.unmodifiable(this); }
-	
-#endif
 #if !TYPE_OBJECT
 	/**
 	 * A Type Specific SubMap method to reduce boxing/unboxing
@@ -161,11 +178,11 @@ public interface SORTED_MAP KEY_VALUE_GENERIC_TYPE extends SortedMap<CLASS_TYPE,
 	public VALUE_TYPE LAST_ENTRY_VALUE();
 	
 	@Override
-	public SORTED_MAP KEY_VALUE_GENERIC_TYPE subMap(CLASS_TYPE fromKey, CLASS_TYPE toKey);
+	public default SORTED_MAP KEY_VALUE_GENERIC_TYPE subMap(CLASS_TYPE fromKey, CLASS_TYPE toKey) { return subMap(OBJ_TO_KEY(fromKey), OBJ_TO_KEY(toKey)); }
 	@Override
-	public SORTED_MAP KEY_VALUE_GENERIC_TYPE headMap(CLASS_TYPE toKey);
+	public default SORTED_MAP KEY_VALUE_GENERIC_TYPE headMap(CLASS_TYPE toKey) { return headMap(OBJ_TO_KEY(toKey)); }
 	@Override
-	public SORTED_MAP KEY_VALUE_GENERIC_TYPE tailMap(CLASS_TYPE fromKey);
+	public default SORTED_MAP KEY_VALUE_GENERIC_TYPE tailMap(CLASS_TYPE fromKey) { return tailMap(OBJ_TO_KEY(fromKey)); }
 #endif
 	
 	/**
@@ -176,11 +193,6 @@ public interface SORTED_MAP KEY_VALUE_GENERIC_TYPE extends SortedMap<CLASS_TYPE,
 	interface FastSortedSet KEY_VALUE_GENERIC_TYPE extends MAP.FastEntrySet KEY_VALUE_GENERIC_TYPE, ObjectSortedSet<MAP.Entry KEY_VALUE_GENERIC_TYPE> {
 		@Override
 		public ObjectBidirectionalIterator<MAP.Entry KEY_VALUE_GENERIC_TYPE> fastIterator();
-		/**
-		 * Fast iterator that recycles the given Entry object to improve speed and reduce object allocation
-		 * @param fromElement that is going to be started from.
-		 * @return a improved iterator that starts from the desired element
-		 */
 		public ObjectBidirectionalIterator<MAP.Entry KEY_VALUE_GENERIC_TYPE> fastIterator(KEY_TYPE fromElement);
 	}
 }

src/builder/resources/speiger/assets/collections/templates/misc/pairs/Pair.template

@@ -1,12 +1,7 @@
 package speiger.src.collections.PACKAGE.misc.pairs;
 
-#if IMMUTABLE_PAIR
 import speiger.src.collections.PACKAGE.misc.pairs.impl.IMMUTABLE_PAIR;
-#endif
-#if MUTABLE_PAIR
 import speiger.src.collections.PACKAGE.misc.pairs.impl.MUTABLE_PAIR;
-#endif
-
 /**
  * Key Value Pair Interface that allows to reduce boxing/unboxing.
  * @Type(T)
@@ -14,7 +9,6 @@ import speiger.src.collections.PACKAGE.misc.pairs.impl.MUTABLE_PAIR;
  */
 public interface PAIR KEY_VALUE_GENERIC_TYPE
 {
-#if IMMUTABLE_PAIR
 	/**
 	 * Empty Reference for Immutable Pairs
 	 */
@@ -74,8 +68,6 @@ public interface PAIR KEY_VALUE_GENERIC_TYPE
 		return new IMMUTABLE_PAIRKV_BRACES(pair.ENTRY_KEY(), pair.ENTRY_VALUE());
 	}
 	
-#endif
-#if MUTABLE_PAIR
 	/**
 	 * @Type(T)
 	 * @ValueType(V)
@@ -126,7 +118,6 @@ public interface PAIR KEY_VALUE_GENERIC_TYPE
 		return new MUTABLE_PAIRKV_BRACES(pair.ENTRY_KEY(), pair.ENTRY_VALUE());
 	}
 	
-#endif
 	/**
 	 * Sets the Key of the Pair.
 	 * @param key the key that should be set.

src/builder/resources/speiger/assets/collections/templates/queues/AbstractPriorityQueue.template

@@ -1,46 +0,0 @@
-package speiger.src.collections.PACKAGE.queues;
-
-#if TYPE_OBJECT
-import java.util.Objects;
-#endif
-import java.util.StringJoiner;
-
-/**
- * Helper class that implements all the essential methods for the PriorityQueues
- * @Type(T)
- */
-public abstract class ABSTRACT_PRIORITY_QUEUE KEY_GENERIC_TYPE implements PRIORITY_QUEUE KEY_GENERIC_TYPE
-{
-	@Override
-	public boolean equals(Object obj) {
-		if(obj instanceof PRIORITY_QUEUE) {
-			PRIORITY_QUEUE KEY_GENERIC_TYPE queue = (PRIORITY_QUEUE KEY_GENERIC_TYPE)obj;
-			if(queue.size() != size()) return false;
-			for(int i = 0,m=size();i<m;i++) {
-				if(KEY_EQUALS_NOT(queue.peek(i), peek(i))) return false;
-			}
-			return true;
-		}
-		return false;
-	}
-	
-	@Override
-	public int hashCode() {
-        int result = 1;
-        for (int i = 0,m=size();i<m;i++) {
-            result = 31 * result + KEY_TO_HASH(peek(i));
-        }
-		return result;
-	}
-	
-	@Override
-	public String toString()
-	{
-		if(isEmpty()) return "[]";
-		StringJoiner joiner = new StringJoiner(", ", "[", "]");
-        for (int i = 0,m=size();i<m;i++) {
-        	joiner.add(KEY_TO_STRING(peek(i)));
-        }
-        return joiner.toString();
-	}
-}

src/builder/resources/speiger/assets/collections/templates/queues/ArrayFIFOQueue.template

@@ -1,468 +1,371 @@
-package speiger.src.collections.PACKAGE.queues;
-
-import java.util.Arrays;
-#if TYPE_OBJECT
-import java.util.Comparator;
-import java.util.function.Consumer;
-import java.util.function.BiFunction;
-#endif
-import java.util.Objects;
-import java.util.NoSuchElementException;
-#if JDK_FUNCTION
-import java.util.function.PREDICATE;
-#endif
-
-import speiger.src.collections.PACKAGE.collections.ITERATOR;
-#if !TYPE_OBJECT
-import speiger.src.collections.PACKAGE.functions.COMPARATOR;
-import speiger.src.collections.PACKAGE.functions.CONSUMER;
-#endif
-import speiger.src.collections.ints.functions.consumer.BI_FROM_INT_CONSUMER;
-import speiger.src.collections.objects.functions.consumer.BI_FROM_OBJECT_CONSUMER;
-#if !JDK_FUNCTION
-import speiger.src.collections.PACKAGE.functions.function.PREDICATE;
-#endif
-import speiger.src.collections.PACKAGE.functions.function.UNARY_OPERATOR;
-import speiger.src.collections.utils.ITrimmable;
-
-/**
- * A Simple First In First Out Priority Queue that is a Good Replacement for a linked list (or ArrayDequeue)
- * Its specific implementation uses a backing array that grows and shrinks as it is needed.
- * @Type(T)
- */
-public class ARRAY_FIFO_QUEUE KEY_GENERIC_TYPE extends ABSTRACT_PRIORITY_QUEUE KEY_GENERIC_TYPE implements PRIORITY_DEQUEUE KEY_GENERIC_TYPE, ITrimmable
-{
-	/** Max Possible ArraySize without the JVM Crashing */
-	private static final int MAX_ARRAY_SIZE = Integer.MAX_VALUE - 8;
-	/** The Minimum Capacity that is allowed */
-	public static final int MIN_CAPACITY = 4;
-	/** The Backing array */
-	protected transient KEY_TYPE[] array;
-	/** The First Index pointer */
-	protected int first;
-	/** The Last Index pointer */
-	protected int last;
-	/** The Minimum Capacity of the Queue **/
-	protected int minCapacity;
-	
-	/**
-	 * Constructor using a initial array
-	 * @param values the Array that should be used
-	 */
-	public ARRAY_FIFO_QUEUE(KEY_TYPE[] values) {
-		this(values, 0, values.length);
-	}
-	
-	/**
-	 * Constructor using a initial array
-	 * @param values the Array that should be used
-	 * @param size the amount of elements that are in the initial array
-	 * @throws IllegalStateException if values is smaller then size
-	 */
-	public ARRAY_FIFO_QUEUE(KEY_TYPE[] values, int size) {
-		this(values, 0, size);
-	}
-	
-	/**
-	 * Constructor using a initial array
-	 * @param values the Array that should be used
-	 * @param offset where to begin in the initial array
-	 * @param size the amount of elements that are in the initial array
-	 * @throws IllegalStateException if values is smaller then size
-	 */
-	public ARRAY_FIFO_QUEUE(KEY_TYPE[] values, int offset, int size) {
-		if (values.length < size) throw new IllegalArgumentException("Initial array (" + values.length + ") is smaller then the expected size (" + size + ")");
-		if(values.length <= 0) values = NEW_KEY_ARRAY(MIN_CAPACITY);
-		else if(values.length < MIN_CAPACITY) values = Arrays.copyOf(values, MIN_CAPACITY);
-		minCapacity = MIN_CAPACITY;
-		array = values;
-		first = offset;
-		last = (offset + size) % array.length;
-		if(array.length == size) expand();
-	}
-	
-	/**
-	 * Constructor with a Min Capacity
-	 * @param capacity the initial capacity of the backing array
-	 * @throws IllegalStateException if the initial size is smaller 0
-	 */
-	public ARRAY_FIFO_QUEUE(int capacity) {
-		if (capacity < 0) throw new IllegalArgumentException("Initial capacity (" + capacity + ") is negative");
-		array = NEW_KEY_ARRAY(Math.max(MIN_CAPACITY, capacity+1));
-		minCapacity = array.length;
-	}
-	
-	/**
-	 * Default Construtor
-	 */
-	public ARRAY_FIFO_QUEUE() {
-		this(MIN_CAPACITY);
-	}
-	
-	@Override
-	public ITERATOR KEY_GENERIC_TYPE iterator() {
-		return new Iter();
-	}
-	
-	@Override
-	public int size() {
-		final int apparentLength = last - first;
-		return apparentLength >= 0 ? apparentLength : array.length + apparentLength;
-	}
-	
-	@Override
-	public void clear() {
-		if(first != last) {
-#if TYPE_OBJECT
-			Arrays.fill(array, null);
-#endif
-			first = last = 0;
-		}
-		else if(first != 0) {
-			first = last = 0;
-		}
-	}
-	
-	@Override
-	public void enqueue(KEY_TYPE e) {
-		array[last++] = e;
-		if(last == array.length) last = 0;
-		if(last == first) expand();
-	}
-	
-	@Override
-	public void enqueueFirst(KEY_TYPE e) {
-		if(first == 0) first = array.length;
-		array[--first] = e;
-		if(first == last) expand();
-	}
-	
-	@Override
-	public KEY_TYPE dequeue() {
-		if(first == last) throw new NoSuchElementException();
-		KEY_TYPE data = array[first];
-#if TYPE_OBJECT
-		array[first] = null;
-#endif
-		if(++first == array.length) first = 0;
-		reduce();
-		return data;
-	}
-	
-	@Override
-	public KEY_TYPE dequeueLast() {
-		if(first == last) throw new NoSuchElementException();
-		if(last == 0) last = array.length;
-		KEY_TYPE data = array[--last];
-#if TYPE_OBJECT
-		array[last] = null;
-#endif
-		reduce();
-		return data;
-	}
-	
-	@Override
-	public KEY_TYPE peek(int index) {
-		if(first == last || index < 0 || index >= size()) throw new NoSuchElementException();
-		index += first;
-		return index >= array.length ? array[index-array.length] : array[index];
-	}
-	
-	@Override
-	public boolean contains(KEY_TYPE e) {
-		if(first == last) return false;
-		for(int i = 0,m=size();i<m;i++) {
-			if(e == array[(first + i) % array.length]) return true;
-		}
-		return false;
-	}
-	
-	@Override
-	public boolean removeFirst(KEY_TYPE e) {
-		if(first == last) return false;
-		for(int i = 0,m=size();i<m;i++) {
-			int index = (first + i) % array.length;
-			if(e == array[index])
-				return removeIndex(index);
-		}
-		return false;
-	}
-	
-	@Override
-	public boolean removeLast(KEY_TYPE e) {
-		if(first == last) return false;
-		for(int i = size()-1;i>=0;i--) {
-			int index = (first + i) % array.length;
-			if(e == array[index])
-				return removeIndex(index);
-		}
-		return false;
-	}
-	
-	protected boolean removeIndex(int index) {
-		if(first >= last ? index < first && index > last : index < first || index > last) return false;
-		if(index == first) {
-#if TYPE_OBJECT
-			array[first] = null;
-#endif
-			first++;
-		}
-		else if(index == last) {
-			last--;
-#if TYPE_OBJECT
-			array[last] = null;
-#endif
-		}
-		else if(index > last) {
-			System.arraycopy(array, first, array, first+1, (index - first));
-#if TYPE_OBJECT
-			array[first] = null;
-#endif
-			first = ++first % array.length;
-		}
-		else if(index < first) {
-			System.arraycopy(array, index+1, array, index, (last - index) - 1);
-#if TYPE_OBJECT
-			array[last] = null;
-#endif
-			if(--last < 0) last += array.length;
-		}
-		else {
-			if(index - first < last - index) {
-				System.arraycopy(array, first, array, first+1, (index - first));
-#if TYPE_OBJECT
-				array[first] = null;
-#endif
-				first = ++first % array.length;
-			}
-			else {
-				System.arraycopy(array, index+1, array, index, (last - index) - 1);
-#if TYPE_OBJECT
-				array[last] = null;
-#endif
-				if(--last < 0) last += array.length;
-			}
-		}
-		reduce();
-		return true;
-	}
-	
-	@Override
-	public void onChanged() {}
-	
-	@Override
-	public ARRAY_FIFO_QUEUE KEY_GENERIC_TYPE copy() {
-		ARRAY_FIFO_QUEUE KEY_GENERIC_TYPE queue = new ARRAY_FIFO_QUEUEBRACES();
-		queue.first = first;
-		queue.last = last;
-		queue.minCapacity = minCapacity;
-		queue.array = Arrays.copyOf(array, array.length);
-		return queue;
-	}
-	
-	@Override
-	public COMPARATOR KEY_SUPER_GENERIC_TYPE comparator() { return null; }
-	
-	@Override
-	public void forEach(CONSUMER KEY_SUPER_GENERIC_TYPE action) {
-		Objects.requireNonNull(action);
-		if(first == last) return;
-		for(int i = 0,m=size();i<m;i++)
-			action.accept(array[(first + i) % array.length]);
-		clearAndTrim(0);
-	}
-	
-	@Override
-	public void forEachIndexed(BI_FROM_INT_CONSUMER KEY_GENERIC_TYPE action) {
-		Objects.requireNonNull(action);
-		if(first == last) return;
-		for(int i = 0,m=size();i<m;i++)
-			action.accept(i, array[(first + i) % array.length]);
-		clearAndTrim(0);
-	}
-	
-	@Override
-	public <E> void forEach(E input, BI_FROM_OBJECT_CONSUMER KSK_GENERIC_TYPE<E> action) {
-		Objects.requireNonNull(action);
-		if(first == last) return;
-		for(int i = 0,m=size();i<m;i++)
-			action.accept(input, array[(first + i) % array.length]);
-		clearAndTrim(0);	
-	}
-	
-	@Override
-	public boolean matchesAny(PREDICATE KEY_GENERIC_TYPE filter) {
-		Objects.requireNonNull(filter);
-		for(int i = 0,m=size();i<m;i++) {
-			if(filter.test(array[(first + i) % array.length])) return true;
-		}
-		return false;
-	}
-	
-	@Override
-	public boolean matchesNone(PREDICATE KEY_GENERIC_TYPE filter) {
-		Objects.requireNonNull(filter);
-		for(int i = 0,m=size();i<m;i++) {
-			if(filter.test(array[(first + i) % array.length])) return false;
-		}
-		return true;
-	}
-	
-	@Override
-	public boolean matchesAll(PREDICATE KEY_GENERIC_TYPE filter) {
-		Objects.requireNonNull(filter);
-		for(int i = 0,m=size();i<m;i++) {
-			if(!filter.test(array[(first + i) % array.length])) return false;
-		}
-		return true;
-	}
-	
-	@Override
-	public KEY_TYPE findFirst(PREDICATE KEY_GENERIC_TYPE filter) {
-		Objects.requireNonNull(filter);
-		for(int i = 0,m=size();i<m;i++) {
-			int index = (first + i) % array.length;
-			if(filter.test(array[index])) {
-				KEY_TYPE data = array[index];
-				removeIndex(index);
-				return data;
-			}
-		}
-		return EMPTY_VALUE;
-	}
-	
-#if !TYPE_OBJECT
-	@Override
-	public KEY_TYPE reduce(KEY_TYPE identity, UNARY_OPERATOR KEY_KEY_GENERIC_TYPE operator) {
-		Objects.requireNonNull(operator);
-		KEY_TYPE state = identity;
-		for(int i = 0,m=size();i<m;i++) {
-			state = operator.APPLY_VALUE(state, array[(first + i) % array.length]);
-		}
-		return state;
-	}
-	
-#else
-	@Override
-	public <KEY_SPECIAL_TYPE> KEY_SPECIAL_TYPE reduce(KEY_SPECIAL_TYPE identity, BiFunction<KEY_SPECIAL_TYPE, KEY_TYPE, KEY_SPECIAL_TYPE> operator) {
-		Objects.requireNonNull(operator);
-		KEY_SPECIAL_TYPE state = identity;
-		for(int i = 0,m=size();i<m;i++) {
-			state = operator.APPLY_VALUE(state, array[(first + i) % array.length]);
-		}
-		return state;
-	}
-	
-#endif
-	@Override
-	public KEY_TYPE reduce(UNARY_OPERATOR KEY_KEY_GENERIC_TYPE operator) {
-		Objects.requireNonNull(operator);
-		KEY_TYPE state = EMPTY_VALUE;
-		boolean empty = true;
-		for(int i = 0,m=size();i<m;i++) {
-			if(empty) {
-				empty = false;
-				state = array[(first + i) % array.length];
-				continue;
-			}
-			state = operator.APPLY_VALUE(state, array[(first + i) % array.length]);
-		}
-		return state;
-	}
-	
-	@Override
-	public int count(PREDICATE KEY_GENERIC_TYPE filter) {
-		Objects.requireNonNull(filter);
-		int result = 0;
-		for(int i = 0,m=size();i<m;i++) {
-			if(filter.test(array[(first + i) % array.length])) result++;
-		}
-		return result;
-	}
-	
-	@Override
-	public boolean trim(int size) {
-		int newSize = Math.max(Math.max(size, size()), minCapacity);
-		if(newSize >= array.length) return false;
-		KEY_TYPE[] newArray = NEW_KEY_ARRAY(newSize);
-		if(first <= last) System.arraycopy(array, first, newArray, 0, last - first);
-		else {
-			System.arraycopy(array, first, newArray, 0, array.length - first);
-			System.arraycopy(array, 0, newArray, array.length - first, last);
-		}
-		first = 0;
-		last = size();
-		array = newArray;
-		return true;
-	}
-	
-	/**
-	 * Trims the collection down to the requested size and clears all elements while doing so
-	 * @param size the amount of elements that should be allowed
-	 * @note this will enforce minimum size of the collection itself
-	 */
-	@Override
-	public void clearAndTrim(int size) {
-		int newSize = Math.max(minCapacity, size);
-		if(array.length <= newSize) {
-			clear();
-			return;
-		}
-		first = last = 0;
-		array = NEW_KEY_ARRAY(newSize);
-	}
-	
-	@Override
-	public GENERIC_SPECIAL_KEY_BRACES<E> KEY_SPECIAL_TYPE[] TO_ARRAY(KEY_SPECIAL_TYPE[] input) {
-		if(input == null || input.length < size()) input = NEW_SPECIAL_KEY_ARRAY(size());
-		if (first <= last) System.arraycopy(array, first, input, 0, last - first);
-		else {
-			System.arraycopy(array, first, input, 0, array.length - first);
-			System.arraycopy(array, 0, input, array.length - first, last);
-		}
-		return input;
-	}
-	
-	protected void reduce() {
-		final int size = size();
-		if (array.length > minCapacity && size <= array.length / 4) resize(size, Math.max(array.length / 2, minCapacity));
-	}
-	
-	protected void expand() {
-		resize(array.length, (int)Math.min(MAX_ARRAY_SIZE, 2L * array.length));
-	}
-	
-	protected final void resize(int oldSize, int newSize) {
-		KEY_TYPE[] newArray = NEW_KEY_ARRAY(newSize);
-		if(first >= last) {
-			if(oldSize != 0)
-			{
-				System.arraycopy(array, first, newArray, 0, array.length - first);
-				System.arraycopy(array, 0, newArray, array.length - first, last);
-			}
-		}
-		else System.arraycopy(array, first, newArray, 0, last-first);
-		first = 0;
-		last = oldSize;
-		array = newArray;
-	}
-	
-	private class Iter implements ITERATOR KEY_GENERIC_TYPE
-	{
-		int index = first;
-		@Override
-		public boolean hasNext()
-		{
-			return index != last;
-		}
-
-		@Override
-		public KEY_TYPE NEXT() {
-			if(!hasNext()) throw new NoSuchElementException();
-			KEY_TYPE value = array[index];
-			removeIndex(index);
-			index = ++index % array.length;
-			return value;
-		}
-	}
+package speiger.src.collections.PACKAGE.queues;
+
+#if TYPE_OBJECT
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.function.Consumer;
+#endif
+import java.util.Objects;
+import java.util.NoSuchElementException;
+
+import speiger.src.collections.PACKAGE.collections.ITERATOR;
+#if !TYPE_OBJECT
+import speiger.src.collections.PACKAGE.functions.COMPARATOR;
+import speiger.src.collections.PACKAGE.functions.CONSUMER;
+#endif
+import speiger.src.collections.PACKAGE.functions.consumer.BI_OBJECT_CONSUMER;
+import speiger.src.collections.PACKAGE.functions.function.PREDICATE;
+import speiger.src.collections.utils.ITrimmable;
+
+/**
+ * A Simple First In First Out Priority Queue that is a Good Replacement for a linked list (or ArrayDequeue)
+ * Its specific implementation uses a backing array that grows and shrinks as it is needed.
+ * @Type(T)
+ */
+public class ARRAY_FIFO_QUEUE KEY_GENERIC_TYPE implements PRIORITY_DEQUEUE KEY_GENERIC_TYPE, ITrimmable
+{
+	/** Max Possible ArraySize without the JVM Crashing */
+	private static final int MAX_ARRAY_SIZE = Integer.MAX_VALUE - 8;
+	/** The Minimum Capacity that is allowed */
+	public static final int MIN_CAPACITY = 4;
+	/** The Backing array */
+	protected transient KEY_TYPE[] array;
+	/** The First Index pointer */
+	protected int first;
+	/** The Last Index pointer */
+	protected int last;
+	
+	/**
+	 * Constructor using a initial array
+	 * @param values the Array that should be used
+	 */
+	public ARRAY_FIFO_QUEUE(KEY_TYPE[] values) {
+		this(values, 0, values.length);
+	}
+	
+	/**
+	 * Constructor using a initial array
+	 * @param values the Array that should be used
+	 * @param size the amount of elements that are in the initial array
+	 * @throws IllegalStateException if values is smaller then size
+	 */
+	public ARRAY_FIFO_QUEUE(KEY_TYPE[] values, int size) {
+		this(values, 0, size);
+	}
+	
+	/**
+	 * Constructor using a initial array
+	 * @param values the Array that should be used
+	 * @param offset where to begin in the initial array
+	 * @param size the amount of elements that are in the initial array
+	 * @throws IllegalStateException if values is smaller then size
+	 */
+	public ARRAY_FIFO_QUEUE(KEY_TYPE[] values, int offset, int size) {
+		if (values.length < size) throw new IllegalArgumentException("Initial array (" + values.length + ") is smaller then the expected size (" + size + ")");
+		if(values.length <= 0) values = NEW_KEY_ARRAY(1);
+		array = values;
+		first = offset;
+		last = (offset + size) % array.length;
+		if(array.length == size) expand();
+	}
+	
+	/**
+	 * Constructor with a Min Capacity
+	 * @param capacity the initial capacity of the backing array
+	 * @throws IllegalStateException if the initial size is smaller 0
+	 */
+	public ARRAY_FIFO_QUEUE(int capacity) {
+		if (capacity < 0) throw new IllegalArgumentException("Initial capacity (" + capacity + ") is negative");
+		array = NEW_KEY_ARRAY(Math.max(1, capacity));
+	}
+	
+	/**
+	 * Default Construtor
+	 */
+	public ARRAY_FIFO_QUEUE() {
+		this(MIN_CAPACITY);
+	}
+	
+	@Override
+	public ITERATOR KEY_GENERIC_TYPE iterator() {
+		return new Iter();
+	}
+	
+	@Override
+	public int size() {
+		final int apparentLength = last - first;
+		return apparentLength >= 0 ? apparentLength : array.length + apparentLength;
+	}
+	
+	@Override
+	public void clear() {
+#if TYPE_OBJECT
+		Arrays.fill(array, null);
+#endif
+		first = last = 0;
+	}
+	
+	@Override
+	public void enqueue(KEY_TYPE e) {
+		array[last] = e;
+		last = ++last % array.length;
+		if(last == first) expand();
+	}
+	
+	@Override
+	public void enqueueFirst(KEY_TYPE e) {
+		if(first == 0) first = array.length;
+		array[--first] = e;
+		if(first == last) expand();
+	}
+	
+	@Override
+	public KEY_TYPE dequeue() {
+		if(first == last) throw new NoSuchElementException();
+		KEY_TYPE data = array[first];
+#if TYPE_OBJECT
+		array[first] = null;
+#endif
+		first = ++first % array.length;
+		reduce();
+		return data;
+	}
+	
+	@Override
+	public KEY_TYPE dequeueLast() {
+		if(first == last) throw new NoSuchElementException();
+		if(last == 0) last = array.length;
+		KEY_TYPE data = array[--last];
+#if TYPE_OBJECT
+		array[last] = null;
+#endif
+		reduce();
+		return data;
+	}
+	
+	@Override
+	public KEY_TYPE peek(int index) {
+		if(first == last || index < 0 || index > size()) throw new NoSuchElementException();
+		return array[(first + index) % array.length];
+	}
+	
+	@Override
+	public boolean removeFirst(KEY_TYPE e) {
+		if(first == last) return false;
+		for(int i = 0,m=size();i<m;i++) {
+			int index = (first + i) % array.length;
+			if(e == array[index])
+				return removeIndex(index);
+		}
+		return false;
+	}
+	
+	@Override
+	public boolean removeLast(KEY_TYPE e) {
+		if(first == last) return false;
+		for(int i = size()-1;i>=0;i--) {
+			int index = (first + i) % array.length;
+			if(e == array[index])
+				return removeIndex(index);
+		}
+		return false;
+	}
+	
+	protected boolean removeIndex(int index) {
+		if(first >= last ? index < first && index > last : index < first || index > last) return false;
+		if(index == first) {
+#if TYPE_OBJECT
+			array[first] = null;
+#endif
+			first++;
+		}
+		else if(index == last) {
+			last--;
+#if TYPE_OBJECT
+			array[last] = null;
+#endif
+		}
+		else if(index > last) {
+			System.arraycopy(array, first, array, first+1, (index - first));
+#if TYPE_OBJECT
+			array[first] = null;
+#endif
+			first = ++first % array.length;
+		}
+		else if(index < first) {
+			System.arraycopy(array, index+1, array, index, (last - index) - 1);
+#if TYPE_OBJECT
+			array[last] = null;
+#endif
+			if(--last < 0) last += array.length;
+		}
+		else {
+			if(index - first < last - index) {
+				System.arraycopy(array, first, array, first+1, (index - first));
+#if TYPE_OBJECT
+				array[first] = null;
+#endif
+				first = ++first % array.length;
+			}
+			else {
+				System.arraycopy(array, index+1, array, index, (last - index) - 1);
+#if TYPE_OBJECT
+				array[last] = null;
+#endif
+				if(--last < 0) last += array.length;
+			}
+		}
+		reduce();
+		return true;
+	}
+	
+	@Override
+	public void onChanged() {}
+	
+	@Override
+	public COMPARATOR KEY_SUPER_GENERIC_TYPE comparator() { return null; }
+	
+	@Override
+	public void forEach(CONSUMER KEY_SUPER_GENERIC_TYPE action) {
+		Objects.requireNonNull(action);
+		if(first == last) return;
+		for(int i = 0,m=size();i<m;i++)
+			action.accept(array[(first + i) % array.length]);
+		clearAndTrim(0);
+	}
+	
+	@Override
+	public <E> void forEach(E input, BI_OBJECT_CONSUMER KKS_GENERIC_TYPE<E> action) {
+		Objects.requireNonNull(action);
+		if(first == last) return;
+		for(int i = 0,m=size();i<m;i++)
+			action.accept(array[(first + i) % array.length], input);
+		clearAndTrim(0);	
+	}
+	
+	@Override
+	public boolean matchesAny(PREDICATE KEY_GENERIC_TYPE filter) {
+		Objects.requireNonNull(filter);
+		for(int i = 0,m=size();i<m;i++) {
+			if(filter.TEST_VALUE(array[(first + i) % array.length])) return true;
+		}
+		return false;
+	}
+	
+	@Override
+	public boolean matchesNone(PREDICATE KEY_GENERIC_TYPE filter) {
+		Objects.requireNonNull(filter);
+		for(int i = 0,m=size();i<m;i++) {
+			if(filter.TEST_VALUE(array[(first + i) % array.length])) return false;
+		}
+		return true;
+	}
+	
+	@Override
+	public boolean matchesAll(PREDICATE KEY_GENERIC_TYPE filter) {
+		Objects.requireNonNull(filter);
+		for(int i = 0,m=size();i<m;i++) {
+			if(!filter.TEST_VALUE(array[(first + i) % array.length])) return false;
+		}
+		return true;
+	}
+	
+	@Override
+	public KEY_TYPE findFirst(PREDICATE KEY_GENERIC_TYPE filter) {
+		Objects.requireNonNull(filter);
+		for(int i = 0,m=size();i<m;i++) {
+			int index = (first + i) % array.length;
+			if(filter.TEST_VALUE(array[index])) {
+				KEY_TYPE data = array[index];
+				removeIndex(index);
+				return data;
+			}
+		}
+		return EMPTY_VALUE;
+	}
+	
+	@Override
+	public boolean trim(int size) {
+		int newSize = Math.max(size, size());
+		if(newSize >= array.length) return false;
+		KEY_TYPE[] newArray = NEW_KEY_ARRAY(newSize);
+		if(first <= last) System.arraycopy(array, first, newArray, 0, last - first);
+		else {
+			System.arraycopy(array, first, newArray, 0, array.length - first);
+			System.arraycopy(array, 0, newArray, array.length - first, last);
+		}
+		first = 0;
+		last = size();
+		array = newArray;
+		return true;
+	}
+	
+	/**
+	 * Trims the collection down to the requested size and clears all elements while doing so
+	 * @param size the amount of elements that should be allowed
+	 * @note this will enforce minimum size of the collection itself
+	 */
+	@Override
+	public void clearAndTrim(int size) {
+		int newSize = Math.max(MIN_CAPACITY, size);
+		if(array.length <= newSize) {
+			clear();
+			return;
+		}
+		first = last = 0;
+		array = NEW_KEY_ARRAY(newSize);
+	}
+	
+	@Override
+	public GENERIC_SPECIAL_KEY_BRACES<E> KEY_SPECIAL_TYPE[] TO_ARRAY(KEY_SPECIAL_TYPE[] input) {
+		if(input == null || input.length < size()) input = NEW_SPECIAL_KEY_ARRAY(size());
+		if (first <= last) System.arraycopy(array, first, input, 0, last - first);
+		else {
+			System.arraycopy(array, first, input, 0, array.length - first);
+			System.arraycopy(array, 0, input, array.length - first, last);
+		}
+		return input;
+	}
+	
+	protected void reduce() {
+		final int size = size();
+		if (array.length > MIN_CAPACITY && size <= array.length / 4) resize(size, array.length / 2);
+	}
+	
+	protected void expand() {
+		resize(array.length, (int)Math.min(MAX_ARRAY_SIZE, 2L * array.length));
+	}
+	
+	protected final void resize(int oldSize, int newSize) {
+		KEY_TYPE[] newArray = NEW_KEY_ARRAY(newSize);
+		if(first >= last) {
+			if(oldSize != 0)
+			{
+				System.arraycopy(array, first, newArray, 0, array.length - first);
+				System.arraycopy(array, 0, newArray, array.length - first, last);
+			}
+		}
+		else System.arraycopy(array, first, newArray, 0, last-first);
+		first = 0;
+		last = oldSize;
+		array = newArray;
+	}
+	
+	private class Iter implements ITERATOR KEY_GENERIC_TYPE
+	{
+		int index = first;
+		@Override
+		public boolean hasNext()
+		{
+			return index != last;
+		}
+
+		@Override
+		public KEY_TYPE NEXT() {
+			KEY_TYPE value = array[index];
+			removeIndex(index);
+			index = ++index % array.length;
+			return value;
+		}
+	}
 }

src/builder/resources/speiger/assets/collections/templates/queues/ArrayPriorityQueue.template

@@ -1,447 +1,359 @@
-package speiger.src.collections.PACKAGE.queues;
-
-import java.util.Arrays;
-import java.util.NoSuchElementException;
-#if TYPE_OBJECT
-import java.util.Comparator;
-import java.util.function.Consumer;
-import java.util.function.BiFunction;
-#endif
-import java.util.Objects;
-#if JDK_FUNCTION
-import java.util.function.PREDICATE;
-#endif
-
-import speiger.src.collections.PACKAGE.collections.COLLECTION;
-import speiger.src.collections.PACKAGE.collections.ITERATOR;
-#if !TYPE_OBJECT
-import speiger.src.collections.PACKAGE.functions.COMPARATOR;
-import speiger.src.collections.PACKAGE.functions.CONSUMER;
-#endif
-import speiger.src.collections.ints.functions.consumer.BI_FROM_INT_CONSUMER;
-import speiger.src.collections.objects.functions.consumer.BI_FROM_OBJECT_CONSUMER;
-#if !JDK_FUNCTION
-import speiger.src.collections.PACKAGE.functions.function.PREDICATE;
-#endif
-import speiger.src.collections.PACKAGE.functions.function.UNARY_OPERATOR;
-import speiger.src.collections.PACKAGE.utils.ARRAYS;
-import speiger.src.collections.utils.SanityChecks;
-
-/**
- * A Array Priority Queue, this is a very unoptimized implementation of the PriorityQueue for very specific usecases.
- * It allows for duplicated entries and works like {@link java.util.List#indexOf(Object)} search.
- * It is highly suggested to use HeapPriorityQueue otherwise, unless you know why you need this specific implementation
- * @Type(T)
- */
-public class ARRAY_PRIORITY_QUEUE KEY_GENERIC_TYPE extends ABSTRACT_PRIORITY_QUEUE KEY_GENERIC_TYPE
-{
-	/** The Backing Array */
-	protected transient KEY_TYPE[] array = EMPTY_KEY_ARRAY;
-	/** The Amount of elements stored within the array */
-	protected int size;
-	/** The Last known first index pointer */
-	protected int firstIndex = -1;
-	/** The Sorter of the Array */
-	protected COMPARATOR KEY_SUPER_GENERIC_TYPE comparator;
-	
-	/**
-	 * Default Constructor
-	 */
-	public ARRAY_PRIORITY_QUEUE() {
-		this(0, null);
-	}
-	
-	/**
-	 * Constructor using custom sorter
-	 * @param comp Comparator to sort the Array. Can be null
-	 */
-	public ARRAY_PRIORITY_QUEUE(COMPARATOR KEY_SUPER_GENERIC_TYPE comp) {
-		this(0, comp);
-	}
-	
-	/**
-	 * Constructor with a Min Capacity
-	 * @param size the initial capacity of the backing array
-	 * @throws IllegalStateException if the initial size is smaller 0
-	 */
-	public ARRAY_PRIORITY_QUEUE(int size) {
-		this(size, null);
-	}
-	
-	/**
-	 * Constructor with a Min Capacity and custom Sorter
-	 * @param size the initial capacity of the backing array
-	 * @param comp Comparator to sort the Array. Can be null
-	 * @throws IllegalStateException if the initial size is smaller 0
-	 */
-	public ARRAY_PRIORITY_QUEUE(int size, COMPARATOR KEY_SUPER_GENERIC_TYPE comp) {
-		if(size < 0) throw new IllegalAccessError("Size has to be 0 or positive");
-		if(size > 0) array = NEW_KEY_ARRAY(size);
-		comparator = comp;
-	}
-	
-	/**
-	 * Constructor using a initial array
-	 * @param array the Array that should be used
-	 */
-	public ARRAY_PRIORITY_QUEUE(KEY_TYPE[] array) {
-		this(array, array.length);
-	}
-	
-	/**
-	 * Constructor using a initial array
-	 * @param array the Array that should be used
-	 * @param size the amount of elements found within the array
-	 * @throws NegativeArraySizeException if size is smaller then 0
-	 */
-	public ARRAY_PRIORITY_QUEUE(KEY_TYPE[] array, int size) {
-		this.array = Arrays.copyOf(array, size);
-		this.size = size;
-	}
-	
-	/**
-	 * Constructor using a initial array and a custom sorter
-	 * @param array the Array that should be used
-	 * @param comp Comparator to sort the Array. Can be null
-	 */
-	public ARRAY_PRIORITY_QUEUE(KEY_TYPE[] array, COMPARATOR KEY_SUPER_GENERIC_TYPE comp) {
-		this(array, array.length, comp);
-	}
-	
-	/**
-	 * Constructor using a initial array and a custom sorter
-	 * @param array the Array that should be used
-	 * @param size the amount of elements found within the array
-	 * @param comp Comparator to sort the Array. Can be null
-	 * @throws NegativeArraySizeException if size is smaller then 0
-	 */
-	public ARRAY_PRIORITY_QUEUE(KEY_TYPE[] array, int size, COMPARATOR KEY_SUPER_GENERIC_TYPE comp) {
-		this.array = Arrays.copyOf(array, size);
-		this.size = size;
-		this.comparator = comp;
-	}
-	
-	/**
-	 * Constructor using a Collection
-	 * @param c the Collection that should be used
-	 */
-	public ARRAY_PRIORITY_QUEUE(COLLECTION KEY_GENERIC_TYPE c) {
-		array = CAST_KEY_ARRAY c.TO_ARRAY();
-		size = c.size();
-	}
-	
-	/**
-	 * Constructor using a Collection and a custom sorter
-	 * @param c the Collection that should be used
-	 * @param comp Comparator to sort the Array. Can be null
-	 */
-	public ARRAY_PRIORITY_QUEUE(COLLECTION KEY_GENERIC_TYPE c, COMPARATOR KEY_SUPER_GENERIC_TYPE comp) {
-		array = CAST_KEY_ARRAY c.TO_ARRAY();
-		size = c.size();
-		comparator = comp;
-	}
-	
-	/**
-	 * Wrapping method to help serialization
-	 * @param array the array that should be used
-	 * @Type(T)
-	 * @return a ArrayPriorityQueue containing the original input array
-	 */
-	public static GENERIC_KEY_BRACES ARRAY_PRIORITY_QUEUE KEY_GENERIC_TYPE wrap(KEY_TYPE[] array) { 
-		return wrap(array, array.length);
-	}
-	
-	/**
-	 * Wrapping method to help serialization
-	 * @param array the array that should be used
-	 * @param size the amount of elements within the array
-	 * @Type(T)
-	 * @return a ArrayPriorityQueue containing the original input array
-	 */
-	public static GENERIC_KEY_BRACES ARRAY_PRIORITY_QUEUE KEY_GENERIC_TYPE wrap(KEY_TYPE[] array, int size) {
-		ARRAY_PRIORITY_QUEUE KEY_GENERIC_TYPE queue = new ARRAY_PRIORITY_QUEUEBRACES();
-		queue.array = array;
-		queue.size = size;
-		return queue;
-	}
-	
-	/**
-	 * Wrapping method to help serialization, using a custom sorter
-	 * @param array the array that should be used
-	 * @param comp Comparator to sort the Array. Can be null
-	 * @Type(T)
-	 * @return a ArrayPriorityQueue containing the original input array
-	 */
-	public static GENERIC_KEY_BRACES ARRAY_PRIORITY_QUEUE KEY_GENERIC_TYPE wrap(KEY_TYPE[] array, COMPARATOR KEY_SUPER_GENERIC_TYPE comp) {
-		return wrap(array, array.length, comp);
-	}
-	
-	/**
-	 * Wrapping method to help serialization, using a custom sorter
-	 * @param array the array that should be used
-	 * @param size the amount of elements within the array
-	 * @param comp Comparator to sort the Array. Can be null
-	 * @Type(T)
-	 * @return a ArrayPriorityQueue containing the original input array
-	 */
-	public static GENERIC_KEY_BRACES ARRAY_PRIORITY_QUEUE KEY_GENERIC_TYPE wrap(KEY_TYPE[] array, int size, COMPARATOR KEY_SUPER_GENERIC_TYPE comp) {
-		ARRAY_PRIORITY_QUEUE KEY_GENERIC_TYPE queue = new ARRAY_PRIORITY_QUEUEBRACES(comp);
-		queue.array = array;
-		queue.size = size;
-		return queue;
-	}
-	
-	@Override
-	public void enqueue(KEY_TYPE e) {
-		if(size == array.length) array = Arrays.copyOf(array, (int)Math.max(Math.min((long)array.length + (long)(array.length >> 1), (long)SanityChecks.MAX_ARRAY_SIZE), size+1));
-		if(firstIndex != -1){
-			int compare = comparator == null ? COMPAREABLE_TO_KEY(e, array[firstIndex]) : comparator.compare(e, array[firstIndex]);
-			if(compare < 0) firstIndex = size;
-			else if(compare > 0) firstIndex = -1;
-		}
-		array[size++] = e;
-	}
-	
-	@Override
-	public KEY_TYPE dequeue() {
-		if(size <= 0) throw new NoSuchElementException();
-		int index = findFirstIndex();
-		KEY_TYPE value = array[index];
-		if(index != --size) System.arraycopy(array, index+1, array, index, size - index);
-#if TYPE_OBJECT
-		array[size] = null;
-#endif
-		firstIndex = -1;
-		return value;
-	}
-	
-	@Override
-	public KEY_TYPE first() {
-		if(isEmpty()) throw new NoSuchElementException();
-		if(firstIndex == -1) findFirstIndex();
-		return array[firstIndex];
-	}
-	
-	@Override
-	public KEY_TYPE peek(int index) {
-		if(index < 0 || index >= size) throw new NoSuchElementException();
-		return array[index];
-	}
-	
-	@Override
-	public boolean contains(KEY_TYPE e) {
-		for(int i = 0;i<size;i++)
-			if(KEY_EQUALS(e, array[i])) return true;
-		return false;
-	}
-	
-	@Override
-	public boolean removeFirst(KEY_TYPE e) {
-		for(int i = 0;i<size;i++)
-			if(KEY_EQUALS(e, array[i])) return removeIndex(i);
-		return false;
-	}
-	
-	@Override
-	public boolean removeLast(KEY_TYPE e) {
-		for(int i = size-1;i>=0;i--)
-			if(KEY_EQUALS(e, array[i])) return removeIndex(i);
-		return false;
-	}
-	
-	protected boolean removeIndex(int index) {
-		if(index != --size) System.arraycopy(array, index+1, array, index, size - index);
-#if TYPE_OBJECT
-		array[size] = null;
-#endif
-		if(index == firstIndex) firstIndex = -1;
-		else if(firstIndex != -1 && index >= firstIndex) firstIndex--;
-		return true;
-	}
-	
-	@Override
-	public void onChanged() {
-		firstIndex = -1;
-	}
-	
-	@Override
-	public int size() {
-		return size;
-	}
-	
-	@Override
-	public void clear() {
-#if TYPE_OBJECT
-		Arrays.fill(array, null);
-#endif
-		size = 0;
-	}
-	
-	@Override
-	public void forEach(CONSUMER KEY_SUPER_GENERIC_TYPE action) {
-		Objects.requireNonNull(action);
-		for(int i = 0,m=size;i<m;i++) action.accept(dequeue());
-	}
-	
-	@Override
-	public void forEachIndexed(BI_FROM_INT_CONSUMER KEY_GENERIC_TYPE action) {
-		Objects.requireNonNull(action);
-		for(int i = 0,m=size;i<m;i++) action.accept(i, dequeue());
-	}
-	
-	@Override
-	public <E> void forEach(E input, BI_FROM_OBJECT_CONSUMER KSK_GENERIC_TYPE<E> action) {
-		Objects.requireNonNull(action);
-		for(int i = 0,m=size;i<m;i++) action.accept(input, dequeue());
-	}
-	
-	@Override
-	public boolean matchesAny(PREDICATE KEY_GENERIC_TYPE filter) {
-		Objects.requireNonNull(filter);
-		for(int i = 0;i<size;i++) {
-			if(filter.test(array[i])) return true;
-		}
-		return false;
-	}
-	
-	@Override
-	public boolean matchesNone(PREDICATE KEY_GENERIC_TYPE filter) {
-		Objects.requireNonNull(filter);
-		for(int i = 0;i<size;i++) {
-			if(filter.test(array[i])) return false;
-		}
-		return true;
-	}
-	
-	@Override
-	public boolean matchesAll(PREDICATE KEY_GENERIC_TYPE filter) {
-		Objects.requireNonNull(filter);
-		for(int i = 0;i<size;i++) {
-			if(!filter.test(array[i])) return false;
-		}
-		return true;
-	}
-	
-#if !TYPE_OBJECT
-	@Override
-	public KEY_TYPE reduce(KEY_TYPE identity, UNARY_OPERATOR KEY_KEY_GENERIC_TYPE operator) {
-		Objects.requireNonNull(operator);
-		KEY_TYPE state = identity;
-		for(int i = 0;i<size;i++) {
-			state = operator.APPLY_VALUE(state, array[i]);
-		}
-		return state;
-	}
-	
-#else
-	@Override
-	public <KEY_SPECIAL_TYPE> KEY_SPECIAL_TYPE reduce(KEY_SPECIAL_TYPE identity, BiFunction<KEY_SPECIAL_TYPE, KEY_TYPE, KEY_SPECIAL_TYPE> operator) {
-		Objects.requireNonNull(operator);
-		KEY_SPECIAL_TYPE state = identity;
-		for(int i = 0;i<size;i++) {
-			state = operator.APPLY_VALUE(state, array[i]);
-		}
-		return state;
-	}
-	
-#endif
-	@Override
-	public KEY_TYPE reduce(UNARY_OPERATOR KEY_KEY_GENERIC_TYPE operator) {
-		Objects.requireNonNull(operator);
-		KEY_TYPE state = EMPTY_VALUE;
-		boolean empty = true;
-		for(int i = 0;i<size;i++) {
-			if(empty) {
-				empty = false;
-				state = array[i];
-				continue;
-			}
-			state = operator.APPLY_VALUE(state, array[i]);
-		}
-		return state;
-	}
-	
-	@Override
-	public KEY_TYPE findFirst(PREDICATE KEY_GENERIC_TYPE filter) {
-		Objects.requireNonNull(filter);
-		for(int i = 0;i<size;i++) {
-			if(filter.test(array[i])) {
-				KEY_TYPE data = array[i];
-				removeIndex(i);
-				return data;
-			}
-		}
-		return EMPTY_VALUE;
-	}
-	
-	@Override
-	public int count(PREDICATE KEY_GENERIC_TYPE filter) {
-		Objects.requireNonNull(filter);
-		int result = 0;
-		for(int i = 0;i<size;i++) {
-			if(filter.test(array[i])) result++;
-		}
-		return result;
-	}
-	
-	@Override
-	public ITERATOR KEY_GENERIC_TYPE iterator() {
-		return new Iter();
-	}
-	
-	@Override
-	public ARRAY_PRIORITY_QUEUE KEY_GENERIC_TYPE copy() {
-		ARRAY_PRIORITY_QUEUE KEY_GENERIC_TYPE queue = new ARRAY_PRIORITY_QUEUEBRACES();
-		queue.firstIndex = firstIndex;
-		queue.size = size;
-		queue.comparator = comparator;
-		queue.array = Arrays.copyOf(array, array.length);
-		return queue;
-	}
-	
-	@Override
-	public COMPARATOR KEY_SUPER_GENERIC_TYPE comparator() {
-		return comparator;
-	}
-	
-	@Override
-	public GENERIC_SPECIAL_KEY_BRACES<E> KEY_SPECIAL_TYPE[] TO_ARRAY(KEY_SPECIAL_TYPE[] input) {
-		if(input == null || input.length < size()) input = NEW_SPECIAL_KEY_ARRAY(size());
-		System.arraycopy(array, 0, input, 0, size());
-		return input;
-	}
-	
-	protected int findFirstIndex() {
-		if(firstIndex == -1) {
-			int index = size-1;
-			KEY_TYPE value = array[index];
-			if(comparator == null) {
-				for(int i = index;i>=0;i--) {
-					if(COMPAREABLE_TO_KEY(array[i], value) < 0) 
-						value = array[index = i];
-				}
-			}
-			else {
-				for(int i = index;i>=0;i--) {
-					if(comparator.compare(array[i], value) < 0) 
-						value = array[index = i];
-				}
-			}
-			firstIndex = index;
-		}
-		return firstIndex;
-	}
-	
-	private class Iter implements ITERATOR KEY_GENERIC_TYPE {
-		@Override
-		public boolean hasNext() {
-			return !isEmpty();
-		}
-		
-		@Override
-		public KEY_TYPE NEXT() {
-			if(!hasNext()) throw new NoSuchElementException();
-			return dequeue();
-		}
-	}
+package speiger.src.collections.PACKAGE.queues;
+
+import java.util.Arrays;
+import java.util.NoSuchElementException;
+#if TYPE_OBJECT
+import java.util.Comparator;
+import java.util.function.Consumer;
+#endif
+import java.util.Objects;
+
+import speiger.src.collections.PACKAGE.collections.COLLECTION;
+import speiger.src.collections.PACKAGE.collections.ITERATOR;
+#if !TYPE_OBJECT
+import speiger.src.collections.PACKAGE.functions.COMPARATOR;
+import speiger.src.collections.PACKAGE.functions.CONSUMER;
+#endif
+import speiger.src.collections.PACKAGE.functions.consumer.BI_OBJECT_CONSUMER;
+import speiger.src.collections.PACKAGE.functions.function.PREDICATE;
+import speiger.src.collections.PACKAGE.utils.ARRAYS;
+
+/**
+ * A Array Priority Queue, this is a very unoptimized implementation of the PriorityQueue for very specific usecases.
+ * It allows for duplicated entries and works like {@link java.util.List#indexOf(Object)} search.
+ * It is highly suggested to use HeapPriorityQueue otherwise, unless you know why you need this specific implementation
+ * @Type(T)
+ */
+public class ARRAY_PRIORITY_QUEUE KEY_GENERIC_TYPE implements PRIORITY_QUEUE KEY_GENERIC_TYPE
+{
+	/** The Backing Array */
+	protected transient KEY_TYPE[] array = EMPTY_KEY_ARRAY;
+	/** The Amount of elements stored within the array */
+	protected int size;
+	/** The Last known first index pointer */
+	protected int firstIndex = -1;
+	/** The Sorter of the Array */
+	protected COMPARATOR KEY_SUPER_GENERIC_TYPE comparator;
+	
+	/**
+	 * Default Constructor
+	 */
+	public ARRAY_PRIORITY_QUEUE() {
+		this(0, null);
+	}
+	
+	/**
+	 * Constructor using custom sorter
+	 * @param comp Comparator to sort the Array. Can be null
+	 */
+	public ARRAY_PRIORITY_QUEUE(COMPARATOR KEY_SUPER_GENERIC_TYPE comp) {
+		this(0, comp);
+	}
+	
+	/**
+	 * Constructor with a Min Capacity
+	 * @param size the initial capacity of the backing array
+	 * @throws IllegalStateException if the initial size is smaller 0
+	 */
+	public ARRAY_PRIORITY_QUEUE(int size) {
+		this(size, null);
+	}
+	
+	/**
+	 * Constructor with a Min Capacity and custom Sorter
+	 * @param size the initial capacity of the backing array
+	 * @param comp Comparator to sort the Array. Can be null
+	 * @throws IllegalStateException if the initial size is smaller 0
+	 */
+	public ARRAY_PRIORITY_QUEUE(int size, COMPARATOR KEY_SUPER_GENERIC_TYPE comp) {
+		if(size < 0) throw new IllegalAccessError("Size has to be 0 or positive");
+		if(size > 0) array = NEW_KEY_ARRAY(size);
+		this.size = size;
+		comparator = comp;
+	}
+	
+	/**
+	 * Constructor using a initial array
+	 * @param array the Array that should be used
+	 */
+	public ARRAY_PRIORITY_QUEUE(KEY_TYPE[] array) {
+		this(array, array.length);
+	}
+	
+	/**
+	 * Constructor using a initial array
+	 * @param array the Array that should be used
+	 * @param size the amount of elements found within the array
+	 * @throws NegativeArraySizeException if size is smaller then 0
+	 */
+	public ARRAY_PRIORITY_QUEUE(KEY_TYPE[] array, int size) {
+		this.array = Arrays.copyOf(array, size);
+		this.size = size;
+	}
+	
+	/**
+	 * Constructor using a initial array and a custom sorter
+	 * @param array the Array that should be used
+	 * @param comp Comparator to sort the Array. Can be null
+	 */
+	public ARRAY_PRIORITY_QUEUE(KEY_TYPE[] array, COMPARATOR KEY_SUPER_GENERIC_TYPE comp) {
+		this(array, array.length, comp);
+	}
+	
+	/**
+	 * Constructor using a initial array and a custom sorter
+	 * @param array the Array that should be used
+	 * @param size the amount of elements found within the array
+	 * @param comp Comparator to sort the Array. Can be null
+	 * @throws NegativeArraySizeException if size is smaller then 0
+	 */
+	public ARRAY_PRIORITY_QUEUE(KEY_TYPE[] array, int size, COMPARATOR KEY_SUPER_GENERIC_TYPE comp) {
+		this.array = Arrays.copyOf(array, size);
+		this.size = size;
+		this.comparator = comp;
+	}
+	
+	/**
+	 * Constructor using a Collection
+	 * @param c the Collection that should be used
+	 */
+	public ARRAY_PRIORITY_QUEUE(COLLECTION KEY_GENERIC_TYPE c) {
+		array = CAST_KEY_ARRAY c.TO_ARRAY();
+		size = c.size();
+	}
+	
+	/**
+	 * Constructor using a Collection and a custom sorter
+	 * @param c the Collection that should be used
+	 * @param comp Comparator to sort the Array. Can be null
+	 */
+	public ARRAY_PRIORITY_QUEUE(COLLECTION KEY_GENERIC_TYPE c, COMPARATOR KEY_SUPER_GENERIC_TYPE comp) {
+		array = CAST_KEY_ARRAY c.TO_ARRAY();
+		size = c.size();
+		comparator = comp;
+	}
+	
+	/**
+	 * Wrapping method to help serialization
+	 * @param array the array that should be used
+	 * @Type(T)
+	 * @return a ArrayPriorityQueue containing the original input array
+	 */
+	public static GENERIC_KEY_BRACES ARRAY_PRIORITY_QUEUE KEY_GENERIC_TYPE wrap(KEY_TYPE[] array) { 
+		return wrap(array, array.length);
+	}
+	
+	/**
+	 * Wrapping method to help serialization
+	 * @param array the array that should be used
+	 * @param size the amount of elements within the array
+	 * @Type(T)
+	 * @return a ArrayPriorityQueue containing the original input array
+	 */
+	public static GENERIC_KEY_BRACES ARRAY_PRIORITY_QUEUE KEY_GENERIC_TYPE wrap(KEY_TYPE[] array, int size) {
+		ARRAY_PRIORITY_QUEUE KEY_GENERIC_TYPE queue = new ARRAY_PRIORITY_QUEUEBRACES();
+		queue.array = array;
+		queue.size = size;
+		return queue;
+	}
+	
+	/**
+	 * Wrapping method to help serialization, using a custom sorter
+	 * @param array the array that should be used
+	 * @param comp Comparator to sort the Array. Can be null
+	 * @Type(T)
+	 * @return a ArrayPriorityQueue containing the original input array
+	 */
+	public static GENERIC_KEY_BRACES ARRAY_PRIORITY_QUEUE KEY_GENERIC_TYPE wrap(KEY_TYPE[] array, COMPARATOR KEY_SUPER_GENERIC_TYPE comp) {
+		return wrap(array, array.length, comp);
+	}
+	
+	/**
+	 * Wrapping method to help serialization, using a custom sorter
+	 * @param array the array that should be used
+	 * @param size the amount of elements within the array
+	 * @param comp Comparator to sort the Array. Can be null
+	 * @Type(T)
+	 * @return a ArrayPriorityQueue containing the original input array
+	 */
+	public static GENERIC_KEY_BRACES ARRAY_PRIORITY_QUEUE KEY_GENERIC_TYPE wrap(KEY_TYPE[] array, int size, COMPARATOR KEY_SUPER_GENERIC_TYPE comp) {
+		ARRAY_PRIORITY_QUEUE KEY_GENERIC_TYPE queue = new ARRAY_PRIORITY_QUEUEBRACES(comp);
+		queue.array = array;
+		queue.size = size;
+		return queue;
+	}
+	
+	@Override
+	public void enqueue(KEY_TYPE e) {
+		if(size == array.length) array = Arrays.copyOf(array, size+1);
+		if(firstIndex != -1){
+			int compare = comparator == null ? COMPAREABLE_TO_KEY(e, array[firstIndex]) : comparator.compare(e, array[firstIndex]);
+			if(compare < 0) firstIndex = size;
+			else if(compare > 0) firstIndex = -1;
+		}
+		array[size++] = e;
+	}
+	
+	@Override
+	public KEY_TYPE dequeue() {
+		if(size <= 0) throw new NoSuchElementException();
+		int index = findFirstIndex();
+		KEY_TYPE value = array[index];
+		if(index != --size) System.arraycopy(array, index+1, array, index, size - index);
+#if TYPE_OBJECT
+		array[size] = null;
+#endif
+		firstIndex = -1;
+		return value;
+	}
+	
+	@Override
+	public KEY_TYPE peek(int index) {
+		if(index < 0 || index >= size) throw new NoSuchElementException();
+		return array[index];
+	}
+	
+	@Override
+	public boolean removeFirst(KEY_TYPE e) {
+		for(int i = 0;i<size;i++)
+			if(KEY_EQUALS(e, array[i])) return removeIndex(i);
+		return false;
+	}
+	
+	@Override
+	public boolean removeLast(KEY_TYPE e) {
+		for(int i = size-1;i>=0;i--)
+			if(KEY_EQUALS(e, array[i])) return removeIndex(i);
+		return false;
+	}
+	
+	protected boolean removeIndex(int index) {
+		if(index != --size) System.arraycopy(array, index+1, array, index, size - index);
+#if TYPE_OBJECT
+		array[size] = null;
+#endif
+		if(index == firstIndex) firstIndex = -1;
+		else if(firstIndex != -1 && index >= firstIndex) firstIndex--;
+		return true;
+	}
+	
+	@Override
+	public void onChanged() {
+		firstIndex = -1;
+	}
+	
+	@Override
+	public int size() {
+		return size;
+	}
+	
+	@Override
+	public void clear() {
+#if TYPE_OBJECT
+		Arrays.fill(array, null);
+#endif
+		size = 0;
+	}
+	
+	@Override
+	public void forEach(CONSUMER KEY_SUPER_GENERIC_TYPE action) {
+		Objects.requireNonNull(action);
+		for(int i = 0,m=size;i<m;i++) action.accept(dequeue());
+	}
+	
+	@Override
+	public <E> void forEach(E input, BI_OBJECT_CONSUMER KKS_GENERIC_TYPE<E> action) {
+		Objects.requireNonNull(action);
+		for(int i = 0,m=size;i<m;i++) action.accept(dequeue(), input);
+	}
+	
+	@Override
+	public boolean matchesAny(PREDICATE KEY_GENERIC_TYPE filter) {
+		Objects.requireNonNull(filter);
+		for(int i = 0;i<size;i++) {
+			if(filter.TEST_VALUE(array[i])) return true;
+		}
+		return false;
+	}
+	
+	@Override
+	public boolean matchesNone(PREDICATE KEY_GENERIC_TYPE filter) {
+		Objects.requireNonNull(filter);
+		for(int i = 0;i<size;i++) {
+			if(filter.TEST_VALUE(array[i])) return false;
+		}
+		return true;
+	}
+	
+	@Override
+	public boolean matchesAll(PREDICATE KEY_GENERIC_TYPE filter) {
+		Objects.requireNonNull(filter);
+		for(int i = 0;i<size;i++) {
+			if(!filter.TEST_VALUE(array[i])) return false;
+		}
+		return true;
+	}
+	
+	@Override
+	public KEY_TYPE findFirst(PREDICATE KEY_GENERIC_TYPE filter) {
+		Objects.requireNonNull(filter);
+		for(int i = 0;i<size;i++) {
+			if(filter.TEST_VALUE(array[i])) {
+				KEY_TYPE data = array[i];
+				removeIndex(i);
+				return data;
+			}
+		}
+		return EMPTY_VALUE;
+	}
+	
+	@Override
+	public ITERATOR KEY_GENERIC_TYPE iterator() {
+		return new Iter();
+	}
+	
+	@Override
+	public COMPARATOR KEY_SUPER_GENERIC_TYPE comparator() {
+		return comparator;
+	}
+	
+	@Override
+	public GENERIC_SPECIAL_KEY_BRACES<E> KEY_SPECIAL_TYPE[] TO_ARRAY(KEY_SPECIAL_TYPE[] input) {
+		if(input == null || input.length < size()) input = NEW_SPECIAL_KEY_ARRAY(size());
+		System.arraycopy(array, 0, input, 0, size());
+		return input;
+	}
+	
+	protected int findFirstIndex() {
+		if(firstIndex == -1) {
+			int index = size-1;
+			KEY_TYPE value = array[index];
+			if(comparator == null) {
+				for(int i = index;i>=0;i--) {
+					if(COMPAREABLE_TO_KEY(array[i], value) < 0) 
+						value = array[index = i];
+				}
+			}
+			else {
+				for(int i = index;i>=0;i--) {
+					if(comparator.compare(array[i], value) < 0) 
+						value = array[index = i];
+				}
+			}
+			firstIndex = index;
+		}
+		return firstIndex;
+	}
+	
+	private class Iter implements ITERATOR KEY_GENERIC_TYPE {
+		@Override
+		public boolean hasNext() {
+			return !isEmpty();
+		}
+		
+		@Override
+		public KEY_TYPE NEXT() {
+			return dequeue();
+		}
+	}
 }

src/builder/resources/speiger/assets/collections/templates/queues/HeapPriorityQueue.template

@@ -1,415 +1,335 @@
-package speiger.src.collections.PACKAGE.queues;
-
-import java.util.Arrays;
-import java.util.NoSuchElementException;
-#if TYPE_OBJECT
-import java.util.Comparator;
-import java.util.function.Consumer;
-import java.util.function.BiFunction;
-#endif
-import java.util.Objects;
-#if JDK_FUNCTION
-import java.util.function.PREDICATE;
-#endif
-
-import speiger.src.collections.PACKAGE.collections.COLLECTION;
-import speiger.src.collections.PACKAGE.collections.ITERATOR;
-#if !TYPE_OBJECT
-import speiger.src.collections.PACKAGE.functions.COMPARATOR;
-import speiger.src.collections.PACKAGE.functions.CONSUMER;
-#endif
-import speiger.src.collections.ints.functions.consumer.BI_FROM_INT_CONSUMER;
-import speiger.src.collections.objects.functions.consumer.BI_FROM_OBJECT_CONSUMER;
-#if !JDK_FUNCTION
-import speiger.src.collections.PACKAGE.functions.function.PREDICATE;
-#endif
-import speiger.src.collections.PACKAGE.functions.function.UNARY_OPERATOR;
-import speiger.src.collections.PACKAGE.utils.ARRAYS;
-import speiger.src.collections.utils.SanityChecks;
-
-/**
- * A Simple Heap base Priority Queue implementation
- * It is a ArrayBased Alternative to TreeSets that has less object allocations
- * @Type(T)
- */
-public class HEAP_PRIORITY_QUEUE KEY_GENERIC_TYPE extends ABSTRACT_PRIORITY_QUEUE KEY_GENERIC_TYPE
-{
-	/** The Backing Array */
-	protected transient KEY_TYPE[] array = EMPTY_KEY_ARRAY;
-	/** The Amount of elements stored within the array */
-	protected int size;
-	/** The Sorter of the Array */
-	protected COMPARATOR KEY_SUPER_GENERIC_TYPE comparator;
-	
-	/**
-	 * Default Constructor
-	 */
-	public HEAP_PRIORITY_QUEUE() {
-		this(0, null);
-	}
-	
-	/**
-	 * Constructor using custom sorter
-	 * @param comp Comparator to sort the Array. Can be null
-	 */
-	public HEAP_PRIORITY_QUEUE(COMPARATOR KEY_SUPER_GENERIC_TYPE comp) {
-		this(0, comp);
-	}
-	
-	/**
-	 * Constructor with a Min Capacity
-	 * @param size the initial capacity of the backing array
-	 * @throws IllegalStateException if the initial size is smaller 0
-	 */
-	public HEAP_PRIORITY_QUEUE(int size) {
-		this(size, null);
-	}
-	
-	/**
-	 * Constructor with a Min Capacity and custom Sorter
-	 * @param size the initial capacity of the backing array
-	 * @param comp Comparator to sort the Array. Can be null
-	 * @throws IllegalStateException if the initial size is smaller 0
-	 */
-	public HEAP_PRIORITY_QUEUE(int size, COMPARATOR KEY_SUPER_GENERIC_TYPE comp) {
-		if(size > 0) array = NEW_KEY_ARRAY(size);
-		comparator = comp;
-	}
-	
-	/**
-	 * Constructor using a initial array
-	 * @param array the Array that should be used
-	 */
-	public HEAP_PRIORITY_QUEUE(KEY_TYPE[] array) {
-		this(array, array.length);
-	}
-	
-	/**
-	 * Constructor using a initial array
-	 * @param array the Array that should be used
-	 * @param size the amount of elements found within the array
-	 * @throws NegativeArraySizeException if size is smaller then 0
-	 */
-	public HEAP_PRIORITY_QUEUE(KEY_TYPE[] array, int size) {
-		this.array = Arrays.copyOf(array, size);
-		this.size = size;
-		ARRAYS.heapify(array, size, null);
-	}
-	
-	/**
-	 * Constructor using a initial array and a custom sorter
-	 * @param array the Array that should be used
-	 * @param comp Comparator to sort the Array. Can be null
-	 */
-	public HEAP_PRIORITY_QUEUE(KEY_TYPE[] array, COMPARATOR KEY_SUPER_GENERIC_TYPE comp) {
-		this(array, array.length, comp);
-	}
-	
-	/**
-	 * Constructor using a initial array and a custom sorter
-	 * @param array the Array that should be used
-	 * @param size the amount of elements found within the array
-	 * @param comp Comparator to sort the Array. Can be null
-	 * @throws NegativeArraySizeException if size is smaller then 0
-	 */
-	public HEAP_PRIORITY_QUEUE(KEY_TYPE[] array, int size, COMPARATOR KEY_SUPER_GENERIC_TYPE comp) {
-		this.array = Arrays.copyOf(array, size);
-		this.size = size;
-		comparator = comp;
-		ARRAYS.heapify(array, size, comp);
-	}
-	
-	/**
-	 * Constructor using a Collection
-	 * @param c the Collection that should be used
-	 */
-	public HEAP_PRIORITY_QUEUE(COLLECTION KEY_GENERIC_TYPE c) {
-		array = CAST_KEY_ARRAY c.TO_ARRAY();
-		size = c.size();
-		ARRAYS.heapify(array, size, null);
-	}
-	
-	/**
-	 * Constructor using a Collection and a custom sorter
-	 * @param c the Collection that should be used
-	 * @param comp Comparator to sort the Array. Can be null
-	 */
-	public HEAP_PRIORITY_QUEUE(COLLECTION KEY_GENERIC_TYPE c, COMPARATOR KEY_SUPER_GENERIC_TYPE comp) {
-		array = CAST_KEY_ARRAY c.TO_ARRAY();
-		size = c.size();
-		comparator = comp;
-		ARRAYS.heapify(array, size, comp);
-	}
-	
-	/**
-	 * Wrapping method to help serialization
-	 * @param array the array that should be used
-	 * @Type(T)
-	 * @return a HeapPriorityQueue containing the original input array
-	 */
-	public static GENERIC_KEY_BRACES HEAP_PRIORITY_QUEUE KEY_GENERIC_TYPE wrap(KEY_TYPE[] array) { 
-		return wrap(array, array.length);
-	}
-	
-	/**
-	 * Wrapping method to help serialization
-	 * @param array the array that should be used
-	 * @param size the amount of elements within the array
-	 * @Type(T)
-	 * @return a HeapPriorityQueue containing the original input array
-	 */
-	public static GENERIC_KEY_BRACES HEAP_PRIORITY_QUEUE KEY_GENERIC_TYPE wrap(KEY_TYPE[] array, int size) {
-		HEAP_PRIORITY_QUEUE KEY_GENERIC_TYPE queue = new HEAP_PRIORITY_QUEUEBRACES();
-		queue.array = array;
-		queue.size = size;
-		ARRAYS.heapify(array, size, null);
-		return queue;
-	}
-	
-	/**
-	 * Wrapping method to help serialization, using a custom sorter
-	 * @param array the array that should be used
-	 * @param comp Comparator to sort the Array. Can be null
-	 * @Type(T)
-	 * @return a HeapPriorityQueue containing the original input array
-	 */
-	public static GENERIC_KEY_BRACES HEAP_PRIORITY_QUEUE KEY_GENERIC_TYPE wrap(KEY_TYPE[] array, COMPARATOR KEY_SUPER_GENERIC_TYPE comp) {
-		return wrap(array, array.length, comp);
-	}
-	
-	/**
-	 * Wrapping method to help serialization, using a custom sorter
-	 * @param array the array that should be used
-	 * @param size the amount of elements within the array
-	 * @param comp Comparator to sort the Array. Can be null
-	 * @Type(T)
-	 * @return a HeapPriorityQueue containing the original input array
-	 */
-	public static GENERIC_KEY_BRACES HEAP_PRIORITY_QUEUE KEY_GENERIC_TYPE wrap(KEY_TYPE[] array, int size, COMPARATOR KEY_SUPER_GENERIC_TYPE comp) {
-		HEAP_PRIORITY_QUEUE KEY_GENERIC_TYPE queue = new HEAP_PRIORITY_QUEUEBRACES(comp);
-		queue.array = array;
-		queue.size = size;
-		ARRAYS.heapify(array, size, comp);
-		return queue;
-	}
-	
-	@Override
-	public int size() {
-		return size;
-	}
-	
-	@Override
-	public void clear() {
-#if TYPE_OBJECT
-		Arrays.fill(array, null);
-#endif
-		size = 0;
-	}
-	
-	@Override
-	public ITERATOR KEY_GENERIC_TYPE iterator() {
-		return new Iter();
-	}
-	
-	@Override
-	public void enqueue(KEY_TYPE e) {
-		if(size == array.length) array = Arrays.copyOf(array, (int)Math.max(Math.min((long)array.length + (long)(array.length >> 1), (long)SanityChecks.MAX_ARRAY_SIZE), size+1));
-		array[size++] = e;
-		ARRAYS.shiftUp(array, size-1, comparator);
-	}
-	
-	@Override
-	public KEY_TYPE dequeue() {
-		if(size <= 0) throw new NoSuchElementException();
-		KEY_TYPE value = array[0];
-		array[0] = array[--size];
-#if TYPE_OBJECT
-		array[size] = null;
-#endif
-		if(size != 0) ARRAYS.shiftDown(array, size, 0, comparator);
-		return value;
-	}
-	
-	@Override
-	public KEY_TYPE peek(int index) {
-		if(index < 0 || index >= size) throw new NoSuchElementException();
-		return array[index];
-	}
-	
-	@Override
-	public boolean contains(KEY_TYPE e) {
-		for(int i = 0;i<size;i++)
-			if(KEY_EQUALS(e, array[i])) return true;
-		return false;
-	}
-	
-	@Override
-	public boolean removeFirst(KEY_TYPE e) {
-		for(int i = 0;i<size;i++)
-			if(KEY_EQUALS(e, array[i])) return removeIndex(i);
-		return false;
-	}
-	
-	@Override
-	public boolean removeLast(KEY_TYPE e) {
-		for(int i = size-1;i>=0;i--)
-			if(KEY_EQUALS(e, array[i])) return removeIndex(i);
-		return false;
-	}
-	
-	@Override
-	public void forEach(CONSUMER KEY_SUPER_GENERIC_TYPE action) {
-		Objects.requireNonNull(action);
-		for(int i = 0,m=size;i<m;i++) action.accept(dequeue());
-	}
-	
-	@Override
-	public void forEachIndexed(BI_FROM_INT_CONSUMER KEY_GENERIC_TYPE action) {
-		Objects.requireNonNull(action);
-		for(int i = 0,m=size;i<m;i++) action.accept(i, dequeue());
-	}
-	
-	@Override
-	public <E> void forEach(E input, BI_FROM_OBJECT_CONSUMER KSK_GENERIC_TYPE<E> action) {
-		Objects.requireNonNull(action);
-		for(int i = 0,m=size;i<m;i++) action.accept(input, dequeue());
-	}
-	
-	@Override
-	public boolean matchesAny(PREDICATE KEY_GENERIC_TYPE filter) {
-		Objects.requireNonNull(filter);
-		for(int i = 0;i<size;i++) {
-			if(filter.test(array[i])) return true;
-		}
-		return false;
-	}
-	
-	@Override
-	public boolean matchesNone(PREDICATE KEY_GENERIC_TYPE filter) {
-		Objects.requireNonNull(filter);
-		for(int i = 0;i<size;i++) {
-			if(filter.test(array[i])) return false;
-		}
-		return true;
-	}
-	
-	@Override
-	public boolean matchesAll(PREDICATE KEY_GENERIC_TYPE filter) {
-		Objects.requireNonNull(filter);
-		for(int i = 0;i<size;i++) {
-			if(!filter.test(array[i])) return false;
-		}
-		return true;
-	}
-	
-#if !TYPE_OBJECT
-	@Override
-	public KEY_TYPE reduce(KEY_TYPE identity, UNARY_OPERATOR KEY_KEY_GENERIC_TYPE operator) {
-		Objects.requireNonNull(operator);
-		KEY_TYPE state = identity;
-		for(int i = 0;i<size;i++) {
-			state = operator.APPLY_VALUE(state, array[i]);
-		}
-		return state;
-	}
-	
-#else
-	@Override
-	public <KEY_SPECIAL_TYPE> KEY_SPECIAL_TYPE reduce(KEY_SPECIAL_TYPE identity, BiFunction<KEY_SPECIAL_TYPE, KEY_TYPE, KEY_SPECIAL_TYPE> operator) {
-		Objects.requireNonNull(operator);
-		KEY_SPECIAL_TYPE state = identity;
-		for(int i = 0;i<size;i++) {
-			state = operator.APPLY_VALUE(state, array[i]);
-		}
-		return state;
-	}
-	
-#endif
-	@Override
-	public KEY_TYPE reduce(UNARY_OPERATOR KEY_KEY_GENERIC_TYPE operator) {
-		Objects.requireNonNull(operator);
-		KEY_TYPE state = EMPTY_VALUE;
-		boolean empty = true;
-		for(int i = 0;i<size;i++) {
-			if(empty) {
-				empty = false;
-				state = array[i];
-				continue;
-			}
-			state = operator.APPLY_VALUE(state, array[i]);
-		}
-		return state;
-	}
-	
-	@Override
-	public KEY_TYPE findFirst(PREDICATE KEY_GENERIC_TYPE filter) {
-		Objects.requireNonNull(filter);
-		for(int i = 0;i<size;i++) {
-			if(filter.test(array[i])) {
-				KEY_TYPE data = array[i];
-				removeIndex(i);
-				return data;
-			}
-		}
-		return EMPTY_VALUE;
-	}
-	
-	@Override
-	public int count(PREDICATE KEY_GENERIC_TYPE filter) {
-		Objects.requireNonNull(filter);
-		int result = 0;
-		for(int i = 0;i<size;i++) {
-			if(filter.test(array[i])) result++;
-		}
-		return result;
-	}
-	
-	protected boolean removeIndex(int index) {
-		array[index] = array[--size];
-#if TYPE_OBJECT
-		array[size] = null;
-#endif
-		if(size != index) ARRAYS.shiftDown(array, size, index, comparator);
-		return true;
-	}
-	
-	@Override
-	public void onChanged() {
-		if(size <= 0) return;
-		ARRAYS.shiftDown(array, size, 0, comparator);
-	}
-	
-	@Override
-	public HEAP_PRIORITY_QUEUE KEY_GENERIC_TYPE copy() {
-		HEAP_PRIORITY_QUEUE KEY_GENERIC_TYPE queue = new HEAP_PRIORITY_QUEUEBRACES();
-		queue.size = size;
-		queue.comparator = comparator;
-		queue.array = Arrays.copyOf(array, array.length);
-		return queue;
-	}
-	
-	@Override
-	public COMPARATOR KEY_SUPER_GENERIC_TYPE comparator() {
-		return comparator;
-	}
-	
-	@Override
-	public GENERIC_SPECIAL_KEY_BRACES<E> KEY_SPECIAL_TYPE[] TO_ARRAY(KEY_SPECIAL_TYPE[] input) {
-		if(input == null || input.length < size()) input = NEW_SPECIAL_KEY_ARRAY(size());
-		System.arraycopy(array, 0, input, 0, size());
-		return input;
-	}
-	
-	private class Iter implements ITERATOR KEY_GENERIC_TYPE {
-		@Override
-		public boolean hasNext() {
-			return !isEmpty();
-		}
-		
-		@Override
-		public KEY_TYPE NEXT() {
-			if(!hasNext()) throw new NoSuchElementException();
-			return dequeue();
-		}
-	}
+package speiger.src.collections.PACKAGE.queues;
+
+import java.util.Arrays;
+import java.util.NoSuchElementException;
+#if TYPE_OBJECT
+import java.util.Comparator;
+import java.util.function.Consumer;
+#endif
+import java.util.Objects;
+
+import speiger.src.collections.PACKAGE.collections.COLLECTION;
+import speiger.src.collections.PACKAGE.collections.ITERATOR;
+#if !TYPE_OBJECT
+import speiger.src.collections.PACKAGE.functions.COMPARATOR;
+import speiger.src.collections.PACKAGE.functions.CONSUMER;
+#endif
+import speiger.src.collections.PACKAGE.functions.consumer.BI_OBJECT_CONSUMER;
+import speiger.src.collections.PACKAGE.functions.function.PREDICATE;
+import speiger.src.collections.PACKAGE.utils.ARRAYS;
+
+/**
+ * A Simple Heap base Priority Queue implementation
+ * It is a ArrayBased Alternative to TreeSets that has less object allocations
+ * @Type(T)
+ */
+public class HEAP_PRIORITY_QUEUE KEY_GENERIC_TYPE implements PRIORITY_QUEUE KEY_GENERIC_TYPE
+{
+	/** The Backing Array */
+	protected transient KEY_TYPE[] array = EMPTY_KEY_ARRAY;
+	/** The Amount of elements stored within the array */
+	protected int size;
+	/** The Sorter of the Array */
+	protected COMPARATOR KEY_SUPER_GENERIC_TYPE comparator;
+	
+	/**
+	 * Default Constructor
+	 */
+	public HEAP_PRIORITY_QUEUE() {
+		this(0, null);
+	}
+	
+	/**
+	 * Constructor using custom sorter
+	 * @param comp Comparator to sort the Array. Can be null
+	 */
+	public HEAP_PRIORITY_QUEUE(COMPARATOR KEY_SUPER_GENERIC_TYPE comp) {
+		this(0, comp);
+	}
+	
+	/**
+	 * Constructor with a Min Capacity
+	 * @param size the initial capacity of the backing array
+	 * @throws IllegalStateException if the initial size is smaller 0
+	 */
+	public HEAP_PRIORITY_QUEUE(int size) {
+		this(size, null);
+	}
+	
+	/**
+	 * Constructor with a Min Capacity and custom Sorter
+	 * @param size the initial capacity of the backing array
+	 * @param comp Comparator to sort the Array. Can be null
+	 * @throws IllegalStateException if the initial size is smaller 0
+	 */
+	public HEAP_PRIORITY_QUEUE(int size, COMPARATOR KEY_SUPER_GENERIC_TYPE comp) {
+		if(size > 0) array = NEW_KEY_ARRAY(size);
+		this.size = size;
+		comparator = comp;
+	}
+	
+	/**
+	 * Constructor using a initial array
+	 * @param array the Array that should be used
+	 */
+	public HEAP_PRIORITY_QUEUE(KEY_TYPE[] array) {
+		this(array, array.length);
+	}
+	
+	/**
+	 * Constructor using a initial array
+	 * @param array the Array that should be used
+	 * @param size the amount of elements found within the array
+	 * @throws NegativeArraySizeException if size is smaller then 0
+	 */
+	public HEAP_PRIORITY_QUEUE(KEY_TYPE[] array, int size) {
+		this.array = Arrays.copyOf(array, size);
+		this.size = size;
+		ARRAYS.heapify(array, size, null);
+	}
+	
+	/**
+	 * Constructor using a initial array and a custom sorter
+	 * @param array the Array that should be used
+	 * @param comp Comparator to sort the Array. Can be null
+	 */
+	public HEAP_PRIORITY_QUEUE(KEY_TYPE[] array, COMPARATOR KEY_SUPER_GENERIC_TYPE comp) {
+		this(array, array.length, comp);
+	}
+	
+	/**
+	 * Constructor using a initial array and a custom sorter
+	 * @param array the Array that should be used
+	 * @param size the amount of elements found within the array
+	 * @param comp Comparator to sort the Array. Can be null
+	 * @throws NegativeArraySizeException if size is smaller then 0
+	 */
+	public HEAP_PRIORITY_QUEUE(KEY_TYPE[] array, int size, COMPARATOR KEY_SUPER_GENERIC_TYPE comp) {
+		this.array = Arrays.copyOf(array, size);
+		this.size = size;
+		comparator = comp;
+		ARRAYS.heapify(array, size, comp);
+	}
+	
+	/**
+	 * Constructor using a Collection
+	 * @param c the Collection that should be used
+	 */
+	public HEAP_PRIORITY_QUEUE(COLLECTION KEY_GENERIC_TYPE c) {
+		array = CAST_KEY_ARRAY c.TO_ARRAY();
+		size = c.size();
+		ARRAYS.heapify(array, size, null);
+	}
+	
+	/**
+	 * Constructor using a Collection and a custom sorter
+	 * @param c the Collection that should be used
+	 * @param comp Comparator to sort the Array. Can be null
+	 */
+	public HEAP_PRIORITY_QUEUE(COLLECTION KEY_GENERIC_TYPE c, COMPARATOR KEY_SUPER_GENERIC_TYPE comp) {
+		array = CAST_KEY_ARRAY c.TO_ARRAY();
+		size = c.size();
+		comparator = comp;
+		ARRAYS.heapify(array, size, comp);
+	}
+	
+	/**
+	 * Wrapping method to help serialization
+	 * @param array the array that should be used
+	 * @Type(T)
+	 * @return a HeapPriorityQueue containing the original input array
+	 */
+	public static GENERIC_KEY_BRACES HEAP_PRIORITY_QUEUE KEY_GENERIC_TYPE wrap(KEY_TYPE[] array) { 
+		return wrap(array, array.length);
+	}
+	
+	/**
+	 * Wrapping method to help serialization
+	 * @param array the array that should be used
+	 * @param size the amount of elements within the array
+	 * @Type(T)
+	 * @return a HeapPriorityQueue containing the original input array
+	 */
+	public static GENERIC_KEY_BRACES HEAP_PRIORITY_QUEUE KEY_GENERIC_TYPE wrap(KEY_TYPE[] array, int size) {
+		HEAP_PRIORITY_QUEUE KEY_GENERIC_TYPE queue = new HEAP_PRIORITY_QUEUEBRACES();
+		queue.array = array;
+		queue.size = size;
+		ARRAYS.heapify(array, size, null);
+		return queue;
+	}
+	
+	/**
+	 * Wrapping method to help serialization, using a custom sorter
+	 * @param array the array that should be used
+	 * @param comp Comparator to sort the Array. Can be null
+	 * @Type(T)
+	 * @return a HeapPriorityQueue containing the original input array
+	 */
+	public static GENERIC_KEY_BRACES HEAP_PRIORITY_QUEUE KEY_GENERIC_TYPE wrap(KEY_TYPE[] array, COMPARATOR KEY_SUPER_GENERIC_TYPE comp) {
+		return wrap(array, array.length, comp);
+	}
+	
+	/**
+	 * Wrapping method to help serialization, using a custom sorter
+	 * @param array the array that should be used
+	 * @param size the amount of elements within the array
+	 * @param comp Comparator to sort the Array. Can be null
+	 * @Type(T)
+	 * @return a HeapPriorityQueue containing the original input array
+	 */
+	public static GENERIC_KEY_BRACES HEAP_PRIORITY_QUEUE KEY_GENERIC_TYPE wrap(KEY_TYPE[] array, int size, COMPARATOR KEY_SUPER_GENERIC_TYPE comp) {
+		HEAP_PRIORITY_QUEUE KEY_GENERIC_TYPE queue = new HEAP_PRIORITY_QUEUEBRACES(comp);
+		queue.array = array;
+		queue.size = size;
+		ARRAYS.heapify(array, size, comp);
+		return queue;
+	}
+	
+	@Override
+	public int size() {
+		return size;
+	}
+	
+	@Override
+	public void clear() {
+#if TYPE_OBJECT
+		Arrays.fill(array, null);
+#endif
+		size = 0;
+	}
+	
+	@Override
+	public ITERATOR KEY_GENERIC_TYPE iterator() {
+		return new Iter();
+	}
+	
+	@Override
+	public void enqueue(KEY_TYPE e) {
+		if(size == array.length) array = Arrays.copyOf(array, size + 1);
+		array[size++] = e;
+		ARRAYS.shiftUp(array, size-1, comparator);
+	}
+	
+	@Override
+	public KEY_TYPE dequeue() {
+		if(size <= 0) throw new NoSuchElementException();
+		KEY_TYPE value = array[0];
+		array[0] = array[--size];
+#if TYPE_OBJECT
+		array[size] = null;
+#endif
+		if(size != 0) ARRAYS.shiftDown(array, size, 0, comparator);
+		return value;
+	}
+	
+	@Override
+	public KEY_TYPE peek(int index) {
+		if(index < 0 || index >= size) throw new NoSuchElementException();
+		return array[index];
+	}
+	
+	@Override
+	public boolean removeFirst(KEY_TYPE e) {
+		for(int i = 0;i<size;i++)
+			if(KEY_EQUALS(e, array[i])) return removeIndex(i);
+		return false;
+	}
+	
+	@Override
+	public boolean removeLast(KEY_TYPE e) {
+		for(int i = size-1;i>=0;i--)
+			if(KEY_EQUALS(e, array[i])) return removeIndex(i);
+		return false;
+	}
+	
+	@Override
+	public void forEach(CONSUMER KEY_SUPER_GENERIC_TYPE action) {
+		Objects.requireNonNull(action);
+		for(int i = 0,m=size;i<m;i++) action.accept(dequeue());
+	}
+	
+	@Override
+	public <E> void forEach(E input, BI_OBJECT_CONSUMER KKS_GENERIC_TYPE<E> action) {
+		Objects.requireNonNull(action);
+		for(int i = 0,m=size;i<m;i++) action.accept(dequeue(), input);
+	}
+	
+	@Override
+	public boolean matchesAny(PREDICATE KEY_GENERIC_TYPE filter) {
+		Objects.requireNonNull(filter);
+		for(int i = 0;i<size;i++) {
+			if(filter.TEST_VALUE(array[i])) return true;
+		}
+		return false;
+	}
+	
+	@Override
+	public boolean matchesNone(PREDICATE KEY_GENERIC_TYPE filter) {
+		Objects.requireNonNull(filter);
+		for(int i = 0;i<size;i++) {
+			if(filter.TEST_VALUE(array[i])) return false;
+		}
+		return true;
+	}
+	
+	@Override
+	public boolean matchesAll(PREDICATE KEY_GENERIC_TYPE filter) {
+		Objects.requireNonNull(filter);
+		for(int i = 0;i<size;i++) {
+			if(!filter.TEST_VALUE(array[i])) return false;
+		}
+		return true;
+	}
+	
+	@Override
+	public KEY_TYPE findFirst(PREDICATE KEY_GENERIC_TYPE filter) {
+		Objects.requireNonNull(filter);
+		for(int i = 0;i<size;i++) {
+			if(filter.TEST_VALUE(array[i])) {
+				KEY_TYPE data = array[i];
+				removeIndex(i);
+				return data;
+			}
+		}
+		return EMPTY_VALUE;
+	}
+	
+	protected boolean removeIndex(int index) {
+		array[index] = array[--size];
+#if TYPE_OBJECT
+		array[size] = null;
+#endif
+		if(size != index) ARRAYS.shiftDown(array, size, index, comparator);
+		return true;
+	}
+	
+	@Override
+	public void onChanged() {
+		if(size <= 0) return;
+		ARRAYS.shiftDown(array, size, 0, comparator);
+	}
+	
+	@Override
+	public COMPARATOR KEY_SUPER_GENERIC_TYPE comparator() {
+		return comparator;
+	}
+	
+	@Override
+	public GENERIC_SPECIAL_KEY_BRACES<E> KEY_SPECIAL_TYPE[] TO_ARRAY(KEY_SPECIAL_TYPE[] input) {
+		if(input == null || input.length < size()) input = NEW_SPECIAL_KEY_ARRAY(size());
+		System.arraycopy(array, 0, input, 0, size());
+		return input;
+	}
+	
+	private class Iter implements ITERATOR KEY_GENERIC_TYPE {
+		@Override
+		public boolean hasNext() {
+			return !isEmpty();
+		}
+		
+		@Override
+		public KEY_TYPE NEXT() {
+			return dequeue();
+		}
+	}
 }

src/builder/resources/speiger/assets/collections/templates/queues/PriorityDequeue.template

@@ -1,15 +1,5 @@
 package speiger.src.collections.PACKAGE.queues;
 
-#if TYPE_OBJECT
-import java.util.Collection;
-import java.util.Iterator;
-#endif
-import speiger.src.collections.PACKAGE.collections.COLLECTION;
-import speiger.src.collections.PACKAGE.collections.ITERATOR;
-#if QUEUES_FEATURE
-import speiger.src.collections.PACKAGE.utils.PRIORITY_QUEUES;
-#endif
-
 /**
  * A Type Speciifc PriorityDeque or Dequeue interface to allow implementations like FIFO queues.
  * @Type(T)
@@ -21,56 +11,6 @@ public interface PRIORITY_DEQUEUE KEY_GENERIC_TYPE extends PRIORITY_QUEUE KEY_GE
 	 * @param e the element that should be inserted into the first place
 	 */
 	public void enqueueFirst(KEY_TYPE e);
-	
-	/**
-	 * Method to mass insert a elements into the first Index of the PriorityDequeue.
-	 * @param e the elements that should be inserted
-	 */
-	public default void enqueueAllFirst(KEY_TYPE... e) {
-		enqueueAllFirst(e, 0, e.length);
-	}
-	
-	/**
-	 * Method to mass insert a elements into the first Index of the PriorityDequeue.
-	 * @param e the elements that should be inserted
-	 * @param length the amount of elements that should be inserted
-	 */
-	public default void enqueueAllFirst(KEY_TYPE[] e, int length) {
-		enqueueAllFirst(e, 0, length);
-	}
-	
-	/**
-	 * Method to mass insert a elements into the first Index of the PriorityDequeue.
-	 * @param e the elements that should be inserted
-	 * @param offset the offset where in the array should be started
-	 * @param length the amount of elements that should be inserted
-	 */	
-	public default void enqueueAllFirst(KEY_TYPE[] e, int offset, int length) {
-		for(int i = 0;i<length;i++)
-			enqueueFirst(e[i+offset]);
-	}
-	
-	/**
-	 * Method to mass insert elements into first Index of the PriorityDequeue.
-	 * @param c the elements that should be inserted from the Collection
-	 */
-	public default void enqueueAllFirst(COLLECTION KEY_GENERIC_TYPE c) {
-		for(ITERATOR KEY_GENERIC_TYPE iter = c.iterator();iter.hasNext();)
-			enqueueFirst(iter.NEXT());
-	}
-	
-#if TYPE_OBJECT
-	/**
-	 * Method to mass insert elements into first Index of the PriorityDequeue.
-	 * This method exists to add support for Java Collections to make it more useable
-	 * @param c the elements that should be inserted from the Collection
-	 */
-	public default void enqueueAllFirst(Collection<? extends CLASS_TYPE> c) {
-		for(Iterator<? extends CLASS_TYPE> iter = c.iterator();iter.hasNext();)
-			enqueueFirst(iter.next());
-	}
-	
-#endif
 	/**
 	 * A Method to remove a element from the last place instead of the first
 	 * @return the last element inserted
@@ -82,24 +22,4 @@ public interface PRIORITY_DEQUEUE KEY_GENERIC_TYPE extends PRIORITY_QUEUE KEY_GE
 	 * @return the Last Element within the dequeue without deleting it
 	 */
 	public default KEY_TYPE last() { return peek(size()-1); }
-	
-#if QUEUES_FEATURE
-	/**
-	 * Creates a Wrapped PriorityDequeue that is Synchronized
-	 * @return a new PriorityDequeue that is synchronized
-	 * @see PRIORITY_QUEUES#synchronize
-	 */
-	public default PRIORITY_DEQUEUE KEY_GENERIC_TYPE synchronizeQueue() { return PRIORITY_QUEUES.synchronize(this); }
-	
-	/**
-	 * Creates a Wrapped PriorityDequeue that is Synchronized
-	 * @param mutex is the controller of the synchronization block
-	 * @return a new PriorityDequeue Wrapper that is synchronized
-	 * @see PRIORITY_QUEUES#synchronize
-	 */
-	public default PRIORITY_DEQUEUE KEY_GENERIC_TYPE synchronizeQueue(Object mutex) { return PRIORITY_QUEUES.synchronize(this, mutex); }
-	
-#endif
-	@Override
-	public PRIORITY_DEQUEUE KEY_GENERIC_TYPE copy();
 }

src/builder/resources/speiger/assets/collections/templates/queues/PriorityQueue.template

@@ -1,203 +1,98 @@
-package speiger.src.collections.PACKAGE.queues;
-
-#if TYPE_OBJECT
-import java.util.Comparator;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.function.IntFunction;
-#else
-import speiger.src.collections.PACKAGE.functions.COMPARATOR;
-#endif
-import speiger.src.collections.PACKAGE.collections.COLLECTION;
-import speiger.src.collections.PACKAGE.collections.ITERABLE;
-import speiger.src.collections.PACKAGE.collections.ITERATOR;
-#if QUEUES_FEATURE
-import speiger.src.collections.PACKAGE.utils.PRIORITY_QUEUES;
-#endif
-
-
-/**
- * A Simple PriorityQueue (or Queue) interface that provides with the nessesary functions to interact with it, without cluttering with the Collection interface.
- * @Type(T)
- */
-public interface PRIORITY_QUEUE KEY_GENERIC_TYPE extends ITERABLE KEY_GENERIC_TYPE
-{
-	/**
-	 * @return true if the PriorityQueue is empty
-	 */
-	public default boolean isEmpty() { return size() <= 0; }
-	/**
-	 * @return the amount of elements that are stored in the PriorityQueue
-	 */
-	public int size();
-	/**
-	 * clears all elements within the PriorityQueue,
-	 * this does not resize the backing arrays
-	 */
-	public void clear();
-	
-	/**
-	 * Method to insert a element into the PriorityQueue
-	 * @param e the element that should be inserted
-	 */
-	public void enqueue(KEY_TYPE e);
-	
-	/**
-	 * Method to mass insert elements into the PriorityQueue
-	 * @param e the elements that should be inserted
-	 */
-	public default void enqueueAll(KEY_TYPE... e) {
-		enqueueAll(e, 0, e.length);
-	}
-	
-	/**
-	 * Method to mass insert elements into the PriorityQueue
-	 * @param e the elements that should be inserted
-	 * @param length the amount of elements that should be inserted
-	 */
-	public default void enqueueAll(KEY_TYPE[] e, int length) {
-		enqueueAll(e, 0, length);
-	}
-	
-	/**
-	 * Method to mass insert elements into the PriorityQueue
-	 * @param e the elements that should be inserted
-	 * @param offset the offset where in the array should be started
-	 * @param length the amount of elements that should be inserted
-	 */
-	public default void enqueueAll(KEY_TYPE[] e, int offset, int length) {
-		for(int i = 0;i<length;i++) 
-			enqueue(e[i+offset]);
-	}
-	
-	/**
-	 * Method to mass insert elements into the PriorityQueue
-	 * @param c the elements that should be inserted from the Collection
-	 */
-	public default void enqueueAll(COLLECTION KEY_GENERIC_TYPE c) {
-		for(ITERATOR KEY_GENERIC_TYPE iter = c.iterator();iter.hasNext();)
-			enqueue(iter.NEXT());
-	}
-	
-#if TYPE_OBJECT
-	/**
-	 * Method to mass insert elements into the PriorityQueue
-	 * This method exists to add support for Java Collections to make it more useable
-	 * @param c the elements that should be inserted from the Collection
-	 */
-	public default void enqueueAll(Collection<? extends CLASS_TYPE> c) {
-		for(Iterator<? extends CLASS_TYPE> iter = c.iterator();iter.hasNext();)
-			enqueue(iter.next());
-	}
-	
-#endif
-	
-	/**
-	 * Method to extract a element from the PriorityQueue
-	 * @return a element from the Queue
-	 * @throws java.util.NoSuchElementException if no element is present
-	 */
-	public KEY_TYPE dequeue();
-	
-	/**
-	 * Peeking function to see whats inside the queue.
-	 * @param index of the element that is requested to be viewed.
-	 * @return the element that is requested
-	 */
-	public KEY_TYPE peek(int index);
-	/**
-	 * Shows the element that is to be returned next
-	 * @return the first element in the Queue
-	 */
-	public default KEY_TYPE first() { return peek(0); }
-	
-	/**
-	 * Method to find out if a element is part of the queue
-	 * @param e the element that is searched for
-	 * @return true if the element is in the queue
-	 */
-	public boolean contains(KEY_TYPE e);
-	
-	/**
-	 * Removes the first found element in the queue
-	 * @param e the element that should be removed
-	 * @return if a searched element was removed
-	 */
-	public boolean removeFirst(KEY_TYPE e);
-	/**
-	 * Removes the last found element in the queue
-	 * @param e the element that should be removed
-	 * @return if a searched element was removed
-	 */
-	public boolean removeLast(KEY_TYPE e);
-	
-	/**
-	 * Allows to notify the Queue to be revalidate its data
-	 */
-	public void onChanged();
-	
-	/**
-	 * A Function that does a shallow clone of the PriorityQueue itself.
-	 * This function is more optimized then a copy constructor since the PriorityQueue does not have to be unsorted/resorted.
-	 * It can be compared to Cloneable but with less exception risk
-	 * @return a Shallow Copy of the PriorityQueue
-	 * @note Wrappers and view PriorityQueues will not support this feature
-	 */
-	public PRIORITY_QUEUE KEY_GENERIC_TYPE copy();
-	
-	/**
-	 * @return the sorter of the Queue, can be null
-	 */
-	public COMPARATOR KEY_SUPER_GENERIC_TYPE comparator();
-	
-#if TYPE_OBJECT
-	/**
-	 * @return draining iterator of the PriorityQueue
-	 */
-	public ITERATOR KEY_GENERIC_TYPE iterator();
-
-#endif
-#if QUEUES_FEATURE
-	/**
-	 * Creates a Wrapped PriorityQueue that is Synchronized
-	 * @return a new PriorityQueue that is synchronized
-	 * @see PRIORITY_QUEUES#synchronize
-	 */
-	public default PRIORITY_QUEUE KEY_GENERIC_TYPE synchronizeQueue() { return PRIORITY_QUEUES.synchronize(this); }
-	
-	/**
-	 * Creates a Wrapped PriorityQueue that is Synchronized
-	 * @param mutex is the controller of the synchronization block
-	 * @return a new PriorityQueue Wrapper that is synchronized
-	 * @see PRIORITY_QUEUES#synchronize
-	 */
-	public default PRIORITY_QUEUE KEY_GENERIC_TYPE synchronizeQueue(Object mutex) { return PRIORITY_QUEUES.synchronize(this, mutex); }
-
-#endif
-	/**
-	 * A method to drop the contents of the Queue without clearing the queue
-	 * @Type(E)
-	 * @return the contents of the queue into a seperate array.
-	 */
-	public default GENERIC_SPECIAL_KEY_BRACES<E> KEY_SPECIAL_TYPE[] TO_ARRAY() { return TO_ARRAY(NEW_SPECIAL_KEY_ARRAY(size())); }
-	/**
-	 * A method to drop the contents of the Queue without clearing the queue
-	 * @param input where the elements should be inserted to. If it does not fit then it creates a new appropiatly created array
-	 * @Type(E)
-	 * @return the contents of the queue into a seperate array.
-	 * @note if the Type is generic then a Object Array is created instead of a Type Array
-	 */
-	public GENERIC_SPECIAL_KEY_BRACES<E> KEY_SPECIAL_TYPE[] TO_ARRAY(KEY_SPECIAL_TYPE[] input);
-#if TYPE_OBJECT
-	/**
-	 * A Helper function that simplifies the process of creating a new Array.
-	 * @param action the array creation function
-	 * @param <E> the returning arrayType
-	 * @return an array containing all of the elements in this collection
-	 * @see Collection#toArray(Object[])
-	 */
-	default <E> E[] TO_ARRAY(IntFunction<E[]> action) {
-		return TO_ARRAY(action.apply(size()));
-	}
-#endif
+package speiger.src.collections.PACKAGE.queues;
+
+#if TYPE_OBJECT
+import java.util.Comparator;
+import speiger.src.collections.objects.collections.ObjectIterator;
+#else
+import speiger.src.collections.PACKAGE.functions.COMPARATOR;
+#endif
+import speiger.src.collections.PACKAGE.collections.ITERABLE;
+
+/**
+ * A Simple PriorityQueue (or Queue) interface that provides with the nessesary functions to interact with it, without cluttering with the Collection interface.
+ * @Type(T)
+ */
+public interface PRIORITY_QUEUE KEY_GENERIC_TYPE extends ITERABLE KEY_GENERIC_TYPE
+{
+	/**
+	 * @return true if the PriorityQueue is empty
+	 */
+	public default boolean isEmpty() { return size() <= 0; }
+	/**
+	 * @return the amount of elements that are stored in the PriorityQueue
+	 */
+	public int size();
+	/**
+	 * clears all elements within the PriorityQueue,
+	 * this does not resize the backing arrays
+	 */
+	public void clear();
+	
+	/**
+	 * Method to insert a element into the PriorityQueue
+	 * @param e the element that should be inserted
+	 */
+	public void enqueue(KEY_TYPE e);
+	/**
+	 * Method to extract a element from the PriorityQueue
+	 * @return a element from the Queue
+	 * @throws java.util.NoSuchElementException if no element is present
+	 */
+	public KEY_TYPE dequeue();
+	
+	/**
+	 * Peeking function to see whats inside the queue.
+	 * @param index of the element that is requested to be viewed.
+	 * @return the element that is requested
+	 */
+	public KEY_TYPE peek(int index);
+	/**
+	 * Shows the element that is to be returned next
+	 * @return the first element in the Queue
+	 */
+	public default KEY_TYPE first() { return peek(0); }
+	
+	/**
+	 * Removes the first found element in the queue
+	 * @param e the element that should be removed
+	 * @return if a searched element was removed
+	 */
+	public boolean removeFirst(KEY_TYPE e);
+	/**
+	 * Removes the last found element in the queue
+	 * @param e the element that should be removed
+	 * @return if a searched element was removed
+	 */
+	public boolean removeLast(KEY_TYPE e);
+	
+	/**
+	 * Allows to notify the Queue to be revalidate its data
+	 */
+	public void onChanged();
+	
+	/**
+	 * @return the sorter of the Queue, can be null
+	 */
+	public COMPARATOR KEY_SUPER_GENERIC_TYPE comparator();
+	
+#if TYPE_OBJECT
+	/**
+	 * @return draining iterator of the PriorityQueue
+	 */
+	public ITERATOR KEY_GENERIC_TYPE iterator();
+#endif
+	/**
+	 * A method to drop the contents of the Queue without clearing the queue
+	 * @Type(E)
+	 * @return the contents of the queue into a seperate array.
+	 */
+	public default GENERIC_SPECIAL_KEY_BRACES<E> KEY_SPECIAL_TYPE[] TO_ARRAY() { return TO_ARRAY(NEW_SPECIAL_KEY_ARRAY(size())); }
+	/**
+	 * A method to drop the contents of the Queue without clearing the queue
+	 * @param input where the elements should be inserted to. If it does not fit then it creates a new appropiatly created array
+	 * @Type(E)
+	 * @return the contents of the queue into a seperate array.
+	 * @note if the Type is generic then a Object Array is created instead of a Type Array
+	 */
+	public GENERIC_SPECIAL_KEY_BRACES<E> KEY_SPECIAL_TYPE[] TO_ARRAY(KEY_SPECIAL_TYPE[] input);
 }

src/builder/resources/speiger/assets/collections/templates/sets/AbstractSet.template

@@ -1,50 +1,56 @@
-package speiger.src.collections.PACKAGE.sets;
-
-#if TYPE_OBJECT
-import java.util.Objects;
-#endif
-import java.util.Set;
-
-import speiger.src.collections.PACKAGE.collections.ABSTRACT_COLLECTION;
-import speiger.src.collections.PACKAGE.collections.ITERATOR;
-
-/**
- * Abstract Type Specific Set that reduces boxing/unboxing
- * @Type(T)
- */
-public abstract class ABSTRACT_SET KEY_GENERIC_TYPE extends ABSTRACT_COLLECTION KEY_GENERIC_TYPE implements SET KEY_GENERIC_TYPE
-{
-#if TYPE_OBJECT
-	@Override
-	public KEY_TYPE addOrGet(KEY_TYPE o) { throw new UnsupportedOperationException(); }
-	
-#endif
-	@Override
-	public abstract ITERATOR KEY_GENERIC_TYPE iterator();
-	@Override
-	public ABSTRACT_SET KEY_GENERIC_TYPE copy() { throw new UnsupportedOperationException(); }
-	
-	@Override
-	public int hashCode() {
-		int hashCode = 0;
-		ITERATOR KEY_GENERIC_TYPE i = iterator();
-		while(i.hasNext())
-			hashCode += KEY_TO_HASH(i.NEXT());
-		return hashCode;
-	}
-	
-	@Override
-	public boolean equals(Object o) {
-		if (o == this)
-			return true;
-		if (!(o instanceof Set))
-			return false;
-		Set<?> l = (Set<?>)o;
-		if(l.size() != size()) return false;
-		try {
-			return containsAll(l);
-		} catch (ClassCastException | NullPointerException unused) {
-			return false;
-		}
-	}
-}
+package speiger.src.collections.PACKAGE.sets;
+
+import java.util.Iterator;
+import java.util.Objects;
+import java.util.Set;
+
+import speiger.src.collections.PACKAGE.collections.ABSTRACT_COLLECTION;
+import speiger.src.collections.PACKAGE.collections.ITERATOR;
+
+/**
+ * Abstract Type Specific Set that reduces boxing/unboxing
+ * @Type(T)
+ */
+public abstract class ABSTRACT_SET KEY_GENERIC_TYPE extends ABSTRACT_COLLECTION KEY_GENERIC_TYPE implements SET KEY_GENERIC_TYPE
+{
+	@Override
+	public abstract ITERATOR KEY_GENERIC_TYPE iterator();
+	
+	@Override
+	public int hashCode() {
+		int hashCode = 1;
+		ITERATOR KEY_GENERIC_TYPE i = iterator();
+		while(i.hasNext())
+			hashCode = 31 * hashCode + KEY_TO_HASH(i.NEXT());
+		return hashCode;
+	}
+	
+	@Override
+	public boolean equals(Object o) {
+		if (o == this)
+			return true;
+		if (!(o instanceof Set))
+			return false;
+		Set<?> l = (Set<?>)o;
+		if(l.size() != size()) return false;
+#if !TYPE_OBJECT		
+		if(l instanceof SET)
+		{
+			ITERATOR e1 = iterator();
+			ITERATOR e2 = ((SET)l).iterator();
+			while (e1.hasNext() && e2.hasNext()) {
+				if(!(KEY_EQUALS(e1.NEXT(), e2.NEXT())))
+					return false;
+			}
+			return !(e1.hasNext() || e2.hasNext());
+		}
+#endif
+		Iterator<CLASS_TYPE> e1 = iterator();
+		Iterator<?> e2 = l.iterator();
+		while (e1.hasNext() && e2.hasNext()) {
+			if(!Objects.equals(e1.next(), e2.next()))
+				return false;
+		}
+		return !(e1.hasNext() || e2.hasNext());
+	}
+}

src/builder/resources/speiger/assets/collections/templates/sets/ArraySet.template

@@ -3,29 +3,23 @@ package speiger.src.collections.PACKAGE.sets;
 import java.util.Arrays;
 import java.util.Collection;
 #if TYPE_OBJECT
+import java.util.Comparator;
 import java.util.function.Consumer;
-import java.util.function.BiFunction;
 #endif
 import java.util.NoSuchElementException;
 import java.util.Objects;
 import java.util.Set;
-#if JDK_FUNCTION
-import java.util.function.PREDICATE;
-#endif
-#if PRIMITIVES && !JDK_FUNCTION
+#if PRIMITIVES
 import java.util.function.JAVA_PREDICATE;
 #endif
 import speiger.src.collections.PACKAGE.collections.BI_ITERATOR;
 import speiger.src.collections.PACKAGE.collections.COLLECTION;
 import speiger.src.collections.PACKAGE.collections.ITERATOR;
 
-import speiger.src.collections.ints.functions.consumer.BI_FROM_INT_CONSUMER;
-import speiger.src.collections.objects.functions.consumer.BI_FROM_OBJECT_CONSUMER;
-#if !JDK_FUNCTION
+import speiger.src.collections.PACKAGE.functions.consumer.BI_OBJECT_CONSUMER;
 import speiger.src.collections.PACKAGE.functions.function.PREDICATE;
-#endif
-import speiger.src.collections.PACKAGE.functions.function.UNARY_OPERATOR;
 #if !TYPE_OBJECT
+import speiger.src.collections.PACKAGE.functions.COMPARATOR;
 import speiger.src.collections.PACKAGE.functions.CONSUMER;
 import speiger.src.collections.objects.utils.ObjectArrays;
 #endif
@@ -40,7 +34,7 @@ import speiger.src.collections.PACKAGE.utils.ARRAYS;
  * This implementation does not shrink the backing array
  * @Type(T)
  */
-public class ARRAY_SET KEY_GENERIC_TYPE extends ABSTRACT_SET KEY_GENERIC_TYPE implements ORDERED_SET KEY_GENERIC_TYPE
+public class ARRAY_SET KEY_GENERIC_TYPE extends ABSTRACT_SET KEY_GENERIC_TYPE implements SORTED_SET KEY_GENERIC_TYPE
 {
 	/** The Backing Array */
 	protected transient KEY_TYPE[] data;
@@ -60,7 +54,6 @@ public class ARRAY_SET KEY_GENERIC_TYPE extends ABSTRACT_SET KEY_GENERIC_TYPE im
 	 * @throws NegativeArraySizeException if the capacity is negative
 	 */
 	public ARRAY_SET(int capacity) {
-		if(capacity < 0) throw new IllegalStateException("Size has to be 0 or greater");
 		data = NEW_KEY_ARRAY(capacity);
 	}
 	
@@ -79,8 +72,8 @@ public class ARRAY_SET KEY_GENERIC_TYPE extends ABSTRACT_SET KEY_GENERIC_TYPE im
 	 * @throws NegativeArraySizeException if the length is negative
 	 */
 	public ARRAY_SET(KEY_TYPE[] array, int length) {
-		this(length);
-		addAll(array, length);
+		data = Arrays.copyOf(array, length);
+		size = length;
 	}
 	
 	/**
@@ -137,17 +130,6 @@ public class ARRAY_SET KEY_GENERIC_TYPE extends ABSTRACT_SET KEY_GENERIC_TYPE im
 		return false;
 	}
 	
-#if TYPE_OBJECT
-	@Override
-	public KEY_TYPE addOrGet(KEY_TYPE o) {
-		int index = findIndex(o);
-		if(index != -1) return data[index];
-		if(data.length == size) data = Arrays.copyOf(data, size == 0 ? 2 : size * 2);
-		data[size++] = o;
-		return o;
-	}
-	
-#endif
 	@Override
 	public boolean addAndMoveToFirst(KEY_TYPE o) {
 		int index = findIndex(o);
@@ -175,7 +157,7 @@ public class ARRAY_SET KEY_GENERIC_TYPE extends ABSTRACT_SET KEY_GENERIC_TYPE im
 		}
 		else if(index != size - 1) {
 			o = data[index];
-			System.arraycopy(data, index+1, data, index, size - index - 1);
+			System.arraycopy(data, index+1, data, index, size - index);
 			data[size-1] = o;
 		}
 		return false;
@@ -245,21 +227,6 @@ public class ARRAY_SET KEY_GENERIC_TYPE extends ABSTRACT_SET KEY_GENERIC_TYPE im
 		return result;
 	}
 	
-	@Override
-	public boolean removeAll(COLLECTION KEY_GENERIC_TYPE c, CONSUMER KEY_GENERIC_TYPE r) {
-		int j = 0;
-		for(int i = 0;i<size;i++) {
-			if(!c.contains(data[i])) data[j++] = data[i];
-			else r.accept(data[i]);
-		}
-		boolean result = j != size;
-#if TYPE_OBJECT
-		Arrays.fill(data, j, size, null);
-#endif
-		size = j;
-		return result;
-	}
-	
 	@Override
 	public boolean retainAll(COLLECTION KEY_GENERIC_TYPE c) {
 		int j = 0;
@@ -275,21 +242,6 @@ public class ARRAY_SET KEY_GENERIC_TYPE extends ABSTRACT_SET KEY_GENERIC_TYPE im
 		return result;
 	}
 	
-	@Override
-	public boolean retainAll(COLLECTION KEY_GENERIC_TYPE c, CONSUMER KEY_GENERIC_TYPE r) {
-		int j = 0;
-		for(int i = 0;i<size;i++) {
-			if(c.contains(data[i])) data[j++] = data[i];
-			else r.accept(data[i]);
-		}
-		boolean result = j != size;
-#if TYPE_OBJECT
-		Arrays.fill(data, j, size, null);
-#endif
-		size = j;
-		return result;
-	}
-	
 	@Override
 	@Primitive
 	public boolean removeAll(Collection<?> c) {
@@ -398,23 +350,17 @@ public class ARRAY_SET KEY_GENERIC_TYPE extends ABSTRACT_SET KEY_GENERIC_TYPE im
 	}
 	
 	@Override
-	public void forEachIndexed(BI_FROM_INT_CONSUMER KEY_GENERIC_TYPE action) {
-		Objects.requireNonNull(action);
-		for(int i = 0;i<size;action.accept(i, data[i++]));
-	}
-	
-	@Override
-	public <E> void forEach(E input, BI_FROM_OBJECT_CONSUMER KSK_GENERIC_TYPE<E> action) {
+	public <E> void forEach(E input, BI_OBJECT_CONSUMER KKS_GENERIC_TYPE<E> action) {
 		Objects.requireNonNull(action);
 		for(int i = 0;i<size;i++)
-			action.accept(input, data[i]);		
+			action.accept(data[i], input);		
 	}
 	
 	@Override
 	public boolean matchesAny(PREDICATE KEY_GENERIC_TYPE filter) {
 		Objects.requireNonNull(filter);
 		for(int i = 0;i<size;i++) {
-			if(filter.test(data[i])) return true;
+			if(filter.TEST_VALUE(data[i])) return true;
 		}
 		return false;
 	}
@@ -423,7 +369,7 @@ public class ARRAY_SET KEY_GENERIC_TYPE extends ABSTRACT_SET KEY_GENERIC_TYPE im
 	public boolean matchesNone(PREDICATE KEY_GENERIC_TYPE filter) {
 		Objects.requireNonNull(filter);
 		for(int i = 0;i<size;i++) {
-			if(filter.test(data[i])) return false;
+			if(filter.TEST_VALUE(data[i])) return false;
 		}
 		return true;
 	}
@@ -432,7 +378,7 @@ public class ARRAY_SET KEY_GENERIC_TYPE extends ABSTRACT_SET KEY_GENERIC_TYPE im
 	public boolean matchesAll(PREDICATE KEY_GENERIC_TYPE filter) {
 		Objects.requireNonNull(filter);
 		for(int i = 0;i<size;i++) {
-			if(!filter.test(data[i])) return false;
+			if(!filter.TEST_VALUE(data[i])) return false;
 		}
 		return true;
 	}
@@ -441,60 +387,11 @@ public class ARRAY_SET KEY_GENERIC_TYPE extends ABSTRACT_SET KEY_GENERIC_TYPE im
 	public KEY_TYPE findFirst(PREDICATE KEY_GENERIC_TYPE filter) {
 		Objects.requireNonNull(filter);
 		for(int i = 0;i<size;i++) {
-			if(filter.test(data[i])) return data[i];
+			if(filter.TEST_VALUE(data[i])) return data[i];
 		}
 		return EMPTY_VALUE;
 	}
 	
-#if !TYPE_OBJECT
-	@Override
-	public KEY_TYPE reduce(KEY_TYPE identity, UNARY_OPERATOR KEY_KEY_GENERIC_TYPE operator) {
-		Objects.requireNonNull(operator);
-		KEY_TYPE state = identity;
-		for(int i = 0;i<size;i++) {
-			state = operator.APPLY_VALUE(state, data[i]);
-		}
-		return state;
-	}
-	
-#else
-	@Override
-	public <KEY_SPECIAL_TYPE> KEY_SPECIAL_TYPE reduce(KEY_SPECIAL_TYPE identity, BiFunction<KEY_SPECIAL_TYPE, KEY_TYPE, KEY_SPECIAL_TYPE> operator) {
-		Objects.requireNonNull(operator);
-		KEY_SPECIAL_TYPE state = identity;
-		for(int i = 0;i<size;i++) {
-			state = operator.APPLY_VALUE(state, data[i]);
-		}
-		return state;
-	}
-	
-#endif
-	@Override
-	public KEY_TYPE reduce(UNARY_OPERATOR KEY_KEY_GENERIC_TYPE operator) {
-		Objects.requireNonNull(operator);
-		KEY_TYPE state = EMPTY_VALUE;
-		boolean empty = true;
-		for(int i = 0;i<size;i++) {
-			if(empty) {
-				empty = false;
-				state = data[i];
-				continue;
-			}
-			state = operator.APPLY_VALUE(state, data[i]);
-		}
-		return state;
-	}
-	
-	@Override
-	public int count(PREDICATE KEY_GENERIC_TYPE filter) {
-		Objects.requireNonNull(filter);
-		int result = 0;
-		for(int i = 0;i<size;i++) {
-			if(filter.test(data[i])) result++;
-		}
-		return result;
-	}
-	
 #if !TYPE_OBJECT
 	protected int findIndex(KEY_TYPE o) {
 		for(int i = size-1;i>=0;i--)
@@ -521,11 +418,31 @@ public class ARRAY_SET KEY_GENERIC_TYPE extends ABSTRACT_SET KEY_GENERIC_TYPE im
 		throw new NoSuchElementException();
 	}
 	
-	public ARRAY_SET KEY_GENERIC_TYPE copy() {
-		ARRAY_SET KEY_GENERIC_TYPE set = new ARRAY_SETBRACES();
-		set.data = Arrays.copyOf(data, data.length);
-		set.size = size;
-		return set;
+	@Override
+	public SORTED_SET KEY_GENERIC_TYPE subSet(KEY_TYPE fromElement, KEY_TYPE toElement) {
+		int fromIndex = findIndex(fromElement);
+		int toIndex = findIndex(toElement);
+		if(fromIndex == -1 || toIndex == -1) throw new NoSuchElementException();
+		return new SubSet(fromIndex, toIndex - fromIndex + 1);
+	}
+
+	@Override
+	public SORTED_SET KEY_GENERIC_TYPE headSet(KEY_TYPE toElement) {
+		int toIndex = findIndex(toElement);
+		if(toIndex == -1) throw new NoSuchElementException();
+		return new SubSet(0, toIndex+1);
+	}
+
+	@Override
+	public SORTED_SET KEY_GENERIC_TYPE tailSet(KEY_TYPE fromElement) {
+		int fromIndex = findIndex(fromElement);
+		if(fromIndex == -1) throw new NoSuchElementException();
+		return new SubSet(fromIndex, size - fromIndex);
+	}
+	
+	@Override
+	public COMPARATOR KEY_GENERIC_TYPE comparator() {
+		return null;
 	}
 	
 	@Override
@@ -543,7 +460,6 @@ public class ARRAY_SET KEY_GENERIC_TYPE extends ABSTRACT_SET KEY_GENERIC_TYPE im
 	public KEY_TYPE[] TO_ARRAY(KEY_TYPE[] a) {
 		if(a == null || a.length < size()) return Arrays.copyOf(data, size());
 		System.arraycopy(data, 0, a, 0, size());
-		if (a.length > size) a[size] = EMPTY_KEY_VALUE;
 		return a;
 	}
 	
@@ -551,7 +467,6 @@ public class ARRAY_SET KEY_GENERIC_TYPE extends ABSTRACT_SET KEY_GENERIC_TYPE im
 	@Override
 	@Deprecated
 	public Object[] toArray() {
-		if(isEmpty()) return ObjectArrays.EMPTY_ARRAY;
 		Object[] obj = new Object[size()];
 		for(int i = 0;i<size();i++)
 			obj[i] = KEY_TO_OBJ(data[i]);
@@ -565,10 +480,344 @@ public class ARRAY_SET KEY_GENERIC_TYPE extends ABSTRACT_SET KEY_GENERIC_TYPE im
 		else if(a.length < size()) a = (E[])ObjectArrays.newArray(a.getClass().getComponentType(), size());
 		for(int i = 0;i<size();i++)
 			a[i] = (E)KEY_TO_OBJ(data[i]);
-		if (a.length > size) a[size] = null;
 		return a;
 	}
+	
+	private class SubSet extends ABSTRACT_SET KEY_GENERIC_TYPE implements SORTED_SET KEY_GENERIC_TYPE {
+		int offset;
+		int length;
 		
+		SubSet(int offset, int length) {
+			this.offset = offset;
+			this.length = length;
+		}
+		
+		int end() { return offset+length; }
+
+		@Override
+		public boolean add(KEY_TYPE o) {
+			int index = findIndex(o);
+			if(index == -1) {
+				if(data.length == size) data = Arrays.copyOf(data, size == 0 ? 2 : size * 2);
+				if(end() != size) System.arraycopy(data, end(), data, end()+1, size-(offset+length));
+				data[end()] = o;
+				size++;
+				length++;
+				return true;
+			}
+			return false;
+		}
+
+		@Override
+		public boolean addAndMoveToFirst(KEY_TYPE o) {
+			int index = findIndex(o);
+			if(index == -1) {
+				if(data.length == size) data = Arrays.copyOf(data, size == 0 ? 2 : size * 2);
+				System.arraycopy(data, offset, data, offset+1, size-offset);
+				data[offset] = o;
+				size++;
+				length++;
+				return true;
+			}
+			else if(index != 0) {
+				o = data[index];
+				System.arraycopy(data, offset, data, offset+1, index-offset);
+				data[offset] = o;
+			}
+			return false;
+		}
+		
+		@Override
+		public boolean addAndMoveToLast(KEY_TYPE o) {
+			int index = findIndex(o);
+			if(index == -1) {
+				if(data.length == size) data = Arrays.copyOf(data, size == 0 ? 2 : size * 2);
+				System.arraycopy(data, end()+1, data, end(), size-end());
+				data[end()] = o;
+				size++;
+				length++;
+				return true;
+			}
+			else if(index != 0) {
+				o = data[index];
+				System.arraycopy(data, offset+1, data, offset, index-offset);
+				data[offset+length] = o;
+			}
+			return false;
+		}
+		
+		@Override
+		public boolean moveToFirst(KEY_TYPE o) {
+			int index = findIndex(o);
+			if(index > offset) {
+				o = data[index];
+				System.arraycopy(data, offset, data, offset+1, index-offset);
+				data[offset] = o;
+				return true;
+			}
+			return false;
+		}
+		
+		@Override
+		public boolean moveToLast(KEY_TYPE o) {
+			int index = findIndex(o);
+			if(index != -1 && index < end()-1) {
+				o = data[index];
+				System.arraycopy(data, index+1, data, index, end()-index-1);
+				data[end()-1] = o;
+				return true;
+			}
+			return false;
+		}
+		
+#if !TYPE_OBJECT
+		@Override
+		public boolean contains(KEY_TYPE e) {
+			return findIndex(e) != -1;
+		}
+		
+#endif
+		@Override
+		public boolean contains(Object e) {
+			return findIndex(e) != -1;
+		}
+		
+		@Override
+		public KEY_TYPE FIRST_KEY() {
+			if(length == 0) throw new NoSuchElementException();
+			return data[offset];
+		}
+		
+		@Override
+		public KEY_TYPE LAST_KEY() {
+			if(length == 0) throw new NoSuchElementException();
+			return data[end()-1];
+		}
+		
+#if !TYPE_OBJECT
+		@Override
+		public boolean remove(KEY_TYPE o) {
+			int index = findIndex(o);
+			if(index != -1) {
+				size--;
+				length--;
+				if(index != size) System.arraycopy(data, index+1, data, index, size - index);
+				return true;
+			}
+			return false;
+		}
+		
+#endif
+		@Override
+		public boolean remove(Object o) {
+			int index = findIndex(o);
+			if(index != -1) {
+				size--;
+				length--;
+				if(index != size) System.arraycopy(data, index+1, data, index, size - index);
+#if TYPE_OBJECT
+				data[size] = EMPTY_KEY_VALUE;
+#endif
+				return true;
+			}
+			return false;
+		}
+		
+		@Override
+		public KEY_TYPE POLL_FIRST_KEY() {
+			if(length == 0) throw new NoSuchElementException();
+			size--;
+			length--;
+			KEY_TYPE result = data[offset];
+			System.arraycopy(data, offset+1, data, offset, size-offset);
+#if TYPE_OBJECT
+			data[size] = EMPTY_KEY_VALUE;
+#endif
+			return result;
+		}
+		
+		@Override
+		public KEY_TYPE POLL_LAST_KEY() {
+			if(length == 0) throw new NoSuchElementException();
+			KEY_TYPE result = data[offset+length];
+			size--;
+			length--;
+			System.arraycopy(data, end()+1, data, end(), size-end());
+#if TYPE_OBJECT
+			data[size] = EMPTY_KEY_VALUE;
+#endif
+			return result;
+		}
+		
+		@Override
+		public COMPARATOR KEY_GENERIC_TYPE comparator() {
+			return null;
+		}
+
+		@Override
+		public BI_ITERATOR KEY_GENERIC_TYPE iterator() {
+			return new SetIterator(offset);
+		}
+
+		@Override
+		public BI_ITERATOR KEY_GENERIC_TYPE iterator(KEY_TYPE fromElement) {
+			int index = findIndex(fromElement);
+			if(index != -1) return new SetIterator(index);
+			throw new NoSuchElementException();
+		}
+
+		@Override
+		public SORTED_SET KEY_GENERIC_TYPE subSet(KEY_TYPE fromElement, KEY_TYPE toElement) {
+			int fromIndex = findIndex(fromElement);
+			int toIndex = findIndex(toElement);
+			if(fromIndex == -1 || toIndex == -1) throw new NoSuchElementException();
+			return new SubSet(fromIndex, toIndex - fromIndex + 1);
+		}
+
+		@Override
+		public SORTED_SET KEY_GENERIC_TYPE headSet(KEY_TYPE toElement) {
+			int toIndex = findIndex(toElement);
+			if(toIndex == -1) throw new NoSuchElementException();
+			return new SubSet(0, toIndex+1);
+		}
+
+		@Override
+		public SORTED_SET KEY_GENERIC_TYPE tailSet(KEY_TYPE fromElement) {
+			int fromIndex = findIndex(fromElement);
+			if(fromIndex == -1) throw new NoSuchElementException();
+			return new SubSet(fromIndex, size - fromIndex);
+		}
+		
+		@Override
+		public int size() {
+			return length;
+		}
+		
+#if !TYPE_OBJECT
+		@Override
+		public KEY_TYPE[] TO_ARRAY(KEY_TYPE[] a) {
+			if(a == null || a.length < size()) return Arrays.copyOfRange(data, offset, end());
+			System.arraycopy(data, offset, a, 0, size());
+			return a;
+		}
+		
+#endif
+		@Override
+		@Deprecated
+		public Object[] toArray() {
+			Object[] obj = new Object[size()];
+			for(int i = 0;i<size();i++)
+				obj[i] = KEY_TO_OBJ(data[offset+i]);
+			return obj;
+		}
+		
+		@Override
+		@Primitive
+		public <E> E[] toArray(E[] a) {
+			if(a == null) a = (E[])new Object[size()];
+			else if(a.length < size()) a = (E[])ObjectArrays.newArray(a.getClass().getComponentType(), size());
+			for(int i = 0;i<size();i++)
+				a[i] = (E)KEY_TO_OBJ(data[offset+i]);
+			return a;
+		}
+		
+#if !TYPE_OBJECT
+		protected int findIndex(KEY_TYPE o) {
+			for(int i = length-1;i>=0;i--)
+				if(KEY_EQUALS(data[offset+i], o)) return i + offset;
+			return -1;
+		}
+		
+#endif
+		protected int findIndex(Object o) {
+			for(int i = length-1;i>=0;i--)
+				if(EQUALS_KEY_TYPE(data[offset+i], o)) return i + offset;
+			return -1;
+		}
+		
+		private class SetIterator implements LIST_ITERATOR KEY_GENERIC_TYPE {
+			int index;
+			int lastReturned = -1;
+			
+			public SetIterator(int index) {
+				this.index = index;
+			}
+			
+			@Override
+			public boolean hasNext() {
+				return index < size();
+			}
+			
+			@Override
+			public KEY_TYPE NEXT() {
+				lastReturned = index;
+				return data[index++];
+			}
+			
+			@Override
+			public boolean hasPrevious() {
+				return index > 0;
+			}
+			
+			@Override
+			public KEY_TYPE PREVIOUS() {
+				lastReturned = index;
+				return data[index--];
+			}
+			
+			@Override
+			public int nextIndex() {
+				return index;
+			}
+			
+			@Override
+			public int previousIndex() {
+				return index-1;
+			}
+			
+			@Override
+			public void remove() {
+				if(lastReturned == -1)
+					throw new IllegalStateException();
+				SubSet.this.remove(data[lastReturned]);
+				if(lastReturned < index)
+					index--;
+				lastReturned = -1;
+			}
+			
+		#if TYPE_OBJECT
+			@Override
+			public void set(Object e) { throw new UnsupportedOperationException(); }
+			
+			@Override
+			public void add(Object e) { throw new UnsupportedOperationException(); }
+			
+		#else
+			@Override
+			public void set(KEY_TYPE e) { throw new UnsupportedOperationException(); }
+		
+			@Override
+			public void add(KEY_TYPE e) { throw new UnsupportedOperationException(); }
+			
+		#endif
+			@Override
+			public int skip(int amount) {
+				if(amount < 0) throw new IllegalStateException("Negative Numbers are not allowed");
+				int steps = Math.min(amount, (size() - 1) - index);
+				index += steps;
+				return steps;
+			}
+			
+			@Override
+			public int back(int amount) {
+				if(amount < 0) throw new IllegalStateException("Negative Numbers are not allowed");
+				int steps = Math.min(amount, index);
+				index -= steps;
+				return steps;
+			}
+		}
+	}
+	
 	private class SetIterator implements LIST_ITERATOR KEY_GENERIC_TYPE {
 		int index;
 		int lastReturned = -1;
@@ -584,7 +833,6 @@ public class ARRAY_SET KEY_GENERIC_TYPE extends ABSTRACT_SET KEY_GENERIC_TYPE im
 		
 		@Override
 		public KEY_TYPE NEXT() {
-			if(!hasNext()) throw new NoSuchElementException();
 			lastReturned = index;
 			return data[index++];
 		}
@@ -596,9 +844,8 @@ public class ARRAY_SET KEY_GENERIC_TYPE extends ABSTRACT_SET KEY_GENERIC_TYPE im
 		
 		@Override
 		public KEY_TYPE PREVIOUS() {
-			if(!hasPrevious()) throw new NoSuchElementException();
-			--index;
-			return data[(lastReturned = index)];
+			lastReturned = index;
+			return data[index--];
 		}
 		
 		@Override
@@ -613,9 +860,11 @@ public class ARRAY_SET KEY_GENERIC_TYPE extends ABSTRACT_SET KEY_GENERIC_TYPE im
 		
 		@Override
 		public void remove() {
-			if(lastReturned == -1) throw new IllegalStateException();
+			if(lastReturned == -1)
+				throw new IllegalStateException();
 			ARRAY_SET.this.remove(data[lastReturned]);
-			if(lastReturned < index) index--;
+			if(lastReturned < index)
+				index--;
 			lastReturned = -1;
 		}
 		
@@ -637,9 +886,8 @@ public class ARRAY_SET KEY_GENERIC_TYPE extends ABSTRACT_SET KEY_GENERIC_TYPE im
 		@Override
 		public int skip(int amount) {
 			if(amount < 0) throw new IllegalStateException("Negative Numbers are not allowed");
-			int steps = Math.min(amount, size() - index);
+			int steps = Math.min(amount, (size() - 1) - index);
 			index += steps;
-			if(steps > 0) lastReturned = Math.min(index-1, size()-1);
 			return steps;
 		}
 		
@@ -648,7 +896,6 @@ public class ARRAY_SET KEY_GENERIC_TYPE extends ABSTRACT_SET KEY_GENERIC_TYPE im
 			if(amount < 0) throw new IllegalStateException("Negative Numbers are not allowed");
 			int steps = Math.min(amount, index);
 			index -= steps;
-			if(steps > 0) lastReturned = Math.min(index, size()-1);
 			return steps;
 		}
 	}

src/builder/resources/speiger/assets/collections/templates/sets/NavigableSet.template

@@ -4,9 +4,6 @@ import java.util.NavigableSet;
 
 import speiger.src.collections.PACKAGE.collections.BI_ITERATOR;
 import speiger.src.collections.PACKAGE.collections.SPLIT_ITERATOR;
-#if SETS_FEATURE
-import speiger.src.collections.PACKAGE.utils.SETS;
-#endif
 import speiger.src.collections.PACKAGE.utils.SPLIT_ITERATORS;
 
 /**
@@ -118,33 +115,7 @@ public interface NAVIGABLE_SET KEY_GENERIC_TYPE extends NavigableSet<CLASS_TYPE>
 	/** @return a Type Specific desendingSet */
 	@Override
 	public NAVIGABLE_SET KEY_GENERIC_TYPE descendingSet();
-	@Override
-	public NAVIGABLE_SET KEY_GENERIC_TYPE copy();
 	
-#if SETS_FEATURE
-	/**
-	 * Creates a Wrapped NavigableSet that is Synchronized
-	 * @return a new NavigableSet that is synchronized
-	 * @see SETS#synchronize
-	 */
-	public default NAVIGABLE_SET KEY_GENERIC_TYPE synchronize() { return SETS.synchronize(this); }
-	
-	/**
-	 * Creates a Wrapped NavigableSet that is Synchronized
-	 * @param mutex is the controller of the synchronization block
-	 * @return a new NavigableSet Wrapper that is synchronized
-	 * @see SETS#synchronize
-	 */
-	public default NAVIGABLE_SET KEY_GENERIC_TYPE synchronize(Object mutex) { return SETS.synchronize(this, mutex); }
-	
-	/**
-	 * Creates a Wrapped NavigableSet that is unmodifiable
-	 * @return a new NavigableSet Wrapper that is unmodifiable
-	 * @see SETS#unmodifiable
-	 */
-	public default NAVIGABLE_SET KEY_GENERIC_TYPE unmodifiable() { return SETS.unmodifiable(this); }
-	
-#endif
 	/**
 	 * A Type Specific Type Splititerator to reduce boxing/unboxing
 	 * @return type specific splititerator
@@ -173,10 +144,10 @@ public interface NAVIGABLE_SET KEY_GENERIC_TYPE extends NavigableSet<CLASS_TYPE>
 	default CLASS_TYPE last() { return SORTED_SET.super.last(); }
 	@Override
 	@Deprecated
-	public default CLASS_TYPE pollFirst() { return isEmpty() ? null : KEY_TO_OBJ(POLL_FIRST_KEY()); }
+	public default CLASS_TYPE pollFirst() { return KEY_TO_OBJ(POLL_FIRST_KEY()); }
 	@Override
 	@Deprecated
-	public default CLASS_TYPE pollLast() { return isEmpty() ? null : KEY_TO_OBJ(POLL_LAST_KEY()); }
+	public default CLASS_TYPE pollLast() { return KEY_TO_OBJ(POLL_LAST_KEY()); }
 	
 	@Override
 	@Deprecated

src/builder/resources/speiger/assets/collections/templates/sets/OrderedSet.template

@@ -1,116 +0,0 @@
-package speiger.src.collections.PACKAGE.sets;
-
-import speiger.src.collections.PACKAGE.collections.BI_ITERATOR;
-import speiger.src.collections.PACKAGE.collections.SPLIT_ITERATOR;
-#if SETS_FEATURE
-import speiger.src.collections.PACKAGE.utils.SETS;
-#endif
-import speiger.src.collections.PACKAGE.utils.SPLIT_ITERATORS;
-
-/**
- * A Special Set Interface giving Access to some really usefull functions
- * The Idea behind this interface is to allow access to functions that give control to the Order of elements.
- * Since Linked implementations as examples can be reordered outside of the Insertion Order.
- * This interface provides basic access to such functions while also providing some Sorted/NaivgableSet implementations that still fit into here.
- * 
- * @Type(T)
- */
-public interface ORDERED_SET KEY_GENERIC_TYPE extends SET KEY_GENERIC_TYPE
-{
-	/**
-	 * A customized add method that allows you to insert into the first index.
-	 * @param o the element that should be inserted
-	 * @return true if it was added
-	 * @see java.util.Set#add(Object)
-	 */
-	public boolean addAndMoveToFirst(KEY_TYPE o);
-	/**
-	 * A customized add method that allows you to insert into the last index.
-	 * @param o the element that should be inserted
-	 * @return true if it was added
-	 * @see java.util.Set#add(Object)
-	 */
-	public boolean addAndMoveToLast(KEY_TYPE o);
-	
-	/**
-	 * A specific move method to move a given key to the first index.
-	 * @param o that should be moved to the first index
-	 * @return true if the value was moved.
-	 * @note returns false if the value was not present in the first place
-	 */
-	public boolean moveToFirst(KEY_TYPE o);
-	/**
-	 * A specific move method to move a given key to the last index.
-	 * @param o that should be moved to the first last
-	 * @return true if the value was moved.
-	 * @note returns false if the value was not present in the first place
-	 */
-	public boolean moveToLast(KEY_TYPE o);
-	
-	@Override
-	public ORDERED_SET KEY_GENERIC_TYPE copy();
-	
-	@Override
-	public BI_ITERATOR KEY_GENERIC_TYPE iterator();
-	
-	/**
-	 * A type Specific Iterator starting from a given key
-	 * @param fromElement the element the iterator should start from
-	 * @return a iterator starting from the given element
-	 * @throws java.util.NoSuchElementException if fromElement isn't found
-	 */
-	public BI_ITERATOR KEY_GENERIC_TYPE iterator(KEY_TYPE fromElement);
-	
-	/**
-	 * A Type Specific Type Splititerator to reduce boxing/unboxing
-	 * @return type specific splititerator
-	 */
-	@Override
-	default SPLIT_ITERATOR KEY_GENERIC_TYPE spliterator() { return SPLIT_ITERATORS.createSplititerator(this, 0); }
-	
-	/**
-	 * A method to get the first element in the set
-	 * @return first element in the set
-	 */
-	public KEY_TYPE FIRST_KEY();
-	/**
-	 * A method to get and remove the first element in the set
-	 * @return first element in the set
-	 */
-	public KEY_TYPE POLL_FIRST_KEY();
-	/**
-	 * A method to get the last element in the set
-	 * @return last element in the set
-	 */
-	public KEY_TYPE LAST_KEY();
-	/**
-	 * A method to get and remove the last element in the set
-	 * @return last element in the set
-	 */
-	public KEY_TYPE POLL_LAST_KEY();
-	
-#if SETS_FEATURE
-	/**
-	 * Creates a Wrapped OrderedSet that is Synchronized
-	 * @return a new OrderedSet that is synchronized
-	 * @see SETS#synchronize
-	 */
-	public default ORDERED_SET KEY_GENERIC_TYPE synchronize() { return SETS.synchronize(this); }
-	
-	/**
-	 * Creates a Wrapped OrderedSet that is Synchronized
-	 * @param mutex is the controller of the synchronization block
-	 * @return a new OrderedSet Wrapper that is synchronized
-	 * @see SETS#synchronize
-	 */
-	public default ORDERED_SET KEY_GENERIC_TYPE synchronize(Object mutex) { return SETS.synchronize(this, mutex); }
-	
-	/**
-	 * Creates a Wrapped OrderedSet that is unmodifiable
-	 * @return a new OrderedSet Wrapper that is unmodifiable
-	 * @see SETS#unmodifiable
-	 */
-	public default ORDERED_SET KEY_GENERIC_TYPE unmodifiable() { return SETS.unmodifiable(this); }
-	
-#endif
-}

src/builder/resources/speiger/assets/collections/templates/sets/Set.template

@@ -5,24 +5,17 @@ import java.util.Set;
 import speiger.src.collections.PACKAGE.collections.COLLECTION;
 import speiger.src.collections.PACKAGE.collections.ITERATOR;
 import speiger.src.collections.PACKAGE.collections.SPLIT_ITERATOR;
-#if SETS_FEATURE
-import speiger.src.collections.PACKAGE.utils.SETS;
-#endif
 import speiger.src.collections.PACKAGE.utils.SPLIT_ITERATORS;
 
-
 /**
  * A Type Specific Set class to reduce boxing/unboxing
  * @Type(T)
  */
 public interface SET KEY_GENERIC_TYPE extends Set<CLASS_TYPE>, COLLECTION KEY_GENERIC_TYPE
-{	
+{
 	@Override
 	public ITERATOR KEY_GENERIC_TYPE iterator();
 	
-	@Override
-	public SET KEY_GENERIC_TYPE copy();
-	
 #if !TYPE_OBJECT
 	/**
 	 * A Type Specific remove function to reduce boxing/unboxing
@@ -53,40 +46,6 @@ public interface SET KEY_GENERIC_TYPE extends Set<CLASS_TYPE>, COLLECTION KEY_GE
 	public default boolean remove(Object o) {
 		return COLLECTION.super.remove(o);
 	}
-	
-#else
-	/**
-	 * A Helper method that allows to add a element or getting the already present implement.
-	 * Allowing to make unique references reuseable.
-	 * @param o the element to add
-	 * @return either the inserted element or the present element.
-	 */
-	public KEY_TYPE addOrGet(KEY_TYPE o);
-	
-#endif
-#if SETS_FEATURE
-	/**
-	 * Creates a Wrapped Set that is Synchronized
-	 * @return a new Set that is synchronized
-	 * @see SETS#synchronize
-	 */
-	public default SET KEY_GENERIC_TYPE synchronize() { return SETS.synchronize(this); }
-	
-	/**
-	 * Creates a Wrapped Set that is Synchronized
-	 * @param mutex is the controller of the synchronization block
-	 * @return a new Set Wrapper that is synchronized
-	 * @see SETS#synchronize
-	 */
-	public default SET KEY_GENERIC_TYPE synchronize(Object mutex) { return SETS.synchronize(this, mutex); }
-	
-	/**
-	 * Creates a Wrapped Set that is unmodifiable
-	 * @return a new Set Wrapper that is unmodifiable
-	 * @see SETS#unmodifiable
-	 */
-	public default SET KEY_GENERIC_TYPE unmodifiable() { return SETS.unmodifiable(this); }
-	
 #endif
 	/**
 	 * A Type Specific Type Splititerator to reduce boxing/unboxing

src/builder/resources/speiger/assets/collections/templates/sets/SortedSet.template

@@ -9,20 +9,50 @@ import java.util.Comparator;
 #else
 import speiger.src.collections.PACKAGE.functions.COMPARATOR;
 #endif
-#if SETS_FEATURE
-import speiger.src.collections.PACKAGE.utils.SETS;
-#endif
 import speiger.src.collections.PACKAGE.utils.SPLIT_ITERATORS;
 
 /**
  * A Type Specific SortedSet implementation to reduce boxing/unboxing
  * with a couple extra methods that allow greater control over sets.
  * @Type(T)
- * @note ORDERED_SET is only extended until 0.6.0 for Compat reasons.
- * The supported classes already implement ORDERED_SET directly and will remove SORTED_SET implementations in favor of ORDERED_SET instead
  */
 public interface SORTED_SET KEY_GENERIC_TYPE extends SET KEY_GENERIC_TYPE, SortedSet<CLASS_TYPE>
 {
+	
+	/**
+	 * A customized add method that allows you to insert into the first index.
+	 * @param o the element that should be inserted
+	 * @return true if it was added
+	 * @see java.util.Set#add(Object)
+	 * @note some implementations do not support this method
+	 */
+	public boolean addAndMoveToFirst(KEY_TYPE o);
+	/**
+	 * A customized add method that allows you to insert into the last index.
+	 * @param o the element that should be inserted
+	 * @return true if it was added
+	 * @see java.util.Set#add(Object)
+	 * @note some implementations do not support this method
+	 */
+	public boolean addAndMoveToLast(KEY_TYPE o);
+	
+	/**
+	 * A specific move method to move a given key to the first index.
+	 * @param o that should be moved to the first index
+	 * @return true if the value was moved.
+	 * @note returns false if the value was not present in the first place
+	 * @note some implementations do not support this method
+	 */
+	public boolean moveToFirst(KEY_TYPE o);
+	/**
+	 * A specific move method to move a given key to the last index.
+	 * @param o that should be moved to the first last
+	 * @return true if the value was moved.
+	 * @note returns false if the value was not present in the first place
+	 * @note some implementations do not support this method
+	 */
+	public boolean moveToLast(KEY_TYPE o);
+	
 	/**
 	 * A Type Specific Comparator method
 	 * @return the type specific comparator
@@ -30,9 +60,6 @@ public interface SORTED_SET KEY_GENERIC_TYPE extends SET KEY_GENERIC_TYPE, Sorte
 	@Override
 	public COMPARATOR KEY_GENERIC_TYPE comparator();
 	
-	@Override
-	public SORTED_SET KEY_GENERIC_TYPE copy();
-	
 	@Override
 	public BI_ITERATOR KEY_GENERIC_TYPE iterator();
 	/**
@@ -43,30 +70,6 @@ public interface SORTED_SET KEY_GENERIC_TYPE extends SET KEY_GENERIC_TYPE, Sorte
 	 */
 	public BI_ITERATOR KEY_GENERIC_TYPE iterator(KEY_TYPE fromElement);
 	
-#if SETS_FEATURE
-	/**
-	 * Creates a Wrapped SortedSet that is Synchronized
-	 * @return a new SortedSet that is synchronized
-	 * @see SETS#synchronize
-	 */
-	public default SORTED_SET KEY_GENERIC_TYPE synchronize() { return SETS.synchronize(this); }
-	
-	/**
-	 * Creates a Wrapped SortedSet that is Synchronized
-	 * @param mutex is the controller of the synchronization block
-	 * @return a new SortedSet Wrapper that is synchronized
-	 * @see SETS#synchronize
-	 */
-	public default SORTED_SET KEY_GENERIC_TYPE synchronize(Object mutex) { return SETS.synchronize(this, mutex); }
-	
-	/**
-	 * Creates a Wrapped SortedSet that is unmodifiable
-	 * @return a new SortedSet Wrapper that is unmodifiable
-	 * @see SETS#unmodifiable
-	 */
-	public default SORTED_SET KEY_GENERIC_TYPE unmodifiable() { return SETS.unmodifiable(this); }
-	
-#endif
 	/**
 	 * A Type Specific Type Splititerator to reduce boxing/unboxing
 	 * @return type specific splititerator

src/builder/resources/speiger/assets/collections/templates/utils/IArray.template

@@ -7,9 +7,7 @@ import speiger.src.collections.utils.IArray;
 
 /**
  * Type-Specific Helper class to get the underlying array of array implementations.
-#if ARRAY_LIST_FEATURE
  * @see speiger.src.collections.PACKAGE.lists.ARRAY_LIST
-#endif
  * @Type(T)
  */
 public interface IARRAY KEY_GENERIC_TYPE extends IArray

src/builder/resources/speiger/assets/collections/templates/utils/Iterables.template

@@ -1,682 +1,127 @@
-package speiger.src.collections.PACKAGE.utils;
-
-import java.util.Objects;
-#if TYPE_BOOLEAN
-import java.util.concurrent.atomic.AtomicInteger;
-#else if TYPE_OBJECT
-import java.util.Comparator;
-#endif
-import java.util.concurrent.atomic.AtomicLong;
-import java.util.function.Consumer;
-#if JDK_FUNCTION
-import java.util.function.PREDICATE;
-#endif
-
-import speiger.src.collections.PACKAGE.collections.ITERABLE;
-import speiger.src.collections.PACKAGE.collections.COLLECTION;
-#if !TYPE_OBJECT
-import speiger.src.collections.objects.collections.ObjectIterable;
-import speiger.src.collections.objects.collections.ObjectIterator;
-import speiger.src.collections.PACKAGE.functions.CONSUMER;
-import speiger.src.collections.PACKAGE.functions.COMPARATOR;
-#else
-#if BOOLEAN_COLLECTION_MODULE
-import speiger.src.collections.booleans.functions.BooleanConsumer;
-import speiger.src.collections.booleans.collections.BooleanIterable;
-import speiger.src.collections.booleans.collections.BooleanIterator;
-#endif
-#iterate
-#argument FILTER_TYPE BYTE_COLLECTION_MODULE SHORT_COLLECTION_MODULE INT_COLLECTION_MODULE LONG_COLLECTION_MODULE FLOAT_COLLECTION_MODULE DOUBLE_COLLECTION_MODULE
-#argument CONSUMER ByteConsumer ShortConsumer IntConsumer LongConsumer FloatConsumer DoubleConsumer
-#argument OUTPUT_ITERABLE ByteIterable ShortIterable IntIterable LongIterable FloatIterable DoubleIterable
-#argument OUTPUT_ITERATOR ByteIterator ShortIterator IntIterator LongIterator FloatIterator DoubleIterator
-#argument MAPPER ToByteFunction ToShortFunction ToIntFunction ToLongFunction ToFloatFunction ToDoubleFunction
-#argument PACKAGE bytes shorts ints longs floats doubles
-#if FILTER_TYPE
-import speiger.src.collections.PACKAGE.functions.CONSUMER;
-import speiger.src.collections.objects.functions.function.MAPPER;
-import speiger.src.collections.PACKAGE.collections.OUTPUT_ITERABLE;
-import speiger.src.collections.PACKAGE.collections.OUTPUT_ITERATOR;
-#endif
-#enditerate
-#endif
-import speiger.src.collections.PACKAGE.collections.ITERATOR;
-import speiger.src.collections.PACKAGE.functions.function.TO_OBJECT_FUNCTION;
-#if !JDK_FUNCTION
-import speiger.src.collections.PACKAGE.functions.function.PREDICATE;
-#endif
-import speiger.src.collections.utils.ISizeProvider;
-
-/**
- * A Helper class for Iterables
- */
-public class ITERABLES
-{
-	/**
-	 * A Helper function that maps a Java-Iterable into a new Type.
-	 * @param iterable the iterable that should be mapped
-	 * @param mapper the function that decides what the result turns into.
-	 * @Type(T)
-	 * @param <E> The return type.
-	 * @return a iterable that is mapped to a new result
-	 */
-	public static GENERIC_KEY_SPECIAL_BRACES<E> ObjectIterable<E> map(Iterable<? extends CLASS_TYPE> iterable, TO_OBJECT_FUNCTION KKS_GENERIC_TYPE<E> mapper) {
-		return new MappedIterable<>(wrap(iterable), mapper);
-	}
-	
-	/**
-	 * A Helper function that maps a Iterable into a new Type.
-	 * @param iterable the iterable that should be mapped
-	 * @param mapper the function that decides what the result turns into.
-	 * @Type(T)
-	 * @param <E> The return type.
-	 * @return a iterable that is mapped to a new result
-	 */
-	public static GENERIC_KEY_SPECIAL_BRACES<E> ObjectIterable<E> map(ITERABLE KEY_GENERIC_TYPE iterable, TO_OBJECT_FUNCTION KKS_GENERIC_TYPE<E> mapper) {
-		return new MappedIterable<>(iterable, mapper);
-	}
-	
-#if TYPE_OBJECT
-#iterate
-#argument MAPPED_TYPE MappedBoolean MappedByte MappedShort MappedInt MappedLong MappedFloat MappedDouble
-#argument OUTPUT_ITERABLE BooleanIterable ByteIterable ShortIterable IntIterable LongIterable FloatIterable DoubleIterable
-#argument MAPPER Predicate ToByteFunction ToShortFunction ToIntFunction ToLongFunction ToFloatFunction ToDoubleFunction
-#argument DATA_TYPE Boolean Byte Short Int Long Float Double
-#argument FILTER_TYPE BOOLEAN_COLLECTION_MODULE BYTE_COLLECTION_MODULE SHORT_COLLECTION_MODULE INT_COLLECTION_MODULE LONG_COLLECTION_MODULE FLOAT_COLLECTION_MODULE DOUBLE_COLLECTION_MODULE
-#if FILTER_TYPE
-	/**
-	 * A Helper function that maps a Java-Iterable into a new Type.
-	 * @param iterable the iterable that should be mapped
-	 * @param mapper the function that decides what the result turns into.
-	 * @Type(T)
-	 * @return a iterable that is mapped to a new result
-	 */
-	public static <T> OUTPUT_ITERABLE mapToDATA_TYPE(Iterable<? extends CLASS_TYPE> iterable, MAPPER<T> mapper) {
-		return new MAPPED_TYPEIterable<>(wrap(iterable), mapper);
-	}
-	
-	/**
-	 * A Helper function that maps a Iterable into a new Type.
-	 * @param iterable the iterable that should be mapped
-	 * @param mapper the function that decides what the result turns into.
-	 * @Type(T)
-	 * @return a iterable that is mapped to a new result
-	 */
-	public static <T> OUTPUT_ITERABLE mapToDATA_TYPE(ITERABLE KEY_GENERIC_TYPE iterable, MAPPER<T> mapper) {
-		return new MAPPED_TYPEIterable<>(iterable, mapper);
-	}
-	
-#endif
-#enditerate
-#endif
-	/**
-	 * A Helper function that flatMaps a Java-Iterable into a new Type.
-	 * @param iterable the iterable that should be flatMapped
-	 * @param mapper the function that decides what the result turns into.
-	 * @Type(T)
-	 * @param <V> The return type supplier.
-	 * @param <E> The return type.
-	 * @return a iterable that is flatMapped to a new result
-	 */
-	public static GENERIC_KEY_SPECIAL_BRACES<E, V extends Iterable<E>> ObjectIterable<E> flatMap(Iterable<? extends CLASS_TYPE> iterable, TO_OBJECT_FUNCTION KKS_GENERIC_TYPE<V> mapper) {
-		return new FlatMappedIterable<>(wrap(iterable), mapper);
-	}
-	
-	/**
-	 * A Helper function that flatMaps a Iterable into a new Type.
-	 * @param iterable the iterable that should be flatMapped
-	 * @param mapper the function that decides what the result turns into.
-	 * @Type(T)
-	 * @param <V> The return type supplier.
-	 * @param <E> The return type.
-	 * @return a iterable that is flatMapped to a new result
-	 */
-	public static GENERIC_KEY_SPECIAL_BRACES<E, V extends Iterable<E>> ObjectIterable<E> flatMap(ITERABLE KEY_GENERIC_TYPE iterable, TO_OBJECT_FUNCTION KKS_GENERIC_TYPE<V> mapper) {
-		return new FlatMappedIterable<>(iterable, mapper);
-	}
-	
-	/**
-	 * A Helper function that flatMaps a Java-Iterable into a new Type.
-	 * @param iterable the iterable that should be flatMapped
-	 * @param mapper the function that decides what the result turns into.
-	 * @Type(T)
-	 * @param <E> The return type.
-	 * @return a iterable that is flatMapped to a new result
-	 */
-	public static GENERIC_KEY_SPECIAL_BRACES<E> ObjectIterable<E> arrayFlatMap(Iterable<? extends CLASS_TYPE> iterable, TO_OBJECT_FUNCTION KKS_GENERIC_TYPE<E[]> mapper) {
-		return new FlatMappedArrayIterable<>(wrap(iterable), mapper);
-	}
-	
-	/**
-	 * A Helper function that flatMaps a Iterable into a new Type.
-	 * @param iterable the iterable that should be flatMapped
-	 * @param mapper the function that decides what the result turns into.
-	 * @Type(T)
-	 * @param <E> The return type.
-	 * @return a iterable that is flatMapped to a new result
-	 */
-	public static GENERIC_KEY_SPECIAL_BRACES<E> ObjectIterable<E> arrayFlatMap(ITERABLE KEY_GENERIC_TYPE iterable, TO_OBJECT_FUNCTION KKS_GENERIC_TYPE<E[]> mapper) {
-		return new FlatMappedArrayIterable<>(iterable, mapper);
-	}
-	
-	/**
-	 * A Helper function that filters out all desired elements from a Java-Iterable
-	 * @param iterable that should be filtered.
-	 * @param filter the filter that decides that should be let through
-	 * @Type(T)
-	 * @return a filtered iterable
-	 */
-	public static GENERIC_KEY_BRACES ITERABLE KEY_GENERIC_TYPE filter(Iterable<? extends CLASS_TYPE> iterable, PREDICATE KEY_GENERIC_TYPE filter) {
-		return new FilteredIterableBRACES(wrap(iterable), filter);
-	}
-	
-	/**
-	 * A Helper function that filters out all desired elements
-	 * @param iterable that should be filtered.
-	 * @param filter the filter that decides that should be let through
-	 * @Type(T)
-	 * @return a filtered iterable
-	 */
-	public static GENERIC_KEY_BRACES ITERABLE KEY_GENERIC_TYPE filter(ITERABLE KEY_GENERIC_TYPE iterable, PREDICATE KEY_GENERIC_TYPE filter) {
-		return new FilteredIterableBRACES(iterable, filter);
-	}
-	
-	/**
-	 * A Helper function that filters out all duplicated elements.
-	 * @param iterable that should be distinct
-	 * @Type(T)
-	 * @return a distinct iterable
-	 */
-	public static GENERIC_KEY_BRACES ITERABLE KEY_GENERIC_TYPE distinct(ITERABLE KEY_GENERIC_TYPE iterable) {
-		return new DistinctIterableBRACES(iterable);
-	}
-	
-	/**
-	 * A Helper function that filters out all duplicated elements from a Java Iterable.
-	 * @param iterable that should be distinct
-	 * @Type(T)
-	 * @return a distinct iterable
-	 */
-	public static GENERIC_KEY_BRACES ITERABLE KEY_GENERIC_TYPE distinct(Iterable<? extends CLASS_TYPE> iterable) {
-		return new DistinctIterableBRACES(wrap(iterable));
-	}
-	
-	/**
-	 * A Helper function that repeats the Iterable a specific amount of times
-	 * @param iterable that should be repeated
-	 * @param repeats the amount of times the iterable should be repeated
-	 * @Type(T)
-	 * @return a repeating iterable
-	 */
-	public static GENERIC_KEY_BRACES ITERABLE KEY_GENERIC_TYPE repeat(ITERABLE KEY_GENERIC_TYPE iterable, int repeats) {
-		return new RepeatingIterableBRACES(iterable, repeats);
-	}
-	
-	/**
-	 * A Helper function that repeats the Iterable a specific amount of times from a Java Iterable
-	 * @param iterable that should be repeated
-	 * @param repeats the amount of times the iterable should be repeated
-	 * @Type(T)
-	 * @return a repeating iterable
-	 */
-	public static GENERIC_KEY_BRACES ITERABLE KEY_GENERIC_TYPE repeat(Iterable<? extends CLASS_TYPE> iterable, int repeats) {
-		return new RepeatingIterableBRACES(wrap(iterable), repeats);
-	}
-	
-	/**
-	 * A Helper function that hard limits the Iterable to a specific size
-	 * @param iterable that should be limited
-	 * @param limit the amount of elements it should be limited to
-	 * @Type(T)
-	 * @return a limited iterable
-	 */
-	public static GENERIC_KEY_BRACES ITERABLE KEY_GENERIC_TYPE limit(ITERABLE KEY_GENERIC_TYPE iterable, long limit) {
-		return new LimitedIterableBRACES(iterable, limit);
-	}
-	
-	/**
-	 * A Helper function that hard limits the Iterable to a specific size from a Java Iterable
-	 * @param iterable that should be limited
-	 * @param limit the amount of elements it should be limited to
-	 * @Type(T)
-	 * @return a limited iterable
-	 */
-	public static GENERIC_KEY_BRACES ITERABLE KEY_GENERIC_TYPE limit(Iterable<? extends CLASS_TYPE> iterable, long limit) {
-		return new LimitedIterableBRACES(wrap(iterable), limit);
-	}
-	
-	/**
-	 * A Helper function that sorts the Iterable.
-	 * This operation is heavily hurting performance because it rebuilds the entire iterator and then sorts it.
-	 * @param iterable that should be sorted
-	 * @param sorter that sorts the iterable. Can be null.
-	 * @Type(T)
-	 * @return a sorted iterable.
-	 */
-	public static GENERIC_KEY_BRACES ITERABLE KEY_GENERIC_TYPE sorted(ITERABLE KEY_GENERIC_TYPE iterable, COMPARATOR KEY_GENERIC_TYPE sorter) {
-		return new SortedIterableBRACES(iterable, sorter);
-	}
-	
-	/**
-	 * A Helper function that sorts the Iterable from a Java Iterable
-	 * This operation is heavily hurting performance because it rebuilds the entire iterator and then sorts it.
-	 * @param iterable that should be sorted
-	 * @param sorter that sorts the iterable. Can be null.
-	 * @Type(T)
-	 * @return a sorted iterable.
-	 */
-	public static GENERIC_KEY_BRACES ITERABLE KEY_GENERIC_TYPE sorted(Iterable<? extends CLASS_TYPE> iterable, COMPARATOR KEY_GENERIC_TYPE sorter) {
-		return new SortedIterableBRACES(wrap(iterable), sorter);
-	}
-	
-	/**
-	 * A Helper function that allows to preview the result of a Iterable.
-	 * @param iterable that should be peeked at
-	 * @param action callback that receives the value before the iterable returns it
-	 * @Type(T)
-	 * @return a peeked iterable
-	 */
-	public static GENERIC_KEY_BRACES ITERABLE KEY_GENERIC_TYPE peek(ITERABLE KEY_GENERIC_TYPE iterable, CONSUMER KEY_GENERIC_TYPE action) {
-		return new PeekIterableBRACES(iterable, action);
-	}
-	
-	/**
-	 * A Helper function that allows to preview the result of a Iterable from a Java Iterable
-	 * @param iterable that should be peeked at
-	 * @param action callback that receives the value before the iterable returns it
-	 * @Type(T)
-	 * @return a peeked iterable
-	 */
-	public static GENERIC_KEY_BRACES ITERABLE KEY_GENERIC_TYPE peek(Iterable<? extends CLASS_TYPE> iterable, CONSUMER KEY_GENERIC_TYPE action) {
-		return new PeekIterableBRACES(wrap(iterable), action);
-	}
-	
-	/**
-	 * A Wrapper function that wraps a Java-Iterable into a Type Specific Iterable
-	 * @param iterable that should be wrapped
-	 * @Type(T)
-	 * @return a type specific iterable
-	 */
-	public static GENERIC_KEY_BRACES ITERABLE KEY_GENERIC_TYPE wrap(Iterable<? extends CLASS_TYPE> iterable) {
-		return new WrappedIterableBRACES(iterable);
-	}
-	
-	private static class WrappedIterable KEY_GENERIC_TYPE implements ITERABLE KEY_GENERIC_TYPE, ISizeProvider
-	{
-		Iterable<? extends CLASS_TYPE> iterable;
-		
-		public WrappedIterable(Iterable<? extends CLASS_TYPE> iterable) {
-			this.iterable = iterable;
-		}
-		
-		public ITERATOR KEY_GENERIC_TYPE iterator() {
-			return ITERATORS.wrap(iterable.iterator());
-		}
-		
-		@Override
-		public int size() {
-			ISizeProvider prov = ISizeProvider.of(iterable);
-			return prov == null ? -1 : prov.size();
-		}
-		
-#if !TYPE_OBJECT
-		@Override
-		public void forEach(CONSUMER action) {
-			Objects.requireNonNull(action);
-			iterable.forEach(action);
-		}
-#else
-		public void forEach(Consumer<? super CLASS_TYPE> action) {
-			Objects.requireNonNull(action);
-			iterable.forEach(action);
-		}
-#endif
-	}
-	
-#if TYPE_OBJECT
-#iterate
-#argument CONSUMER BooleanConsumer ByteConsumer ShortConsumer IntConsumer LongConsumer FloatConsumer DoubleConsumer
-#argument MAPPED_TYPE MappedBoolean MappedByte MappedShort MappedInt MappedLong MappedFloat MappedDouble
-#argument OUTPUT_ITERABLE BooleanIterable ByteIterable ShortIterable IntIterable LongIterable FloatIterable DoubleIterable
-#argument OUTPUT_ITERATOR BooleanIterator ByteIterator ShortIterator IntIterator LongIterator FloatIterator DoubleIterator
-#argument MAPPER Predicate ToByteFunction ToShortFunction ToIntFunction ToLongFunction ToFloatFunction ToDoubleFunction
-#argument APPLY test applyAsByte applyAsShort applyAsInt applyAsLong applyAsFloat applyAsDouble
-#argument DATA_TYPE Boolean Byte Short Int Long Float Double
-#argument FILTER_TYPE BOOLEAN_COLLECTION_MODULE BYTE_COLLECTION_MODULE SHORT_COLLECTION_MODULE INT_COLLECTION_MODULE LONG_COLLECTION_MODULE FLOAT_COLLECTION_MODULE DOUBLE_COLLECTION_MODULE
-#if FILTER_TYPE
-	private static class MAPPED_TYPEIterable<E> implements OUTPUT_ITERABLE, ISizeProvider
-	{
-		ITERABLE KEY_SPECIAL_GENERIC_TYPE<E> iterable;
-		MAPPER<E> mapper;
-		
-		MAPPED_TYPEIterable(ITERABLE<E> iterable, MAPPER<E> mapper) {
-			this.iterable = iterable;
-			this.mapper = mapper;
-		}
-		
-		public OUTPUT_ITERATOR iterator() {
-			return ITERATORS.mapToDATA_TYPE(iterable.iterator(), mapper);
-		}
-		
-		@Override
-		public int size() {
-			ISizeProvider prov = ISizeProvider.of(this);
-			return prov == null ? -1 : prov.size();
-		}
-		
-		@Override
-		public void forEach(CONSUMER action) {
-			Objects.requireNonNull(action);
-			iterable.forEach(E -> action.accept(mapper.APPLY(E)));
-		}
-	}
-	
-#endif
-#enditerate
-#endif
-	private static class MappedIterable KSS_GENERIC_TYPE<E, T> implements ObjectIterable<T>, ISizeProvider
-	{
-		ITERABLE KEY_SPECIAL_GENERIC_TYPE<E> iterable;
-		TO_OBJECT_FUNCTION KSS_GENERIC_TYPE<E, T> mapper;
-		
-		MappedIterable(ITERABLE KEY_SPECIAL_GENERIC_TYPE<E> iterable, TO_OBJECT_FUNCTION KSS_GENERIC_TYPE<E, T> mapper) {
-			this.iterable = iterable;
-			this.mapper = mapper;
-		}
-		
-		public ObjectIterator<T> iterator() {
-			return ITERATORS.map(iterable.iterator(), mapper);
-		}
-		
-		@Override
-		public int size() {
-			ISizeProvider prov = ISizeProvider.of(this);
-			return prov == null ? -1 : prov.size();
-		}
-		
-		@Override
-		public void forEach(Consumer<? super T> action) {
-			Objects.requireNonNull(action);
-			iterable.forEach(E -> action.accept(mapper.apply(E)));
-		}
-	}
-	
-	private static class FlatMappedIterable KSS_GENERIC_TYPE<E, T,[SPACE]V extends Iterable<T>> implements ObjectIterable<T>
-	{
-		ITERABLE KEY_SPECIAL_GENERIC_TYPE<E> iterable;
-		TO_OBJECT_FUNCTION KSS_GENERIC_TYPE<E, V> mapper;
-		
-		FlatMappedIterable(ITERABLE KEY_SPECIAL_GENERIC_TYPE<E> iterable, TO_OBJECT_FUNCTION KSS_GENERIC_TYPE<E, V> mapper) {
-			this.iterable = iterable;
-			this.mapper = mapper;
-		}
-		
-		@Override
-		public ObjectIterator<T> iterator() {
-			return ITERATORS.flatMap(iterable.iterator(), mapper);
-		}
-		
-		@Override
-		public void forEach(Consumer<? super T> action) {
-			Objects.requireNonNull(action);
-			iterable.forEach(E -> mapper.apply(E).forEach(action));
-		}
-		
-	}
-	
-	private static class FlatMappedArrayIterable KSS_GENERIC_TYPE<E, T> implements ObjectIterable<T>
-	{
-		ITERABLE KEY_SPECIAL_GENERIC_TYPE<E> iterable;
-		TO_OBJECT_FUNCTION KSS_GENERIC_TYPE<E, T[]> mapper;
-		
-		FlatMappedArrayIterable(ITERABLE KEY_SPECIAL_GENERIC_TYPE<E> iterable, TO_OBJECT_FUNCTION KSS_GENERIC_TYPE<E, T[]> mapper) {
-			this.iterable = iterable;
-			this.mapper = mapper;
-		}
-		
-		@Override
-		public ObjectIterator<T> iterator() {
-			return ITERATORS.arrayFlatMap(iterable.iterator(), mapper);
-		}
-		
-		@Override
-		public void forEach(Consumer<? super T> action) {
-			Objects.requireNonNull(action);
-			iterable.forEach(E -> {
-				T[] array = mapper.apply(E);
-				for(int i = 0,m=array.length;i<m;action.accept(array[i++]));
-			});
-		}
-	}
-	
-	private static class RepeatingIterable KEY_GENERIC_TYPE implements ITERABLE KEY_GENERIC_TYPE, ISizeProvider
-	{
-		ITERABLE KEY_GENERIC_TYPE iterable;
-		int repeats;
-		
-		public RepeatingIterable(ITERABLE KEY_GENERIC_TYPE iterable, int repeats) {
-			this.iterable = iterable;
-			this.repeats = repeats;
-		}
-		
-		@Override
-		public ITERATOR KEY_GENERIC_TYPE iterator() {
-			return ITERATORS.repeat(iterable.iterator(), repeats);
-		}
-		
-		@Override
-		public int size() {
-			ISizeProvider prov = ISizeProvider.of(iterable);
-			return prov == null ? -1 : prov.size() * (repeats+1);
-		}
-		
-#if !TYPE_OBJECT
-		@Override
-		public void forEach(CONSUMER action) {
-			Objects.requireNonNull(action);
-			COLLECTION KEY_GENERIC_TYPE repeater = COLLECTIONS.wrapper();
-			iterable.forEach(action.andThen(repeater::add));
-			for(int i = 0;i<repeats;i++)
-				repeater.forEach(action);
-		}
-#else
-		@Override
-		public void forEach(Consumer<? super CLASS_TYPE> action) {
-			Objects.requireNonNull(action);
-			COLLECTION KEY_GENERIC_TYPE repeater = COLLECTIONS.wrapper();
-			iterable.forEach(T -> {action.accept(T); repeater.add(T);});
-			for(int i = 0;i<repeats;i++)
-				repeater.forEach(action);
-		}
-#endif
-	}
-	
-	private static class FilteredIterable KEY_GENERIC_TYPE implements ITERABLE KEY_GENERIC_TYPE
-	{
-		ITERABLE KEY_GENERIC_TYPE iterable;
-		PREDICATE KEY_GENERIC_TYPE filter;
-		
-		public FilteredIterable(ITERABLE KEY_GENERIC_TYPE iterable, PREDICATE KEY_GENERIC_TYPE filter) {
-			this.iterable = iterable;
-			this.filter = filter;
-		}
-		
-		@Override
-		public ITERATOR KEY_GENERIC_TYPE iterator() {
-			return ITERATORS.filter(iterable.iterator(), filter);
-		}
-		
-#if !TYPE_OBJECT
-		@Override
-		public void forEach(CONSUMER action) {
-			Objects.requireNonNull(action);
-			iterable.forEach(T -> { if(!filter.test(T)) action.accept(T); } );
-		}
-#else
-		public void forEach(Consumer<? super CLASS_TYPE> action) {
-			Objects.requireNonNull(action);
-			iterable.forEach(T -> { if(!filter.test(T)) action.accept(T); } );
-		}
-#endif
-	}
-	
-	private static class LimitedIterable KEY_GENERIC_TYPE implements ITERABLE KEY_GENERIC_TYPE, ISizeProvider
-	{
-		ITERABLE KEY_GENERIC_TYPE iterable;
-		long limit;
-		
-		public LimitedIterable(ITERABLE KEY_GENERIC_TYPE iterable, long limit) {
-			this.iterable = iterable;
-			this.limit = limit;
-		}
-		
-		@Override
-		public ITERATOR KEY_GENERIC_TYPE iterator() {
-			return ITERATORS.limit(iterable.iterator(), limit);
-		}
-		
-		@Override
-		public int size() {
-			ISizeProvider prov = ISizeProvider.of(iterable);
-			return prov == null ? -1 : (int)Math.min(prov.size(), limit);
-		}
-		
-#if !TYPE_OBJECT
-		@Override
-		public void forEach(CONSUMER action) {
-			Objects.requireNonNull(action);
-			AtomicLong counter = new AtomicLong();
-			iterable.forEach(T -> {
-				if(counter.get() >= limit) return;
-				counter.incrementAndGet();
-				action.accept(T);
-			});
-		}
-#else
-		public void forEach(Consumer<? super CLASS_TYPE> action) {
-			Objects.requireNonNull(action);
-			AtomicLong counter = new AtomicLong();
-			iterable.forEach(T -> {
-				if(counter.get() >= limit) return;
-				counter.incrementAndGet();
-				action.accept(T);
-			});
-		}
-#endif
-	}
-	
-	private static class SortedIterable KEY_GENERIC_TYPE implements ITERABLE KEY_GENERIC_TYPE, ISizeProvider
-	{
-		ITERABLE KEY_GENERIC_TYPE iterable;
-		COMPARATOR KEY_GENERIC_TYPE sorter;
-		
-		public SortedIterable(ITERABLE KEY_GENERIC_TYPE iterable, COMPARATOR KEY_GENERIC_TYPE sorter) {
-			this.iterable = iterable;
-			this.sorter = sorter;
-		}
-		
-		@Override
-		public ITERATOR KEY_GENERIC_TYPE iterator() {
-			return ITERATORS.sorted(iterable.iterator(), sorter);
-		}
-		
-		@Override
-		public int size() {
-			ISizeProvider prov = ISizeProvider.of(iterable);
-			return prov == null ? -1 : prov.size();
-		}
-		
-#if !TYPE_OBJECT
-		@Override
-		public void forEach(CONSUMER action) {
-			Objects.requireNonNull(action);
-			COLLECTIONS.CollectionWrapper KEY_GENERIC_TYPE wrapper = COLLECTIONS.wrapper();
-			iterable.forEach(wrapper::add);
-			wrapper.unstableSort(sorter);
-			wrapper.forEach(action);
-		}
-#else
-		@Override
-		public void forEach(Consumer<? super CLASS_TYPE> action) {
-			Objects.requireNonNull(action);
-			COLLECTIONS.CollectionWrapper KEY_GENERIC_TYPE wrapper = COLLECTIONS.wrapper();
-			iterable.forEach(wrapper::add);
-			wrapper.unstableSort(sorter);
-			wrapper.forEach(action);
-		}
-#endif
-	}
-	
-	private static class DistinctIterable KEY_GENERIC_TYPE implements ITERABLE KEY_GENERIC_TYPE
-	{
-		ITERABLE KEY_GENERIC_TYPE iterable;
-		
-		public DistinctIterable(ITERABLE KEY_GENERIC_TYPE iterable) {
-			this.iterable = iterable;
-		}
-		
-		@Override
-		public ITERATOR KEY_GENERIC_TYPE iterator() {
-			return ITERATORS.distinct(iterable.iterator());
-		}
-		
-#if !TYPE_OBJECT
-		@Override
-		public void forEach(CONSUMER action) {
-			Objects.requireNonNull(action);
-#if TYPE_BOOLEAN
-			AtomicInteger result = new AtomicInteger();
-			iterable.forEach(T -> {
-				if(((result.get() & (T ? 2 : 1)) != 0)) return;
-				result.getAndAdd(T ? 2 : 1);
-				action.accept(T);
-			});
-#else
-			COLLECTION KEY_GENERIC_TYPE filtered = COLLECTIONS.distinctWrapper();
-			iterable.forEach(T -> { if(filtered.add(T)) action.accept(T); });
-#endif
-		}
-#else
-		public void forEach(Consumer<? super CLASS_TYPE> action) {
-			Objects.requireNonNull(action);
-			COLLECTION KEY_GENERIC_TYPE filtered = COLLECTIONS.distinctWrapper();
-			iterable.forEach(T -> { if(filtered.add(T)) action.accept(T); });
-		}
-#endif
-	}
-	
-	private static class PeekIterable KEY_GENERIC_TYPE implements ITERABLE KEY_GENERIC_TYPE, ISizeProvider
-	{
-		ITERABLE KEY_GENERIC_TYPE iterable;
-		CONSUMER KEY_GENERIC_TYPE action;
-		
-		public PeekIterable(ITERABLE KEY_GENERIC_TYPE iterable, CONSUMER KEY_GENERIC_TYPE action) {
-			this.iterable = iterable;
-			this.action = action;
-		}
-		
-		@Override
-		public ITERATOR KEY_GENERIC_TYPE iterator() {
-			return ITERATORS.peek(iterable.iterator(), action);
-		}
-		
-		@Override
-		public int size() {
-			ISizeProvider prov = ISizeProvider.of(iterable);
-			return prov == null ? -1 : prov.size();
-		}
-		
-#if !TYPE_OBJECT
-		@Override
-		public void forEach(CONSUMER action) {
-			Objects.requireNonNull(action);
-			iterable.forEach(this.action.andThen(action));
-		}
-#else
-		public void forEach(Consumer<? super CLASS_TYPE> action) {
-			Objects.requireNonNull(action);
-			iterable.forEach(this.action.andThen(action));
-		}
-#endif
-	}
+package speiger.src.collections.PACKAGE.utils;
+
+import speiger.src.collections.PACKAGE.collections.ITERABLE;
+#if !TYPE_OBJECT
+import speiger.src.collections.objects.collections.ObjectIterable;
+import speiger.src.collections.objects.collections.ObjectIterator;
+#endif
+import speiger.src.collections.PACKAGE.collections.ITERATOR;
+import speiger.src.collections.PACKAGE.functions.function.TO_OBJECT_FUNCTION;
+import speiger.src.collections.PACKAGE.functions.function.PREDICATE;
+
+/**
+ * A Helper class for Iterables
+ */
+public class ITERABLES
+{
+	/**
+	 * A Helper function that maps a Iterable into a new Type.
+	 * @param iterable the iterable that should be mapped
+	 * @param mapper the function that decides what the result turns into.
+	 * @Type(T)
+	 * @param <E> The return type.
+	 * @return a iterable that is mapped to a new result
+	 */
+	public static GENERIC_KEY_SPECIAL_BRACES<E> ObjectIterable<E> map(ITERABLE KEY_GENERIC_TYPE iterable, TO_OBJECT_FUNCTION KKS_GENERIC_TYPE<E> mapper) {
+		return new MappedIterable<>(iterable, mapper);
+	}
+	
+	/**
+	 * A Helper function that flatMaps a Iterable into a new Type.
+	 * @param iterable the iterable that should be flatMapped
+	 * @param mapper the function that decides what the result turns into.
+	 * @Type(T)
+	 * @param <V> The return type supplier.
+	 * @param <E> The return type.
+	 * @return a iterable that is flatMapped to a new result
+	 */
+	public static GENERIC_KEY_SPECIAL_BRACES<E, V extends Iterable<E>> ObjectIterable<E> flatMap(ITERABLE KEY_GENERIC_TYPE iterable, TO_OBJECT_FUNCTION KKS_GENERIC_TYPE<V> mapper) {
+		return new FlatMappedIterable<>(iterable, mapper);
+	}
+	
+	/**
+	 * A Helper function that flatMaps a Iterable into a new Type.
+	 * @param iterable the iterable that should be flatMapped
+	 * @param mapper the function that decides what the result turns into.
+	 * @Type(T)
+	 * @param <E> The return type.
+	 * @return a iterable that is flatMapped to a new result
+	 */
+	public static GENERIC_KEY_SPECIAL_BRACES<E> ObjectIterable<E> arrayFlatMap(ITERABLE KEY_GENERIC_TYPE iterable, TO_OBJECT_FUNCTION KKS_GENERIC_TYPE<E[]> mapper) {
+		return new FlatMappedArrayIterable<>(iterable, mapper);
+	}
+	
+	/**
+	 * A Helper function that filters out all desired elements
+	 * @param iterable that should be filtered.
+	 * @param filter the filter that decides that should be let through
+	 * @Type(T)
+	 * @return a filtered iterable
+	 */
+	public static GENERIC_KEY_BRACES ITERABLE KEY_GENERIC_TYPE filter(ITERABLE KEY_GENERIC_TYPE iterable, PREDICATE KEY_GENERIC_TYPE filter) {
+		return new FilteredIterableBRACES(iterable, filter);
+	}
+	
+	private static class MappedIterable KSS_GENERIC_TYPE<E, T> implements ObjectIterable<T>
+	{
+		ITERABLE KEY_SPECIAL_GENERIC_TYPE<E> iterable;
+		TO_OBJECT_FUNCTION KSS_GENERIC_TYPE<E, T> mapper;
+		
+		MappedIterable(ITERABLE KEY_SPECIAL_GENERIC_TYPE<E> iterable, TO_OBJECT_FUNCTION KSS_GENERIC_TYPE<E, T> mapper) {
+			this.iterable = iterable;
+			this.mapper = mapper;
+		}
+		
+		public ObjectIterator<T> iterator() {
+			return ITERATORS.map(iterable.iterator(), mapper);
+		}
+	}
+	
+	private static class FlatMappedIterable KSS_GENERIC_TYPE<E, T,[SPACE]V extends Iterable<T>> implements ObjectIterable<T>
+	{
+		ITERABLE KEY_SPECIAL_GENERIC_TYPE<E> iterable;
+		TO_OBJECT_FUNCTION KSS_GENERIC_TYPE<E, V> mapper;
+		
+		FlatMappedIterable(ITERABLE KEY_SPECIAL_GENERIC_TYPE<E> iterable, TO_OBJECT_FUNCTION KSS_GENERIC_TYPE<E, V> mapper) {
+			this.iterable = iterable;
+			this.mapper = mapper;
+		}
+		
+		@Override
+		public ObjectIterator<T> iterator() {
+			return ITERATORS.flatMap(iterable.iterator(), mapper);
+		}
+	}
+	
+	private static class FlatMappedArrayIterable KSS_GENERIC_TYPE<E, T> implements ObjectIterable<T>
+	{
+		ITERABLE KEY_SPECIAL_GENERIC_TYPE<E> iterable;
+		TO_OBJECT_FUNCTION KSS_GENERIC_TYPE<E, T[]> mapper;
+		
+		FlatMappedArrayIterable(ITERABLE KEY_SPECIAL_GENERIC_TYPE<E> iterable, TO_OBJECT_FUNCTION KSS_GENERIC_TYPE<E, T[]> mapper) {
+			this.iterable = iterable;
+			this.mapper = mapper;
+		}
+		
+		@Override
+		public ObjectIterator<T> iterator() {
+			return ITERATORS.arrayFlatMap(iterable.iterator(), mapper);
+		}
+	}
+	
+	private static class FilteredIterable KEY_GENERIC_TYPE implements ITERABLE KEY_GENERIC_TYPE
+	{
+		ITERABLE KEY_GENERIC_TYPE iterable;
+		PREDICATE KEY_GENERIC_TYPE filter;
+		
+		public FilteredIterable(ITERABLE KEY_GENERIC_TYPE iterable, PREDICATE KEY_GENERIC_TYPE filter) {
+			this.iterable = iterable;
+			this.filter = filter;
+		}
+		
+		@Override
+		public ITERATOR KEY_GENERIC_TYPE iterator() {
+			return ITERATORS.filter(iterable.iterator(), filter);
+		}
+	}
 }

src/builder/resources/speiger/assets/collections/templates/utils/PriorityQueues.template

@@ -1,30 +1,15 @@
 package speiger.src.collections.PACKAGE.utils;
 
 #if TYPE_OBJECT
-import java.util.Collection;
 import java.util.Comparator;
-import java.util.function.Consumer;
-#endif
-#if JDK_FUNCTION
-import java.util.function.PREDICATE;
 #endif
 
 import speiger.src.collections.PACKAGE.collections.ITERATOR;
-import speiger.src.collections.PACKAGE.collections.COLLECTION;
 #if !TYPE_OBJECT
 import speiger.src.collections.PACKAGE.functions.COMPARATOR;
 #endif
-#if DEQUEUE_FEATURE
 import speiger.src.collections.PACKAGE.queues.PRIORITY_DEQUEUE;
-#endif
 import speiger.src.collections.PACKAGE.queues.PRIORITY_QUEUE;
-#if !TYPE_OBJECT
-import speiger.src.collections.PACKAGE.functions.CONSUMER;
-#endif
-#if !JDK_FUNCTION
-import speiger.src.collections.PACKAGE.functions.function.PREDICATE;
-#endif
-import speiger.src.collections.objects.functions.consumer.BI_FROM_OBJECT_CONSUMER;
 
 /**
  * A Helper class for PriorityQueues
@@ -53,7 +38,6 @@ public class PRIORITY_QUEUES
 		return queue instanceof SynchronizedPriorityQueue ? (SynchronizedPriorityQueue KEY_GENERIC_TYPE)queue : new SynchronizedPriorityQueueBRACES(queue, mutex);
 	}
 	
-#if DEQUEUE_FEATURE
 	/**
 	 * Returns a synchronized PriorityDequeue instance based on the instance given.
 	 * @param dequeue that should be synchronized
@@ -75,7 +59,6 @@ public class PRIORITY_QUEUES
 		return dequeue instanceof SynchronizedPriorityDequeue ? (SynchronizedPriorityDequeue KEY_GENERIC_TYPE)dequeue : new SynchronizedPriorityDequeueBRACES(dequeue, mutex);
 	}
 	
-#endif
 	/**
 	 * Wrapper class for synchronization
 	 * @Type(T)
@@ -103,21 +86,11 @@ public class PRIORITY_QUEUES
 		public void clear() { synchronized(mutex) { queue.clear(); } }
 		@Override
 		public void enqueue(KEY_TYPE e) { synchronized(mutex) { queue.enqueue(e); } }
-		@Override
-		public void enqueueAll(KEY_TYPE[] e, int offset, int length) { synchronized(mutex) { queue.enqueueAll(e, offset, length); } }
-		@Override
-		public void enqueueAll(COLLECTION KEY_GENERIC_TYPE c) { synchronized(mutex) { queue.enqueueAll(c); } }
-#if TYPE_OBJECT
-		@Override
-		public void enqueueAll(Collection<? extends CLASS_TYPE> c) { synchronized(mutex) { queue.enqueueAll(c); } }
-#endif
 		@Override
 		public KEY_TYPE dequeue() { synchronized(mutex) { return queue.dequeue(); } }
 		@Override
 		public KEY_TYPE peek(int index) { synchronized(mutex) { return queue.peek(index); } }
 		@Override
-		public boolean contains(KEY_TYPE e) { synchronized(mutex) { return queue.contains(e); } }
-		@Override
 		public boolean removeFirst(KEY_TYPE e) { synchronized(mutex) { return queue.removeFirst(e); } }
 		@Override
 		public boolean removeLast(KEY_TYPE e) { synchronized(mutex) { return queue.removeLast(e); } }
@@ -127,25 +100,8 @@ public class PRIORITY_QUEUES
 		public COMPARATOR KEY_SUPER_GENERIC_TYPE comparator() { synchronized(mutex) { return queue.comparator(); } }
 		@Override
 		public GENERIC_SPECIAL_KEY_BRACES<E> KEY_SPECIAL_TYPE[] TO_ARRAY(KEY_SPECIAL_TYPE[] input) { synchronized(mutex) { return queue.TO_ARRAY(input); } }
-		@Override
-		public PRIORITY_QUEUE KEY_GENERIC_TYPE copy() { synchronized(mutex) { return queue.copy(); } }
-		@Override
-		public void forEach(CONSUMER KEY_SUPER_GENERIC_TYPE action) { synchronized(mutex) { queue.forEach(action); } }
-		@Override
-		public <E> void forEach(E input, BI_FROM_OBJECT_CONSUMER KSK_GENERIC_TYPE<E> action) { synchronized(mutex) { queue.forEach(input, action); } }
-		@Override
-		public boolean matchesAny(PREDICATE KEY_GENERIC_TYPE filter) { synchronized(mutex) { return queue.matchesAny(filter); } }
-		@Override
-		public boolean matchesNone(PREDICATE KEY_GENERIC_TYPE filter) { synchronized(mutex) { return queue.matchesNone(filter); } }
-		@Override
-		public boolean matchesAll(PREDICATE KEY_GENERIC_TYPE filter) { synchronized(mutex) { return queue.matchesAll(filter); } }
-		@Override
-		public KEY_TYPE findFirst(PREDICATE KEY_GENERIC_TYPE filter) { synchronized(mutex) { return queue.findFirst(filter); } }
-		@Override
-		public int count(PREDICATE KEY_GENERIC_TYPE filter) { synchronized(mutex) { return queue.count(filter); } }
 	}
 	
-#if DEQUEUE_FEATURE
 	/**
 	 * Wrapper class for synchronization
 	 * @Type(T)
@@ -165,18 +121,7 @@ public class PRIORITY_QUEUES
 		
 		@Override
 		public void enqueueFirst(KEY_TYPE e) { synchronized(mutex) { dequeue.enqueueFirst(e); } }
-		@Override
-		public void enqueueAllFirst(KEY_TYPE[] e, int offset, int length) { synchronized(mutex) { dequeue.enqueueAllFirst(e, offset, length); } }
-		@Override
-		public void enqueueAllFirst(COLLECTION KEY_GENERIC_TYPE c) { synchronized(mutex) { dequeue.enqueueAllFirst(c); } }
-#if TYPE_OBJECT
-		@Override
-		public void enqueueAllFirst(Collection<? extends CLASS_TYPE> c) { synchronized(mutex) { dequeue.enqueueAllFirst(c); } }
-#endif
 		@Override
 		public KEY_TYPE dequeueLast() { synchronized(mutex) { return dequeue.dequeueLast(); } }
-		@Override
-		public PRIORITY_DEQUEUE KEY_GENERIC_TYPE copy() { synchronized(mutex) { return dequeue.copy(); } }
 	}
-#endif
 }

src/builder/resources/speiger/assets/collections/templates/utils/Sets.template

@@ -1,31 +1,29 @@
 package speiger.src.collections.PACKAGE.utils;
 
-import java.util.NoSuchElementException;
-import java.util.Set;
-#if TYPE_OBJECT && SORTED_SET_FEATURE
+#if TYPE_BOOLEAN
+import speiger.src.collections.booleans.collections.BooleanIterator;
+import speiger.src.collections.booleans.sets.AbstractBooleanSet;
+import speiger.src.collections.booleans.sets.BooleanSet;
+import speiger.src.collections.booleans.utils.BooleanCollections.EmptyCollection;
+#else
+#if TYPE_OBJECT
 import java.util.Comparator;
 
 #endif
 import speiger.src.collections.PACKAGE.collections.BI_ITERATOR;
-#if !TYPE_OBJECT && SORTED_SET_FEATURE
+#if !TYPE_OBJECT
 import speiger.src.collections.PACKAGE.functions.COMPARATOR;
 #endif
 import speiger.src.collections.PACKAGE.collections.ITERATOR;
-#if SORTED_SET_FEATURE
 import speiger.src.collections.PACKAGE.sets.NAVIGABLE_SET;
-#endif
 import speiger.src.collections.PACKAGE.sets.ABSTRACT_SET;
 import speiger.src.collections.PACKAGE.sets.SET;
-#if ORDERED_SET_FEATURE
-import speiger.src.collections.PACKAGE.sets.ORDERED_SET;
-#endif
-#if SORTED_SET_FEATURE
 import speiger.src.collections.PACKAGE.sets.SORTED_SET;
-#endif
 import speiger.src.collections.PACKAGE.utils.COLLECTIONS.EmptyCollection;
 import speiger.src.collections.PACKAGE.utils.COLLECTIONS.SynchronizedCollection;
 import speiger.src.collections.PACKAGE.utils.COLLECTIONS.UnmodifiableCollection;
 import speiger.src.collections.utils.ITrimmable;
+#endif
 
 /**
  * A Helper class for sets
@@ -35,7 +33,7 @@ public class SETS
 	/**
 	 * Empty Set Variable
 	 */
-	private static final SET NO_GENERIC_TYPE EMPTY = new EmptySetBRACES();
+	public static final SET NO_GENERIC_TYPE EMPTY = new EmptySetBRACES();
 	
 	/**
 	 * EmptySet getter
@@ -50,6 +48,7 @@ public class SETS
 #endif
 	}
 	
+#if !TYPE_BOOLEAN
 	/**
 	 * Creates a Synchronized set while preserving the ITrimmable interface
 	 * @param s the set that should be synchronized
@@ -73,7 +72,6 @@ public class SETS
 		return s instanceof SynchronizedSet ? s : (s instanceof ITrimmable ? new SynchronizedTrimSetBRACES(s, mutex) : new SynchronizedSetBRACES(s, mutex));
 	}
 	
-#if SORTED_SET_FEATURE
 	/**
 	 * Creates a Synchronized SortedSet while preserving the ITrimmable interface
 	 * @param s the set that should be synchronized
@@ -97,33 +95,6 @@ public class SETS
 		return s instanceof SynchronizedSortedSet ? s : (s instanceof ITrimmable ? new SynchronizedSortedTrimSetBRACES(s, mutex) : new SynchronizedSortedSetBRACES(s, mutex));
 	}
 	
-#endif
-#if ORDERED_SET_FEATURE
-	/**
-	 * Creates a Synchronized OrderedSet while preserving the ITrimmable interface
-	 * @param s the set that should be synchronized
-	 * @Type(T)
-	 * @return a OrderedSet that is synchronized
-	 * @note if the set is already synchronized then it will just self return it
-	 */
-	public static GENERIC_KEY_BRACES ORDERED_SET KEY_GENERIC_TYPE synchronize(ORDERED_SET KEY_GENERIC_TYPE s) {
-		return s instanceof SynchronizedOrderedSet ? s : (s instanceof ITrimmable ? new SynchronizedOrderedTrimSetBRACES(s) : new SynchronizedOrderedSetBRACES(s));
-	}
-	
-	/**
-	 * Creates a Synchronized OrderedSet while preserving the ITrimmable interface
-	 * @param s the set that should be synchronized
-	 * @param mutex controller for access
-	 * @Type(T)
-	 * @return a OrderedSet that is synchronized
-	 * @note if the set is already synchronized then it will just self return it
-	 */
-	public static GENERIC_KEY_BRACES ORDERED_SET KEY_GENERIC_TYPE synchronize(ORDERED_SET KEY_GENERIC_TYPE s, Object mutex) {
-		return s instanceof SynchronizedOrderedSet ? s : (s instanceof ITrimmable ? new SynchronizedOrderedTrimSetBRACES(s, mutex) : new SynchronizedOrderedSetBRACES(s, mutex));
-	}
-	
-#endif
-#if SORTED_SET_FEATURE
 	/**
 	 * Creates a Synchronized NavigableSet while preserving the ITrimmable interface
 	 * @param s the set that should be synchronized
@@ -147,7 +118,6 @@ public class SETS
 		return s instanceof SynchronizedNavigableSet ? s : (s instanceof ITrimmable ? new SynchronizedNavigableTrimSetBRACES(s, mutex) : new SynchronizedNavigableSetBRACES(s, mutex));
 	}
 	
-#endif
 	/**
 	 * Creates Unmodifyable Set wrapper
 	 * @param s set that should be made unmodifiable
@@ -158,7 +128,6 @@ public class SETS
 		return s instanceof UnmodifiableSet ? s : new UnmodifiableSetBRACES(s);
 	}
 	
-#if SORTED_SET_FEATURE
 	/**
 	 * Creates Unmodifyable SortedSet wrapper
 	 * @param s sortedSet that should be made unmodifiable
@@ -169,20 +138,6 @@ public class SETS
 		return s instanceof UnmodifiableSortedSet ? s : new UnmodifiableSortedSetBRACES(s);
 	}
 	
-#endif
-#if ORDERED_SET_FEATURE
-	/**
-	 * Creates Unmodifyable OrderedSet wrapper
-	 * @param s OrderedSet that should be made unmodifiable
-	 * @Type(T)
-	 * @return a UnmodifyableOrderedSet, if the set is already unmodifiable then it returns itself
-	 */
-	public static GENERIC_KEY_BRACES ORDERED_SET KEY_GENERIC_TYPE unmodifiable(ORDERED_SET KEY_GENERIC_TYPE s) {
-		return s instanceof UnmodifiableOrderedSet ? s : new UnmodifiableOrderedSetBRACES(s);
-	}
-	
-#endif
-#if SORTED_SET_FEATURE
 	/**
 	 * Creates Unmodifyable NavigableSet wrapper
 	 * @param s navigableSet that should be made unmodifiable
@@ -218,19 +173,16 @@ public class SETS
 #endif
 		@Override
 		public boolean add(KEY_TYPE o) { throw new UnsupportedOperationException(); }
-#if TYPE_OBJECT
-		public KEY_TYPE addOrGet(KEY_TYPE o) { throw new UnsupportedOperationException(); }
-#endif
 		@Override
 		public ITERATOR KEY_GENERIC_TYPE iterator()
 		{
 			return new ITERATOR KEY_GENERIC_TYPE() {
 				boolean next = true;
 				@Override
-				public boolean hasNext() { return next; }
+				public boolean hasNext() { return next = false; }
 				@Override
 				public KEY_TYPE NEXT() {
-					if(!hasNext()) throw new NoSuchElementException();
+					if(!next) throw new IllegalStateException();
 					next = false;
 					return element;
 				}
@@ -238,9 +190,6 @@ public class SETS
 		}
 		@Override
 		public int size() { return 1; }
-		
-		@Override
-		public SingletonSet KEY_GENERIC_TYPE copy() { return new SingletonSetBRACES(element); }
 	}
 	
 	private static class EmptySet KEY_GENERIC_TYPE extends EmptyCollection KEY_GENERIC_TYPE implements SET KEY_GENERIC_TYPE
@@ -248,22 +197,10 @@ public class SETS
 #if !TYPE_OBJECT
 		@Override
 		public boolean remove(KEY_TYPE o) { throw new UnsupportedOperationException(); }
-#else
-		@Override
-		public KEY_TYPE addOrGet(KEY_TYPE o) { throw new UnsupportedOperationException(); }
 #endif
-		@Override
-		public boolean equals(Object o) {
-			if(o == this) return true;
-			if(!(o instanceof Set)) return false;
-			return ((Set<?>)o).isEmpty();
-		}
-		
-		@Override
-		public EmptySet KEY_GENERIC_TYPE copy() { return this; }
 	}
 	
-#if SORTED_SET_FEATURE
+#if !TYPE_BOOLEAN
 	private static class UnmodifiableNavigableSet KEY_GENERIC_TYPE extends UnmodifiableSortedSet KEY_GENERIC_TYPE implements NAVIGABLE_SET KEY_GENERIC_TYPE
 	{
 		NAVIGABLE_SET KEY_GENERIC_TYPE n;
@@ -276,38 +213,25 @@ public class SETS
 #if !TYPE_OBJECT
 		@Override
 		public boolean contains(KEY_TYPE o) { return n.contains(o); }
-		@Override
-		@SuppressWarnings("deprecation")
-		public CLASS_TYPE lower(CLASS_TYPE e) { return n.lower(e); }
-		@Override
-		@SuppressWarnings("deprecation")
-		public CLASS_TYPE floor(CLASS_TYPE e) { return n.floor(e); }
-		@Override
-		@SuppressWarnings("deprecation")
-		public CLASS_TYPE ceiling(CLASS_TYPE e) { return n.ceiling(e); }
-		@Override
-		@SuppressWarnings("deprecation")
-		public CLASS_TYPE higher(CLASS_TYPE e) { return n.higher(e); }
-		
+
 #endif		
 		@Override
 		@Deprecated
 		public boolean contains(Object o) { return n.contains(o); }
+		
 		@Override
 		public KEY_TYPE lower(KEY_TYPE e) { return n.lower(e); }
+		
 		@Override
 		public KEY_TYPE floor(KEY_TYPE e) { return n.floor(e); }
+		
 		@Override
 		public KEY_TYPE ceiling(KEY_TYPE e) { return n.ceiling(e); }
+		
 		@Override
 		public KEY_TYPE higher(KEY_TYPE e) { return n.higher(e); }
 		
 #if !TYPE_OBJECT
-		@Override
-		public CLASS_TYPE pollFirst() { throw new UnsupportedOperationException(); }
-		@Override
-		public CLASS_TYPE pollLast() { throw new UnsupportedOperationException(); }
-
 		@Override
 		public void setDefaultMaxValue(KEY_TYPE e) { throw new UnsupportedOperationException(); }
 		
@@ -322,70 +246,30 @@ public class SETS
 		
 #endif
 		@Override
-		public NAVIGABLE_SET KEY_GENERIC_TYPE copy() { return n.copy(); }
+		public NAVIGABLE_SET KEY_GENERIC_TYPE subSet(KEY_TYPE fromElement, boolean fromInclusive, KEY_TYPE toElement, boolean toInclusive) { return unmodifiable(n.subSet(fromElement, fromInclusive, toElement, toInclusive)); }
 		
 		@Override
-		public NAVIGABLE_SET KEY_GENERIC_TYPE subSet(KEY_TYPE fromElement, boolean fromInclusive, KEY_TYPE toElement, boolean toInclusive) { return SETS.unmodifiable(n.subSet(fromElement, fromInclusive, toElement, toInclusive)); }
-		
-		@Override
-		public NAVIGABLE_SET KEY_GENERIC_TYPE headSet(KEY_TYPE toElement, boolean inclusive) { return SETS.unmodifiable(n.headSet(toElement, inclusive)); }
+		public NAVIGABLE_SET KEY_GENERIC_TYPE headSet(KEY_TYPE toElement, boolean inclusive) { return unmodifiable(n.headSet(toElement, inclusive)); }
 
 		@Override
-		public NAVIGABLE_SET KEY_GENERIC_TYPE tailSet(KEY_TYPE fromElement, boolean inclusive) { return SETS.unmodifiable(n.tailSet(fromElement, inclusive)); }
+		public NAVIGABLE_SET KEY_GENERIC_TYPE tailSet(KEY_TYPE fromElement, boolean inclusive) { return unmodifiable(n.tailSet(fromElement, inclusive)); }
 
 		@Override
 		public BI_ITERATOR KEY_GENERIC_TYPE descendingIterator() { return ITERATORS.unmodifiable(n.descendingIterator()); }
 
 		@Override
-		public NAVIGABLE_SET KEY_GENERIC_TYPE descendingSet() { return SETS.unmodifiable(n.descendingSet()); }
+		public NAVIGABLE_SET KEY_GENERIC_TYPE descendingSet() { return unmodifiable(n.descendingSet()); }
 		
 		@Override
-		public NAVIGABLE_SET KEY_GENERIC_TYPE subSet(KEY_TYPE fromElement, KEY_TYPE toElement) { return SETS.unmodifiable(n.subSet(fromElement, toElement)); }
+		public NAVIGABLE_SET KEY_GENERIC_TYPE subSet(KEY_TYPE fromElement, KEY_TYPE toElement) { return unmodifiable(n.subSet(fromElement, toElement)); }
 		
 		@Override
-		public NAVIGABLE_SET KEY_GENERIC_TYPE headSet(KEY_TYPE toElement) { return SETS.unmodifiable(n.headSet(toElement)); }
+		public NAVIGABLE_SET KEY_GENERIC_TYPE headSet(KEY_TYPE toElement) { return unmodifiable(n.headSet(toElement)); }
 		
 		@Override
-		public NAVIGABLE_SET KEY_GENERIC_TYPE tailSet(KEY_TYPE fromElement) { return SETS.unmodifiable(n.tailSet(fromElement)); }
+		public NAVIGABLE_SET KEY_GENERIC_TYPE tailSet(KEY_TYPE fromElement) { return unmodifiable(n.tailSet(fromElement)); }
 	}
 	
-#endif
-#if ORDERED_SET_FEATURE
-	private static class UnmodifiableOrderedSet KEY_GENERIC_TYPE extends UnmodifiableSet KEY_GENERIC_TYPE implements ORDERED_SET KEY_GENERIC_TYPE
-	{
-		ORDERED_SET KEY_GENERIC_TYPE s;
-		UnmodifiableOrderedSet(ORDERED_SET KEY_GENERIC_TYPE c)
-		{
-			super(c);
-			s = c;
-		}
-		
-		@Override
-		public boolean addAndMoveToFirst(KEY_TYPE o) { throw new UnsupportedOperationException(); }
-		@Override
-		public boolean addAndMoveToLast(KEY_TYPE o) { throw new UnsupportedOperationException(); }
-		@Override
-		public boolean moveToFirst(KEY_TYPE o) { throw new UnsupportedOperationException(); }
-		@Override
-		public boolean moveToLast(KEY_TYPE o) { throw new UnsupportedOperationException(); }
-		@Override
-		public BI_ITERATOR KEY_GENERIC_TYPE iterator() { return ITERATORS.unmodifiable(s.iterator()); }
-		@Override
-		public BI_ITERATOR KEY_GENERIC_TYPE iterator(KEY_TYPE fromElement) { return ITERATORS.unmodifiable(s.iterator(fromElement)); }
-		@Override
-		public ORDERED_SET KEY_GENERIC_TYPE copy() { return s.copy(); }
-		@Override
-		public KEY_TYPE FIRST_KEY() { return s.FIRST_KEY(); }
-		@Override
-		public KEY_TYPE POLL_FIRST_KEY() { throw new UnsupportedOperationException(); }
-		@Override
-		public KEY_TYPE LAST_KEY() { return s.LAST_KEY(); }
-		@Override
-		public KEY_TYPE POLL_LAST_KEY() { throw new UnsupportedOperationException(); }
-	}
-	
-#endif
-#if SORTED_SET_FEATURE
 	private static class UnmodifiableSortedSet KEY_GENERIC_TYPE extends UnmodifiableSet KEY_GENERIC_TYPE implements SORTED_SET KEY_GENERIC_TYPE
 	{
 		SORTED_SET KEY_GENERIC_TYPE s;
@@ -395,31 +279,49 @@ public class SETS
 			s = c;
 		}
 		
+		@Override
+		public boolean addAndMoveToFirst(KEY_TYPE o) { throw new UnsupportedOperationException(); }
+		
+		@Override
+		public boolean addAndMoveToLast(KEY_TYPE o) { throw new UnsupportedOperationException(); }
+		
+		@Override
+		public boolean moveToFirst(KEY_TYPE o) { throw new UnsupportedOperationException(); }
+		
+		@Override
+		public boolean moveToLast(KEY_TYPE o) { throw new UnsupportedOperationException(); }
+		
 		@Override
 		public COMPARATOR KEY_GENERIC_TYPE comparator() { return s.comparator(); }
+		
 		@Override
 		public BI_ITERATOR KEY_GENERIC_TYPE iterator() { return ITERATORS.unmodifiable(s.iterator()); }
+		
 		@Override
 		public BI_ITERATOR KEY_GENERIC_TYPE iterator(KEY_TYPE fromElement) { return ITERATORS.unmodifiable(s.iterator(fromElement)); }
+		
 		@Override
-		public SORTED_SET KEY_GENERIC_TYPE copy() { return s.copy(); }
+		public SORTED_SET KEY_GENERIC_TYPE subSet(KEY_TYPE fromElement, KEY_TYPE toElement) { return unmodifiable(s.subSet(fromElement, toElement)); }
+		
 		@Override
-		public SORTED_SET KEY_GENERIC_TYPE subSet(KEY_TYPE fromElement, KEY_TYPE toElement) { return SETS.unmodifiable(s.subSet(fromElement, toElement)); }
+		public SORTED_SET KEY_GENERIC_TYPE headSet(KEY_TYPE toElement) { return unmodifiable(s.headSet(toElement)); }
+		
 		@Override
-		public SORTED_SET KEY_GENERIC_TYPE headSet(KEY_TYPE toElement) { return SETS.unmodifiable(s.headSet(toElement)); }
-		@Override
-		public SORTED_SET KEY_GENERIC_TYPE tailSet(KEY_TYPE fromElement) { return SETS.unmodifiable(s.tailSet(fromElement)); }
+		public SORTED_SET KEY_GENERIC_TYPE tailSet(KEY_TYPE fromElement) { return unmodifiable(s.tailSet(fromElement)); }
+		
 		@Override
 		public KEY_TYPE FIRST_KEY() { return s.FIRST_KEY(); }
+		
 		@Override
 		public KEY_TYPE POLL_FIRST_KEY() { throw new UnsupportedOperationException(); }
+		
 		@Override
 		public KEY_TYPE LAST_KEY() { return s.LAST_KEY(); }
+		
 		@Override
 		public KEY_TYPE POLL_LAST_KEY() { throw new UnsupportedOperationException(); }
 	}
 	
-#endif
 	/**
 	 * Unmodifyable Set wrapper that helps is used with unmodifyableSet function
 	 * @Type(T)
@@ -434,21 +336,12 @@ public class SETS
 			s = c;
 		}
 		
-#if TYPE_OBJECT
-		@Override
-		public KEY_TYPE addOrGet(KEY_TYPE o) { throw new UnsupportedOperationException(); }
-		
-#endif
-		@Override
-		public SET KEY_GENERIC_TYPE copy() { return s.copy(); }
-		
 #if !TYPE_OBJECT
 		@Override
 		public boolean remove(KEY_TYPE o) { throw new UnsupportedOperationException(); }
 #endif
 	}
 	
-#if SORTED_SET_FEATURE
 	private static class SynchronizedNavigableTrimSet KEY_GENERIC_TYPE extends SynchronizedNavigableSet KEY_GENERIC_TYPE implements ITrimmable
 	{
 		ITrimmable trim;
@@ -483,7 +376,7 @@ public class SETS
 			super(c, mutex);
 			n = c;
 		}
-		
+
 		@Override
 		@Deprecated
 		public boolean contains(Object o) { synchronized(mutex) { return n.contains(o); } }
@@ -491,33 +384,27 @@ public class SETS
 #if !TYPE_OBJECT
 		@Override
 		public boolean contains(KEY_TYPE o) { synchronized(mutex) { return n.contains(o); } }
-		@Override
-		@SuppressWarnings("deprecation")
-		public CLASS_TYPE lower(CLASS_TYPE e) { synchronized(mutex) { return n.lower(e); } }
-		@Override
-		@SuppressWarnings("deprecation")
-		public CLASS_TYPE floor(CLASS_TYPE e) { synchronized(mutex) { return n.floor(e); } }
-		@Override
-		@SuppressWarnings("deprecation")
-		public CLASS_TYPE ceiling(CLASS_TYPE e) { synchronized(mutex) { return n.ceiling(e); } }
-		@Override
-		@SuppressWarnings("deprecation")
-		public CLASS_TYPE higher(CLASS_TYPE e) { synchronized(mutex) { return n.higher(e); } }
+		
 #endif
 		@Override
 		public KEY_TYPE lower(KEY_TYPE e) { synchronized(mutex) { return n.lower(e); } }
+		
 		@Override
 		public KEY_TYPE floor(KEY_TYPE e) { synchronized(mutex) { return n.floor(e); } }
+		
 		@Override
 		public KEY_TYPE ceiling(KEY_TYPE e) { synchronized(mutex) { return n.ceiling(e); } }
+		
 		@Override
 		public KEY_TYPE higher(KEY_TYPE e) { synchronized(mutex) { return n.higher(e); } }
 		
 #if !TYPE_OBJECT
 		@Override
 		public void setDefaultMaxValue(KEY_TYPE e) { synchronized(mutex) { n.setDefaultMaxValue(e); } }
+		
 		@Override
 		public KEY_TYPE getDefaultMaxValue() { synchronized(mutex) { return n.getDefaultMaxValue(); } }
+		
 		@Override
 		public void setDefaultMinValue(KEY_TYPE e) { synchronized(mutex) { n.setDefaultMinValue(e); } }
 		
@@ -526,31 +413,28 @@ public class SETS
 		
 #endif
 		@Override
-		public NAVIGABLE_SET KEY_GENERIC_TYPE copy() { synchronized(mutex) { return n.copy(); } }
-		
-		@Override
-		public NAVIGABLE_SET KEY_GENERIC_TYPE subSet(KEY_TYPE fromElement, boolean fromInclusive, KEY_TYPE toElement, boolean toInclusive) { synchronized(mutex) { return SETS.synchronize(n.subSet(fromElement, fromInclusive, toElement, toInclusive), mutex); } }
+		public NAVIGABLE_SET KEY_GENERIC_TYPE subSet(KEY_TYPE fromElement, boolean fromInclusive, KEY_TYPE toElement, boolean toInclusive) { synchronized(mutex) { return synchronize(n.subSet(fromElement, fromInclusive, toElement, toInclusive), mutex); } }
 
 		@Override
-		public NAVIGABLE_SET KEY_GENERIC_TYPE headSet(KEY_TYPE toElement, boolean inclusive) { synchronized(mutex) { return SETS.synchronize(n.headSet(toElement, inclusive), mutex); } }
+		public NAVIGABLE_SET KEY_GENERIC_TYPE headSet(KEY_TYPE toElement, boolean inclusive) { synchronized(mutex) { return synchronize(n.headSet(toElement, inclusive), mutex); } }
 
 		@Override
-		public NAVIGABLE_SET KEY_GENERIC_TYPE tailSet(KEY_TYPE fromElement, boolean inclusive) { synchronized(mutex) { return SETS.synchronize(n.tailSet(fromElement, inclusive), mutex); } }
+		public NAVIGABLE_SET KEY_GENERIC_TYPE tailSet(KEY_TYPE fromElement, boolean inclusive) { synchronized(mutex) { return synchronize(n.tailSet(fromElement, inclusive), mutex); } }
 
 		@Override
 		public BI_ITERATOR KEY_GENERIC_TYPE descendingIterator() { synchronized(mutex) { return n.descendingIterator(); } }
 
 		@Override
-		public NAVIGABLE_SET KEY_GENERIC_TYPE descendingSet() { synchronized(mutex) { return SETS.synchronize(n.descendingSet(), mutex); } }
+		public NAVIGABLE_SET KEY_GENERIC_TYPE descendingSet() { synchronized(mutex) { return synchronize(n.descendingSet(), mutex); } }
 		
 		@Override
-		public NAVIGABLE_SET KEY_GENERIC_TYPE subSet(KEY_TYPE fromElement, KEY_TYPE toElement) { synchronized(mutex) { return SETS.synchronize(n.subSet(fromElement, toElement), mutex); } }
+		public NAVIGABLE_SET KEY_GENERIC_TYPE subSet(KEY_TYPE fromElement, KEY_TYPE toElement) { synchronized(mutex) { return synchronize(n.subSet(fromElement, toElement), mutex); } }
 
 		@Override
-		public NAVIGABLE_SET KEY_GENERIC_TYPE headSet(KEY_TYPE toElement) { synchronized(mutex) { return SETS.synchronize(n.headSet(toElement), mutex); } }
+		public NAVIGABLE_SET KEY_GENERIC_TYPE headSet(KEY_TYPE toElement) { synchronized(mutex) { return synchronize(n.headSet(toElement), mutex); } }
 
 		@Override
-		public NAVIGABLE_SET KEY_GENERIC_TYPE tailSet(KEY_TYPE fromElement) { synchronized(mutex) { return SETS.synchronize(n.tailSet(fromElement), mutex); } }
+		public NAVIGABLE_SET KEY_GENERIC_TYPE tailSet(KEY_TYPE fromElement) { synchronized(mutex) { return synchronize(n.tailSet(fromElement), mutex); } }
 	}
 	
 	private static class SynchronizedSortedTrimSet KEY_GENERIC_TYPE extends SynchronizedSortedSet KEY_GENERIC_TYPE implements ITrimmable
@@ -587,93 +471,50 @@ public class SETS
 			super(c, mutex);
 			s = c;
 		}
-		
-		@Override
-		public COMPARATOR KEY_GENERIC_TYPE comparator(){ synchronized(mutex) { return s.comparator(); } }
-		@Override
-		public BI_ITERATOR KEY_GENERIC_TYPE iterator() { synchronized(mutex) { return s.iterator(); } }
-		@Override
-		public BI_ITERATOR KEY_GENERIC_TYPE iterator(KEY_TYPE fromElement) { synchronized(mutex) { return s.iterator(fromElement); } }
-		@Override
-		public SORTED_SET KEY_GENERIC_TYPE copy() { synchronized(mutex) { return s.copy(); } }
-		@Override
-		public SORTED_SET KEY_GENERIC_TYPE subSet(KEY_TYPE fromElement, KEY_TYPE toElement) { synchronized(mutex) { return SETS.synchronize(s.subSet(fromElement, toElement), mutex); } }
-		@Override
-		public SORTED_SET KEY_GENERIC_TYPE headSet(KEY_TYPE toElement) { synchronized(mutex) { return SETS.synchronize(s.headSet(toElement), mutex); } }
-		@Override
-		public SORTED_SET KEY_GENERIC_TYPE tailSet(KEY_TYPE fromElement) { synchronized(mutex) { return SETS.synchronize(s.tailSet(fromElement), mutex); } }
-		@Override
-		public KEY_TYPE FIRST_KEY() { synchronized(mutex) { return s.FIRST_KEY(); } }
-		@Override
-		public KEY_TYPE POLL_FIRST_KEY() { synchronized(mutex) { return s.POLL_FIRST_KEY(); } }
-		@Override
-		public KEY_TYPE LAST_KEY() { synchronized(mutex) { return s.LAST_KEY(); } }
-		@Override
-		public KEY_TYPE POLL_LAST_KEY() { synchronized(mutex) { return s.POLL_LAST_KEY(); } }
-	}
-	
-#endif
-#if ORDERED_SET_FEATURE
-	private static class SynchronizedOrderedTrimSet KEY_GENERIC_TYPE extends SynchronizedOrderedSet KEY_GENERIC_TYPE implements ITrimmable
-	{
-		ITrimmable trim;
-		
-		SynchronizedOrderedTrimSet(ORDERED_SET KEY_GENERIC_TYPE c) {
-			super(c);
-			trim = (ITrimmable)c;
-		}
-		
-		SynchronizedOrderedTrimSet(ORDERED_SET KEY_GENERIC_TYPE c, Object mutex) {
-			super(c, mutex);
-			trim = (ITrimmable)c;
-		}
-		
-		@Override
-		public boolean trim(int size) { synchronized(mutex) { return trim.trim(size); } }
-		
-		@Override
-		public void clearAndTrim(int size) { synchronized(mutex) { trim.clearAndTrim(size); } }
-	}
-	
-	private static class SynchronizedOrderedSet KEY_GENERIC_TYPE extends SynchronizedSet KEY_GENERIC_TYPE implements ORDERED_SET KEY_GENERIC_TYPE
-	{
-		ORDERED_SET KEY_GENERIC_TYPE s;
-		
-		SynchronizedOrderedSet(ORDERED_SET KEY_GENERIC_TYPE c) {
-			super(c);
-			s = c;
-		}
-		
-		SynchronizedOrderedSet(ORDERED_SET KEY_GENERIC_TYPE c, Object mutex) {
-			super(c, mutex);
-			s = c;
-		}
 
 		@Override
 		public boolean addAndMoveToFirst(KEY_TYPE o) { synchronized(mutex) { return s.addAndMoveToFirst(o); } }
+
 		@Override
 		public boolean addAndMoveToLast(KEY_TYPE o) { synchronized(mutex) { return s.addAndMoveToLast(o); } }
+
 		@Override
 		public boolean moveToFirst(KEY_TYPE o) { synchronized(mutex) { return s.moveToFirst(o); } }
+
 		@Override
 		public boolean moveToLast(KEY_TYPE o) { synchronized(mutex) { return s.moveToLast(o); } }
+
+		@Override
+		public COMPARATOR KEY_GENERIC_TYPE comparator(){ synchronized(mutex) { return s.comparator(); } }
+
 		@Override
 		public BI_ITERATOR KEY_GENERIC_TYPE iterator() { synchronized(mutex) { return s.iterator(); } }
+
 		@Override
 		public BI_ITERATOR KEY_GENERIC_TYPE iterator(KEY_TYPE fromElement) { synchronized(mutex) { return s.iterator(fromElement); } }
+
 		@Override
-		public ORDERED_SET KEY_GENERIC_TYPE copy() { synchronized(mutex) { return s.copy(); } }
+		public SORTED_SET KEY_GENERIC_TYPE subSet(KEY_TYPE fromElement, KEY_TYPE toElement) { synchronized(mutex) { return synchronize(s.subSet(fromElement, toElement), mutex); } }
+
+		@Override
+		public SORTED_SET KEY_GENERIC_TYPE headSet(KEY_TYPE toElement) { synchronized(mutex) { return synchronize(s.headSet(toElement), mutex); } }
+
+		@Override
+		public SORTED_SET KEY_GENERIC_TYPE tailSet(KEY_TYPE fromElement) { synchronized(mutex) { return synchronize(s.tailSet(fromElement), mutex); } }
+
 		@Override
 		public KEY_TYPE FIRST_KEY() { synchronized(mutex) { return s.FIRST_KEY(); } }
+
 		@Override
 		public KEY_TYPE POLL_FIRST_KEY() { synchronized(mutex) { return s.POLL_FIRST_KEY(); } }
+
 		@Override
 		public KEY_TYPE LAST_KEY() { synchronized(mutex) { return s.LAST_KEY(); } }
+
 		@Override
 		public KEY_TYPE POLL_LAST_KEY() { synchronized(mutex) { return s.POLL_LAST_KEY(); } }
 	}
 	
-#endif
 	private static class SynchronizedTrimSet KEY_GENERIC_TYPE extends SynchronizedSet KEY_GENERIC_TYPE implements ITrimmable
 	{
 		ITrimmable trim;
@@ -697,29 +538,28 @@ public class SETS
 	
 	private static class SynchronizedSet KEY_GENERIC_TYPE extends SynchronizedCollection KEY_GENERIC_TYPE implements SET KEY_GENERIC_TYPE
 	{
+#if !TYPE_OBJECT
 		SET KEY_GENERIC_TYPE s;
+#endif
 		
 		SynchronizedSet(SET KEY_GENERIC_TYPE c) {
 			super(c);
+#if !TYPE_OBJECT
 			s = c;
+#endif
 		}
 		
 		SynchronizedSet(SET KEY_GENERIC_TYPE c, Object mutex) {
 			super(c, mutex);
+#if !TYPE_OBJECT
 			s = c;
-		}
-		
-#if TYPE_OBJECT
-		@Override
-		public KEY_TYPE addOrGet(KEY_TYPE o) { synchronized(mutex) { return s.addOrGet(o); } }
-		
 #endif
-		@Override
-		public SET KEY_GENERIC_TYPE copy() { synchronized(mutex) { return s.copy(); } }
+		}
 		
 #if !TYPE_OBJECT
 		@Override
 		public boolean remove(KEY_TYPE o) { synchronized(mutex) { return s.remove(o); } }
 #endif
 	}
+#endif
 }

src/builder/resources/speiger/assets/collections/templates/utils/Splititerators.template

@@ -1,7 +1,6 @@
 package speiger.src.collections.PACKAGE.utils;
 
 import java.util.Comparator;
-import java.util.NoSuchElementException;
 import java.util.Spliterator;
 #if PRIMITIVES
 import java.util.Spliterator.JAVA_SPLIT_ITERATOR;
@@ -330,11 +329,7 @@ public class SPLIT_ITERATORS
 		}
 		
 		@Override
-		public KEY_TYPE NEXT() {
-			if(!hasNext()) throw new NoSuchElementException();
-			return array[index++];
-		}
-		
+		public KEY_TYPE NEXT() { return array[index++]; }
 		@Override
 		public boolean hasNext() { return index < fence; }
 	}

src/builder/resources/speiger/assets/collections/templates/utils/Strategy.template

@@ -1,7 +1,5 @@
 package speiger.src.collections.PACKAGE.utils;
 
-import java.util.Objects;
-
 /**
  * A Type Specific Strategy class that allows to give control hashcode generation and equals comparason for maps
  * @Type(T)
@@ -21,17 +19,6 @@ public interface STRATEGY KEY_GENERIC_TYPE
 	public static GENERIC_KEY_BRACES STRATEGY KEY_GENERIC_TYPE identityStrategy() { return (STRATEGY<KEY_TYPE>)IDENTITY; }
 	
 #endif
-	/**
-	 * Normal Strategy
-	 */
-	public static final STRATEGY NO_GENERIC_TYPE NORMAL = new NormalStrategyBRACES();
-	
-	/**
-	 * @Type(T)
-	 * @return a Normal Strategy that is behaving exactly like the normal Hash Strategy in the Hash Collections
-	 */
-	public static GENERIC_KEY_BRACES STRATEGY KEY_GENERIC_TYPE normalStrategy() { return (STRATEGY KEY_GENERIC_TYPE)NORMAL; }
-	
 	/**
 	 * Type Specific HashCode function
 	 * @param o the element that the hashcode is requested for (if object may be null)
@@ -60,18 +47,5 @@ public interface STRATEGY KEY_GENERIC_TYPE
 		@Override
 		public boolean equals(KEY_TYPE key, KEY_TYPE value) { return key == value; }
 	}
-	
 #endif
-	/**
-	 * A Strategy that simulates the normal Hash Collection Behavior if you want to use Hash Control Collections to replace normal ones.
-	 * Only real reason to do that is you have to use this and want to get rid of implementations.
-	 * @Type(T)
-	 */
-	public static class NormalStrategy KEY_GENERIC_TYPE implements STRATEGY KEY_GENERIC_TYPE
-	{
-		@Override
-		public int hashCode(KEY_TYPE o) { return KEY_TO_HASH(o); }
-		@Override
-		public boolean equals(KEY_TYPE key, KEY_TYPE value) { return EQUALS_KEY_TYPE(key, value); }
-	}
 }