0.10.5 - Added and updated some dependencies (specifically jcollection-util to latest 0.7.x version.

Author: TeamworkGuy2

.classpath

@@ -30,5 +30,7 @@
 	<classpathentry kind="lib" path="C:/Users/TeamworkGuy2/Documents/Java/Libraries/jtree-walker/bin/jtree_walker.jar" sourcepath="/JTreeWalker"/>
 	<classpathentry kind="lib" path="C:/Users/TeamworkGuy2/Documents/Java/Libraries/jfile-io/bin/jfile_io.jar" sourcepath="/JFileIo"/>
 	<classpathentry kind="lib" path="C:/Users/TeamworkGuy2/Documents/Java/Libraries/jtwg2-logging/bin/jtwg2_logging.jar" sourcepath="/JTwg2Logging"/>
+	<classpathentry kind="lib" path="C:/Users/TeamworkGuy2/Documents/Java/Libraries/jcollection-builders/bin/jcollection_builders.jar" sourcepath="/JCollectionBuilders"/>
+	<classpathentry kind="lib" path="C:/Users/TeamworkGuy2/Documents/Java/Libraries/jtuples/bin/jtuples.jar" sourcepath="/JTuples"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

CHANGELOG.md

@@ -4,9 +4,17 @@ This project does its best to adhere to [Semantic Versioning](http://semver.org/
 
 
 --------
-###[0.10.4](N/A) - 2016-08-18
+###[0.10.5](N/A) - 2016-08-21
+####Changed
+* Added JCollectionBuilders and JTuples dependencies
+* Updated jcollection-util to latest 0.7.x version (removed twg2.collections.builder and twg2.collections.tuple)
+
+
+--------
+###[0.10.4](https://github.com/TeamworkGuy2/JParserTools/commit/5a3686f828a91eac9896755fb8f6ee8d888b3ca7) - 2016-08-18
 ####Changed
 * Updated jdata-util to latest 0.3.x version (EnumUtil renamed ErrorUtil, TimeUnitUtil package name changed)
+* Fixed compiled jar path and name
 
 
 --------

bin/jparser_tools-with-tests.jar

@@ -17,7 +17,6 @@
 import lombok.NoArgsConstructor;
 import lombok.val;
 import twg2.collections.builder.ListUtil;
-import twg2.collections.tuple.Tuples;
 import twg2.io.files.FileReadUtil;
 import twg2.io.files.FileVisitorUtil;
 import twg2.io.json.Json;
@@ -26,6 +25,7 @@
 import twg2.parser.language.CodeLanguageOptions;
 import twg2.text.stringUtils.StringReplace;
 import twg2.text.stringUtils.StringSplit;
+import twg2.tuple.Tuples;
 
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;

bin/jparser_tools.jar

@@ -14,7 +14,6 @@
 import twg2.ast.interm.method.MethodSig;
 import twg2.ast.interm.type.TypeSig;
 import twg2.ast.interm.type.TypeSig.Simple;
-import twg2.collections.tuple.Tuples;
 import twg2.parser.baseAst.AccessModifierEnum;
 import twg2.parser.baseAst.AstParser;
 import twg2.parser.baseAst.tools.AstFragType;
@@ -33,6 +32,7 @@
 import twg2.streams.EnhancedListBuilderIterator;
 import twg2.text.stringUtils.StringJoin;
 import twg2.treeLike.simpleTree.SimpleTree;
+import twg2.tuple.Tuples;
 
 /**
  * @author TeamworkGuy2

src/twg2/parser/codeParser/codeStats/ParseDirectoryCodeFiles.java

@@ -10,12 +10,12 @@
 import twg2.ast.interm.classes.ClassAst;
 import twg2.ast.interm.field.FieldSig;
 import twg2.ast.interm.method.MethodSig;
-import twg2.collections.tuple.Tuples;
 import twg2.parser.baseAst.AstParser;
 import twg2.parser.baseAst.CompoundBlock;
 import twg2.parser.codeParser.AstExtractor;
 import twg2.parser.documentParser.CodeFragment;
 import twg2.treeLike.simpleTree.SimpleTree;
+import twg2.tuple.Tuples;
 
 /** Base static methods for helping {@link AstExtractor} implementations
  * @author TeamworkGuy2

src/twg2/parser/codeParser/csharp/CsBlockParser.java

@@ -14,7 +14,6 @@
 import twg2.ast.interm.method.MethodSig;
 import twg2.ast.interm.type.TypeSig;
 import twg2.ast.interm.type.TypeSig.Simple;
-import twg2.collections.tuple.Tuples;
 import twg2.parser.baseAst.AccessModifierEnum;
 import twg2.parser.baseAst.AstParser;
 import twg2.parser.baseAst.tools.AstFragType;
@@ -33,6 +32,7 @@
 import twg2.streams.EnhancedListBuilderIterator;
 import twg2.text.stringUtils.StringJoin;
 import twg2.treeLike.simpleTree.SimpleTree;
+import twg2.tuple.Tuples;
 
 /**
  * @author TeamworkGuy2

src/twg2/parser/codeParser/extractors/BlockExtractor.java

@@ -4,7 +4,6 @@
 
 import lombok.val;
 import twg2.collections.primitiveCollections.CharArrayList;
-import twg2.collections.tuple.Tuples;
 import twg2.parser.Inclusion;
 import twg2.parser.condition.text.CharParserMatchable;
 import twg2.parser.text.CharConditionPipe;
@@ -13,6 +12,7 @@
 import twg2.parser.text.CharParserMatchableFactory;
 import twg2.parser.text.StringParserBuilder;
 import twg2.ranges.CharSearchSet;
+import twg2.tuple.Tuples;
 
 /**
  * @author TeamworkGuy2

src/twg2/parser/codeParser/java/JavaBlockParser.java

@@ -1,13 +1,13 @@
 package twg2.parser.codeParser.parsers;
 
 import lombok.val;
-import twg2.collections.tuple.Tuples;
 import twg2.functions.BiPredicates;
 import twg2.parser.condition.text.CharParser;
 import twg2.parser.primitive.NumericParser;
 import twg2.parser.text.CharParserMatchableFactory;
 import twg2.parser.textParser.TextParser;
 import twg2.ranges.CharSearchSet;
+import twg2.tuple.Tuples;
 
 /**
  * @author TeamworkGuy2

src/twg2/parser/codeParser/parsers/IdentifierParser.java

@@ -7,7 +7,6 @@
 import java.util.function.Function;
 
 import twg2.collections.dataStructures.PairList;
-import twg2.collections.tuple.Tuples;
 import twg2.parser.codeParser.CodeFragmentType;
 import twg2.parser.text.CharMultiConditionParser;
 import twg2.parser.text.CharParserFactory;
@@ -21,6 +20,7 @@
 import twg2.treeLike.parameters.IndexedTreeTraverseParameters;
 import twg2.treeLike.simpleTree.SimpleTree;
 import twg2.treeLike.simpleTree.SimpleTreeImpl;
+import twg2.tuple.Tuples;
 
 /**
  * @author TeamworkGuy2

src/twg2/parser/codeParser/parsers/NumberParser.java

@@ -7,11 +7,11 @@
 
 import org.stringtemplate.v4.ST;
 
-import twg2.collections.tuple.Tuples;
 import twg2.parser.templates.ParseBlockInfo;
 import twg2.template.codeTemplate.render.StringTemplatesUtil;
 import twg2.template.codeTemplate.render.TemplateFilesIo;
 import twg2.template.codeTemplate.render.TemplateImports;
+import twg2.tuple.Tuples;
 
 /**
  * @author TeamworkGuy2

src/twg2/parser/documentParser/DocumentParser.java

@@ -5,11 +5,11 @@
 import java.util.Map.Entry;
 
 import twg2.collections.dataStructures.PairList;
-import twg2.collections.tuple.Tuples;
 import twg2.parser.condition.text.CharParser;
 import twg2.parser.textFragment.TextConsumer;
 import twg2.parser.textFragment.TextFragmentRef;
 import twg2.parser.textParser.TextParser;
+import twg2.tuple.Tuples;
 
 /** Build a token tree from text characters using multiple parser factories.<br>
  * Given multiple char parser factories, this maintains a list of in progress parsers and accepts characters if they are accepted by any in-progress parsers or

src/twg2/parser/templates/generators/GenerateParseBlocks.java

@@ -7,11 +7,11 @@
 import lombok.Getter;
 import lombok.val;
 import twg2.collections.builder.ListUtil;
-import twg2.collections.tuple.Tuples;
 import twg2.functions.BiPredicates;
 import twg2.parser.condition.text.CharParser;
 import twg2.parser.condition.text.CharParserMatchable;
 import twg2.parser.textParser.TextParser;
+import twg2.tuple.Tuples;
 
 /** A collection of {@link CharParser}s.
  * Accepts {@link CharParserMatchable} or custom behavior similar to {@link twg2.parser.condition.text.CharParserMatchable#getFirstCharMatcher()}

src/twg2/parser/text/CharMultiConditionParser.java

@@ -6,12 +6,12 @@
 
 import lombok.val;
 import twg2.collections.primitiveCollections.CharArrayList;
-import twg2.collections.tuple.Tuples;
 import twg2.functions.BiPredicates;
 import twg2.parser.Inclusion;
 import twg2.parser.condition.text.CharParser;
 import twg2.parser.condition.text.CharParserMatchable;
 import twg2.parser.textParser.TextParser;
+import twg2.tuple.Tuples;
 
 /**
  * @author TeamworkGuy2

src/twg2/parser/text/CharParserMatchableFactory.java

@@ -7,12 +7,12 @@
 import lombok.val;
 import twg2.collections.builder.ListUtil;
 import twg2.collections.primitiveCollections.CharArrayList;
-import twg2.collections.tuple.Tuples;
 import twg2.functions.BiPredicates;
 import twg2.parser.Inclusion;
 import twg2.parser.condition.text.CharParser;
 import twg2.parser.condition.text.CharParserMatchable;
 import twg2.parser.textParser.TextParser;
+import twg2.tuple.Tuples;
 
 /**
  * @author TeamworkGuy2