Skip to content

Commit 311c946

Browse files
hauke96hauke96
committed
Update gson, juard and all usages of the libraries
1 parent c128110 commit 311c946

15 files changed

+51
-51
lines changed

‎.classpath‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<classpath>
33
<classpathentry kind="src" path="src"/>
44
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
5-
<classpathentry kind="lib" path="libs/juard_0.0.2.jar"/>
6-
<classpathentry kind="lib" path="libs/gson-2.6.2.jar"/>
5+
<classpathentry kind="lib" path="lib/juard_0.1.0.jar"/>
6+
<classpathentry kind="lib" path="lib/gson-2.8.1.jar"/>
77
<classpathentry kind="output" path="bin"/>
88
</classpath>

‎lib/gson-2.8.1-sources.jar‎

144 KB
Binary file not shown.

‎lib/gson-2.8.1.jar‎

227 KB
Binary file not shown.

‎lib/juard_0.1.0.jar‎

62.9 KB
Binary file not shown.

‎src/json2code/JsonConverter.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,9 @@ public static void main(String[] args)
4949

5050
String[] additionalArgs = Arrays.copyOfRange(args, 3, args.length);
5151

52-
Logger.__info("Use file : " + fileName);
53-
Logger.__info("Use language : " + targetLanguage);
54-
Logger.__info("Use output dir : " + outputDirectory);
52+
Logger.info("Use file : " + fileName);
53+
Logger.info("Use language : " + targetLanguage);
54+
Logger.info("Use output dir : " + outputDirectory);
5555

5656
SchemeReader schemeReader = new SchemeReader(fileName);
5757
SchemeFile schemeFile = schemeReader.getSchemeFile();
@@ -73,7 +73,7 @@ private static void checkParameter(String[] args)
7373
{
7474
if (args.length < 3)
7575
{
76-
Logger.__fatal("Invalid argument count! The arguments must be: \n\n"
76+
Logger.fatal("Invalid argument count! The arguments must be: \n\n"
7777
+ " 1.) The file name of the scheme definition\n"
7878
+ " 2.) The language of the output classes\n"
7979
+ " 3.) Output directory\n"
@@ -86,7 +86,7 @@ private static void checkParameter(String[] args)
8686
if (!file.exists())
8787
{
8888
String message = MessageFormat.format("File {0} does not exist!", args[0]);
89-
Logger.__fatal(message);
89+
Logger.fatal(message);
9090
}
9191
}
9292
}

‎src/json2code/converter/SchemeConverter.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ public class SchemeConverter
3535
*/
3636
public SchemeConverter(SchemeFile schemeFile, String targetLanguage, String[] additionalArgs)
3737
{
38-
Contract.RequireNotNull(schemeFile);
39-
Contract.RequireNotNullOrEmpty(targetLanguage);
40-
Contract.RequireNotNull(additionalArgs);
38+
Contract.NotNull(schemeFile);
39+
Contract.NotNullOrEmpty(targetLanguage);
40+
Contract.NotNull(additionalArgs);
4141

4242
this.schemeFile = schemeFile;
4343
this.targetLanguage = targetLanguage.toLowerCase();
@@ -77,11 +77,11 @@ public void printResult()
7777
if (patternApplier.hasResult())
7878
{
7979
Map<String, String> result = patternApplier.getResult();
80-
result.values().forEach(string -> Logger.__info(string));
80+
result.values().forEach(string -> Logger.info(string));
8181
}
8282
else
8383
{
84-
Logger.__error("Converter for language " + targetLanguage + " has no result. First convert the json, then get the result.");
84+
Logger.error("Converter for language " + targetLanguage + " has no result. First convert the json, then get the result.");
8585
}
8686
}
8787

@@ -102,7 +102,7 @@ public void writeResult(String outputDirectory)
102102
}
103103
else
104104
{
105-
Logger.__error("Converter for language " + targetLanguage + " has no result. First convert the json, then get the result.");
105+
Logger.error("Converter for language " + targetLanguage + " has no result. First convert the json, then get the result.");
106106
}
107107
}
108108

