Skip to content

Commit 5a3686f

Browse files
TeamworkGuy2TeamworkGuy2
committed
0.10.4 - Updated dependencies to latest version, jdata-util version 0.3.0 required some changes (package moved/renamed). Fixed compiled jar path and name.
1 parent 5e2e75d commit 5a3686f

File tree

10 files changed

+43
-37
lines changed

10 files changed

+43
-37
lines changed

‎.classpath

+18-18
Original file line numberDiff line numberDiff line change
@@ -9,26 +9,26 @@
99
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Lombok"/>
1010
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/TemplateUtil"/>
1111
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/TestChecks"/>
12-
<classpathentry kind="lib" path="C:/Users/TeamworkGuy2/Documents/Java/Libraries/data-transfer/jar/data_transfer.jar"/>
12+
<classpathentry kind="lib" path="C:/Users/TeamworkGuy2/Documents/Java/Libraries/data-transfer/bin/data_transfer.jar"/>
1313
<classpathentry kind="lib" path="C:/Users/TeamworkGuy2/Documents/Java/Libraries/jackson/jar/jackson-annotations-2.5.0.jar"/>
1414
<classpathentry kind="lib" path="C:/Users/TeamworkGuy2/Documents/Java/Libraries/jackson/jar/jackson-core-2.5.0.jar"/>
1515
<classpathentry kind="lib" path="C:/Users/TeamworkGuy2/Documents/Java/Libraries/jackson/jar/jackson-databind-2.5.4.jar"/>
16-
<classpathentry kind="lib" path="C:/Users/TeamworkGuy2/Documents/Java/Libraries/jarray-util/jar/jarray_util.jar" sourcepath="/JArrayUtil"/>
17-
<classpathentry kind="lib" path="C:/Users/TeamworkGuy2/Documents/Java/Libraries/jcollection-interfaces/jar/jcollection_interfaces.jar" sourcepath="/JCollectionInterfaces"/>
18-
<classpathentry kind="lib" path="C:/Users/TeamworkGuy2/Documents/Java/Libraries/jcollection-util/jar/jcollection_util.jar" sourcepath="/JCollectionUtil"/>
19-
<classpathentry kind="lib" path="C:/Users/TeamworkGuy2/Documents/Java/Libraries/jdata-util/jar/jdata_util.jar" sourcepath="/JDataUtil"/>
20-
<classpathentry kind="lib" path="C:/Users/TeamworkGuy2/Documents/Java/Libraries/jfunc/jar/jfunc.jar" sourcepath="/JFunc"/>
21-
<classpathentry kind="lib" path="C:/Users/TeamworkGuy2/Documents/Java/Libraries/jinterfaces/jar/jinterfaces.jar" sourcepath="/JInterfaces"/>
22-
<classpathentry kind="lib" path="C:/Users/TeamworkGuy2/Documents/Java/Libraries/jparser-data-type-like/jar/jparser_data_type_like.jar" sourcepath="/JParserDataTypeLike"/>
23-
<classpathentry kind="lib" path="C:/Users/TeamworkGuy2/Documents/Java/Libraries/jprimitive-collections/jar/jprimitive_collections.jar" sourcepath="/JPrimitiveCollections"/>
24-
<classpathentry kind="lib" path="C:/Users/TeamworkGuy2/Documents/Java/Libraries/jrange/jar/jrange.jar" sourcepath="/JRange"/>
25-
<classpathentry kind="lib" path="C:/Users/TeamworkGuy2/Documents/Java/Libraries/jsimple-types/jar/jsimple_types.jar" sourcepath="/JSimpleTypes/src"/>
26-
<classpathentry kind="lib" path="C:/Users/TeamworkGuy2/Documents/Java/Libraries/json-io/jar/json_io.jar" sourcepath="/JsonIo"/>
27-
<classpathentry kind="lib" path="C:/Users/TeamworkGuy2/Documents/Java/Libraries/jstreamish/jar/jstreamish.jar" sourcepath="/JStreamish"/>
28-
<classpathentry kind="lib" path="C:/Users/TeamworkGuy2/Documents/Java/Libraries/jtext-parser/jar/jtext_parser.jar" sourcepath="/JTextParser"/>
29-
<classpathentry kind="lib" path="C:/Users/TeamworkGuy2/Documents/Java/Libraries/jtext-util/jar/jtext_util.jar" sourcepath="C:/Users/TeamworkGuy2/Documents/Java/Projects/JTextParser/src"/>
30-
<classpathentry kind="lib" path="C:/Users/TeamworkGuy2/Documents/Java/Libraries/jtree-walker/jar/jtree_walker.jar" sourcepath="/JTreeWalker"/>
31-
<classpathentry kind="lib" path="C:/Users/TeamworkGuy2/Documents/Java/Libraries/jfile-io/jar/jfile_io.jar" sourcepath="/JFileIo"/>
32-
<classpathentry kind="lib" path="C:/Users/TeamworkGuy2/Documents/Java/Libraries/jtwg2-logging/jar/jtwg2_logging.jar" sourcepath="/JTwg2Logging"/>
16+
<classpathentry kind="lib" path="C:/Users/TeamworkGuy2/Documents/Java/Libraries/jarray-util/bin/jarray_util.jar" sourcepath="/JArrayUtil"/>
17+
<classpathentry kind="lib" path="C:/Users/TeamworkGuy2/Documents/Java/Libraries/jcollection-interfaces/bin/jcollection_interfaces.jar" sourcepath="/JCollectionInterfaces"/>
18+
<classpathentry kind="lib" path="C:/Users/TeamworkGuy2/Documents/Java/Libraries/jcollection-util/bin/jcollection_util.jar" sourcepath="/JCollectionUtil"/>
19+
<classpathentry kind="lib" path="C:/Users/TeamworkGuy2/Documents/Java/Libraries/jdata-util/bin/jdata_util.jar" sourcepath="/JDataUtil"/>
20+
<classpathentry kind="lib" path="C:/Users/TeamworkGuy2/Documents/Java/Libraries/jfunc/bin/jfunc.jar" sourcepath="/JFunc"/>
21+
<classpathentry kind="lib" path="C:/Users/TeamworkGuy2/Documents/Java/Libraries/jinterfaces/bin/jinterfaces.jar" sourcepath="/JInterfaces"/>
22+
<classpathentry kind="lib" path="C:/Users/TeamworkGuy2/Documents/Java/Libraries/jparser-data-type-like/bin/jparser_data_type_like.jar" sourcepath="/JParserDataTypeLike"/>
23+
<classpathentry kind="lib" path="C:/Users/TeamworkGuy2/Documents/Java/Libraries/jprimitive-collections/bin/jprimitive_collections.jar" sourcepath="/JPrimitiveCollections"/>
24+
<classpathentry kind="lib" path="C:/Users/TeamworkGuy2/Documents/Java/Libraries/jrange/bin/jrange.jar" sourcepath="/JRange"/>
25+
<classpathentry kind="lib" path="C:/Users/TeamworkGuy2/Documents/Java/Libraries/jsimple-types/bin/jsimple_types.jar" sourcepath="/JSimpleTypes/src"/>
26+
<classpathentry kind="lib" path="C:/Users/TeamworkGuy2/Documents/Java/Libraries/json-io/bin/json_io.jar" sourcepath="/JsonIo"/>
27+
<classpathentry kind="lib" path="C:/Users/TeamworkGuy2/Documents/Java/Libraries/jstreamish/bin/jstreamish.jar" sourcepath="/JStreamish"/>
28+
<classpathentry kind="lib" path="C:/Users/TeamworkGuy2/Documents/Java/Libraries/jtext-parser/bin/jtext_parser.jar" sourcepath="/JTextParser"/>
29+
<classpathentry kind="lib" path="C:/Users/TeamworkGuy2/Documents/Java/Libraries/jtext-util/bin/jtext_util.jar" sourcepath="C:/Users/TeamworkGuy2/Documents/Java/Projects/JTextParser/src"/>
30+
<classpathentry kind="lib" path="C:/Users/TeamworkGuy2/Documents/Java/Libraries/jtree-walker/bin/jtree_walker.jar" sourcepath="/JTreeWalker"/>
31+
<classpathentry kind="lib" path="C:/Users/TeamworkGuy2/Documents/Java/Libraries/jfile-io/bin/jfile_io.jar" sourcepath="/JFileIo"/>
32+
<classpathentry kind="lib" path="C:/Users/TeamworkGuy2/Documents/Java/Libraries/jtwg2-logging/bin/jtwg2_logging.jar" sourcepath="/JTwg2Logging"/>
3333
<classpathentry kind="output" path="bin"/>
3434
</classpath>

