Skip to content

Commit 519d191

Browse files
mttfrancimttfranci
committed
0.4.2.7 (2022-08-08)
+ Fix to custom code comment handling + Changed fj-core version to 0.7.6.8
1 parent d5ba74d commit 519d191

File tree

8 files changed

+56
-9
lines changed

8 files changed

+56
-9
lines changed

Diff for: ‎docgen/parameters.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"title" : "Mars (Fugerit DAOGEN A.P.I.)",
33
"name": "Mars",
4-
"version" : "0.4.2.6",
5-
"date" : "02/08/2022",
4+
"version" : "0.4.2.7",
5+
"date" : "08/08/2022",
66
"organization" : {
77
"name" : "Fugerit Org",
88
"url" : "https://www.fugerit.org"

Diff for: ‎docgen/release-notes.txt

+6-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
1-
0.4.2.6 (2022-09-16)
1+
0.4.2.7 (2022-08-08)
2+
--------------------
3+
+ Fix to custom code comment handling
4+
+ Changed fj-core version to 0.7.6.8
5+
6+
0.4.2.6 (2022-08-02)
27
--------------------
38
+ Fix handling null id in loadById()
49
+ Changed fj-core version to 0.7.6.6

Diff for: ‎fj-daogen-base/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.fugerit.java</groupId>
99
<artifactId>fj-daogen</artifactId>
10-
<version>0.4.2.6</version>
10+
<version>0.4.2.7</version>
1111
</parent>
1212

1313
<name>fj-daogen-base</name>

Diff for: ‎fj-daogen-base/src/main/java/org/fugerit/java/daogen/base/gen/DaogenBasicGenerator.java

+42
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
package org.fugerit.java.daogen.base.gen;
22

3+
import java.io.BufferedReader;
34
import java.io.File;
5+
import java.io.FileNotFoundException;
6+
import java.io.FileReader;
47
import java.io.IOException;
8+
import java.io.PrintWriter;
59
import java.util.ArrayList;
610
import java.util.List;
711

@@ -18,6 +22,44 @@ public abstract class DaogenBasicGenerator extends SimpleJavaGenerator implement
1822

1923
protected static String REAL_CLASS_COMMENT = "\t// [HELPER/IMPL MODEL] this class is a stub and can be modified as you see fit (it will not been overwritten)";
2024

25+
@Override
26+
protected void customPartWorker( String startTag, String endTag, String indent ) throws FileNotFoundException, IOException {
27+
if ( !this.isNoCustomComment() ) {
28+
customPartWorkerDaogen( this.getJavaFile(), this.getWriter(), startTag, endTag, indent );
29+
}
30+
}
31+
32+
public static void customPartWorkerDaogen( File file, PrintWriter writer, String startTag, String endTag, String indent ) throws FileNotFoundException, IOException {
33+
customPartWorkerDaogen(file, writer, startTag, endTag, indent, "" );
34+
}
35+
36+
public static void customPartWorkerDaogen( File file, PrintWriter writer, String startTag, String endTag, String indent, String addIfEmpty ) throws FileNotFoundException, IOException {
37+
writer.println( indent+startTag );
38+
boolean customCode = false;
39+
boolean isEmpty = true;
40+
if ( file.exists() ) {
41+
try ( BufferedReader reader = new BufferedReader( new FileReader( file ) ) ) {
42+
String line = reader.readLine();
43+
while ( line != null ) {
44+
if ( line.contains( startTag ) && !line.trim().startsWith( "*" ) ) {
45+
customCode = true;
46+
} else if ( line.contains( endTag ) && !line.trim().startsWith( "*" ) ) {
47+
customCode = false;
48+
} else if ( customCode ) {
49+
writer.println( line );
50+
isEmpty = false;
51+
}
52+
line = reader.readLine();
53+
}
54+
}
55+
}
56+
if ( isEmpty ) {
57+
writer.print( addIfEmpty );
58+
}
59+
writer.println( indent+endTag );
60+
writer.println();
61+
}
62+
2163
@Override
2264
public void write() throws IOException {
2365
if ( this.skipWrite ) {

Diff for: ‎fj-daogen-maven-plugin/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.fugerit.java</groupId>
99
<artifactId>fj-daogen</artifactId>
10-
<version>0.4.2.6</version>
10+
<version>0.4.2.7</version>
1111
</parent>
1212

1313
<packaging>maven-plugin</packaging>

Diff for: ‎fj-daogen-sample/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.fugerit.java</groupId>
99
<artifactId>fj-daogen</artifactId>
10-
<version>0.4.2.6</version>
10+
<version>0.4.2.7</version>
1111
</parent>
1212

1313
<name>fj-daogen-sample</name>

Diff for: ‎fj-daogen-tool/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.fugerit.java</groupId>
99
<artifactId>fj-daogen</artifactId>
10-
<version>0.4.2.6</version>
10+
<version>0.4.2.7</version>
1111
</parent>
1212

1313
<name>fj-daogen-tool</name>

Diff for: ‎pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<groupId>org.fugerit.java</groupId>
66
<artifactId>fj-daogen</artifactId>
77

8-
<version>0.4.2.6</version>
8+
<version>0.4.2.7</version>
99
<packaging>pom</packaging>
1010

1111
<name>fj-daogen</name>
@@ -19,7 +19,7 @@
1919
<maven.compiler.source>${java-version-compliance}</maven.compiler.source>
2020
<maven.compiler.target>${java-version-compliance}</maven.compiler.target>
2121
<maven.test.skip>true</maven.test.skip>
22-
<fj-version>0.7.6.6</fj-version>
22+
<fj-version>0.7.6.8</fj-version>
2323
<!-- maven plugin versions -->
2424
<mvn-source-version>3.2.1</mvn-source-version>
2525
<mvn-javadoc-version>3.2.0</mvn-javadoc-version>

0 commit comments

Comments
 (0)