@@ -133,7 +133,7 @@ private AbstractPatternApplier getPatternApplierFor(String targetLanguage)
133133
}
134134
String message = stringBuilder.toString();
135135

136-
Logger.__fatal(message);
136+
Logger.fatal(message);
137137
return null; // will never be executed (Logger.__fatal will close the app), but the compiler needs it ;)
138138
}
139139
}

‎src/json2code/converter/SchemeReader.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public SchemeReader(String fileName)
5454
// TODO add simple warning handler (lambda, which is defined here as "DefaultWarningHandler")
5555
public SchemeFile getSchemeFile()
5656
{
57-
Logger.__info("Read file ...");
57+
Logger.info("Read file ...");
5858

5959
byte[] encoded = null;
6060
try
@@ -64,11 +64,11 @@ public SchemeFile getSchemeFile()
6464
catch (IOException e)
6565
{
6666
String message = MessageFormat.format("File {0} could not be read properly.", fileName);
67-
Logger.__fatal(message, e);
67+
Logger.fatal(message, e);
6868
}
6969
String content = new String(encoded, Charset.defaultCharset());
7070

71-
Logger.__info("Convert json into scheme object...");
71+
Logger.info("Convert json into scheme object...");
7272

7373
Set<String> knownClasses = new HashSet<>();
7474

@@ -161,11 +161,11 @@ else if (field.getType().isEmpty())
161161

162162
if (errorOccurred)
163163
{
164-
Logger.__fatal("Parsing exited with error(s).");
164+
Logger.fatal("Parsing exited with error(s).");
165165
}
166166
if (warningOccurred)
167167
{
168-
Logger.__info("Parsing exited with warning(s).");
168+
Logger.info("Parsing exited with warning(s).");
169169
}
170170

171171
return result;
@@ -176,11 +176,11 @@ else if (field.getType().isEmpty())
176176

177177
private void warn(String message)
178178
{
179-
Logger.__info("Parsing warning: " + message);
179+
Logger.info("Parsing warning: " + message);
180180
}
181181

182182
private void error(String message)
183183
{
184-
Logger.__error("Parsing error: " + message);
184+
Logger.error("Parsing error: " + message);
185185
}
186186
}

‎src/json2code/converter/interfaces/AbstractPatternApplier.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ public abstract class AbstractPatternApplier
3737
*/
3838
public void writeResultTo(String outputDirectory)
3939
{
40-
Contract.RequireNotNullOrEmpty(outputDirectory);
41-
Contract.Require(hasResult());
40+
Contract.NotNullOrEmpty(outputDirectory);
41+
Contract.Satisfy(hasResult());
4242

4343
outputWriter.write(outputDirectory, resultMap);
4444
}
@@ -50,7 +50,7 @@ public void writeResultTo(String outputDirectory)
5050
*/
5151
public Map<String, String> getResult()
5252
{
53-
Contract.Require(hasResult());
53+
Contract.Satisfy(hasResult());
5454

5555
return resultMap;
5656
}

‎src/json2code/converter/interfaces/AbstractTypeMapper.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public String getTargetType(String schemeType)
4040

4141
String targetType = typeMap.get(schemeType);
4242

43-
Contract.EnsureNotNull(targetType);
43+
Contract.NotNull(targetType);
4444
return targetType;
4545
}
4646
}

‎src/json2code/converter/languages/go/GoOutputWriter.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ public class GoOutputWriter implements IOutputWriter
1515
@Override
1616
public void write(String outputDirectory, Map<String, String> classes)
1717
{
18-
Contract.RequireNotNullOrEmpty(outputDirectory);
19-
Contract.RequireNotNull(classes);
18+
Contract.NotNullOrEmpty(outputDirectory);
19+
Contract.NotNull(classes);
2020

2121
if (!outputDirectory.endsWith("/"))
2222
{
@@ -38,7 +38,7 @@ public void write(String outputDirectory, Map<String, String> classes)
3838
}
3939
catch (IOException e)
4040
{
41-
Logger.__error("Cannot write to file " + file.getName(), e);
41+
Logger.error("Cannot write to file " + file.getName(), e);
4242
}
4343
}
4444
}

0 commit comments

Comments
 (0)