‎CHANGELOG.md

+8-2
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,16 @@ This project does its best to adhere to [Semantic Versioning](http://semver.org/
44

55

66
--------
7-
###[0.10.3](N/A) - 2016-08-07
7+
###[0.10.4](N/A) - 2016-08-18
8+
####Changed
9+
* Updated jdata-util to latest 0.3.x version (EnumUtil renamed ErrorUtil, TimeUnitUtil package name changed)
10+
11+
12+
--------
13+
###[0.10.3](https://github.com/TeamworkGuy2/JParserTools/commit/5e2e75da19451f6e99427405b6b04f844fb260de) - 2016-08-07
814
####Changed
915
* Updated jcollection-util to latest 0.5.x version
10-
* Updated jfile-io to latest 0.6.x version(SourceInfo renamed to DirectorySearchInfo)
16+
* Updated jfile-io to latest 0.6.x version (SourceInfo renamed to DirectorySearchInfo)
1117
* Updated jtext-util to latest 0.10.x version (some classes moved to new twg2.text.stringSearch package)
1218
* Added jcollection-interfaces dependency
1319

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
ParserToolsTmp
22
==============
3-
version: 0.10.3
3+
version: 0.10.4
44

55
In progress C#/Java/TypeScript parser tools built atop [JTextParser] (https://github.com/TeamworkGuy2/JTextParser), [Jackson] (https://github.com/FasterXML/jackson-core/) (core, databind, annotations) and half a dozen other utility libraries.
66

‎bin/jparser-tools.jar ‎bin/jparser_tools.jar

345 KB
Binary file not shown.

‎package-lib.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
2-
"version" : "0.10.3",
2+
"version" : "0.10.4",
33
"name" : "jparser-tools",
44
"description" : "An in-progress suite of parsing tools for C#, Java, and TypeScript source code",
55
"homepage" : "https://github.com/TeamworkGuy2/JFileIo",
66
"license" : "MIT",
7-
"main" : "./jar/jparser_tools.jar",
7+
"main" : "./bin/jparser_tools.jar",
88
"dependencies" : {
99
"data-transfer": "*",
1010
"jackson": "*",

‎src/twg2/parser/baseAst/csharp/CsAstUtil.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package twg2.parser.baseAst.csharp;
22

33
import lombok.val;
4-
import twg2.dataUtil.dataUtils.EnumUtil;
4+
import twg2.dataUtil.dataUtils.EnumError;
55
import twg2.parser.baseAst.AccessModifierEnum;
66
import twg2.parser.baseAst.AccessModifierParser;
77
import twg2.parser.baseAst.AstTypeChecker;
@@ -65,7 +65,7 @@ public final AccessModifierEnum defaultAccessModifier(AccessModifierEnum access,
6565
case NAMESPACE: // namespace { class }
6666
return AccessModifierEnum.NAMESPACE_LOCAL;
6767
default:
68-
throw EnumUtil.unknownValue(parentBlock, CsBlock.class);
68+
throw EnumError.unknownValue(parentBlock, CsBlock.class);
6969
}
7070
case INTERFACE:
7171
switch(parentBlock) {
@@ -76,12 +76,12 @@ public final AccessModifierEnum defaultAccessModifier(AccessModifierEnum access,
7676
case NAMESPACE: // namespace { interface }
7777
return AccessModifierEnum.NAMESPACE_LOCAL;
7878
default:
79-
throw EnumUtil.unknownValue(parentBlock, CsBlock.class);
79+
throw EnumError.unknownValue(parentBlock, CsBlock.class);
8080
}
8181
case NAMESPACE: // NAMESPACE default true
8282
return AccessModifierEnum.PUBLIC;
8383
default:
84-
throw EnumUtil.unknownValue(currentBlock, CsBlock.class);
84+
throw EnumError.unknownValue(currentBlock, CsBlock.class);
8585
}
8686
}
8787

‎src/twg2/parser/baseAst/java/JavaAstUtil.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package twg2.parser.baseAst.java;
22

3-
import twg2.dataUtil.dataUtils.EnumUtil;
3+
import twg2.dataUtil.dataUtils.EnumError;
44
import twg2.parser.baseAst.AccessModifierEnum;
55
import twg2.parser.baseAst.AccessModifierParser;
66
import twg2.parser.baseAst.AstTypeChecker;
@@ -63,7 +63,7 @@ public final AccessModifierEnum defaultAccessModifier(AccessModifierEnum access,
6363
case INTERFACE: // interface { class }
6464
return AccessModifierEnum.PUBLIC;
6565
default:
66-
throw EnumUtil.unknownValue(parentBlock, JavaBlock.class);
66+
throw EnumError.unknownValue(parentBlock, JavaBlock.class);
6767
}
6868
case INTERFACE:
6969
switch(parentBlock) {
@@ -73,7 +73,7 @@ public final AccessModifierEnum defaultAccessModifier(AccessModifierEnum access,
7373
case INTERFACE: // interface { interface }
7474
return AccessModifierEnum.PUBLIC;
7575
default:
76-
throw EnumUtil.unknownValue(parentBlock, JavaBlock.class);
76+
throw EnumError.unknownValue(parentBlock, JavaBlock.class);
7777
}
7878
case ENUM:
7979
switch(parentBlock) {
@@ -83,10 +83,10 @@ public final AccessModifierEnum defaultAccessModifier(AccessModifierEnum access,
8383
case INTERFACE: // interface { enum }
8484
return AccessModifierEnum.PUBLIC;
8585
default:
86-
throw EnumUtil.unknownValue(parentBlock, JavaBlock.class);
86+
throw EnumError.unknownValue(parentBlock, JavaBlock.class);
8787
}
8888
default:
89-
throw EnumUtil.unknownValue(currentBlock, JavaBlock.class);
89+
throw EnumError.unknownValue(currentBlock, JavaBlock.class);
9090
}
9191
}
9292

‎src/twg2/parser/codeParser/csharp/CsBlock.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package twg2.parser.codeParser.csharp;
22

3-
import twg2.dataUtil.dataUtils.EnumUtil;
3+
import twg2.dataUtil.dataUtils.EnumError;
44
import twg2.parser.baseAst.CompoundBlock;
55

66
/**
@@ -69,7 +69,7 @@ public static final CsBlock tryFromKeyword(CsKeyword keyword) {
6969
case NAMESPACE:
7070
return CsBlock.NAMESPACE;
7171
default:
72-
throw EnumUtil.unknownValue(keyword, CsKeyword.class);
72+
throw EnumError.unknownValue(keyword, CsKeyword.class);
7373
}
7474
}
7575

‎src/twg2/parser/codeParser/java/JavaBlock.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package twg2.parser.codeParser.java;
22

3-
import twg2.dataUtil.dataUtils.EnumUtil;
3+
import twg2.dataUtil.dataUtils.EnumError;
44
import twg2.parser.baseAst.CompoundBlock;
55

66
/**
@@ -63,7 +63,7 @@ public static final JavaBlock tryFromKeyword(JavaKeyword keyword) {
6363
case ENUM:
6464
return JavaBlock.ENUM;
6565
default:
66-
throw EnumUtil.unknownValue(keyword, JavaKeyword.class);
66+
throw EnumError.unknownValue(keyword, JavaKeyword.class);
6767
}
6868
}
6969

‎src/twg2/parser/main/ParserWorkflow.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
import lombok.val;
2323
import twg2.ast.interm.classes.ClassAst;
24-
import twg2.dataUtil.dataUtils.TimeUnitUtil;
24+
import twg2.dataUtil.dateTime.TimeUnitUtil;
2525
import twg2.io.fileLoading.DirectorySearchInfo;
2626
import twg2.io.fileLoading.SourceFiles;
2727
import twg2.io.files.FileFormatException;

0 commit comments

Comments
 (0)