Skip to content

Commit d35fd8d

Browse files
computatecomputate
committed
Adding smarter entities to BaseModel and BaseResult
1 parent f830b8f commit d35fd8d

File tree

4 files changed

+254
-100
lines changed

4 files changed

+254
-100
lines changed

‎src/main/java/org/computate/frFR/java/EcrireGenClasse.java‎

Lines changed: 143 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -279,6 +279,10 @@ public class EcrireGenClasse extends EcrireClasse {
279279
* Var.enUS: classExtendsGen
280280
*/
281281
protected Boolean classeEtendGen;
282+
protected Boolean classeEstModeleBase;
283+
protected Boolean classeEstResultatBase;
284+
protected Boolean classeEtendModeleBase;
285+
protected Boolean classeEtendResultatBase;
282286

283287
/**
284288
* Var.enUS: classBaseExtendsGen
@@ -568,14 +572,14 @@ public class EcrireGenClasse extends EcrireClasse {
568572
String entiteAttribuerVar;
569573

570574
/**
571-
* Var.enUS: entityAttributeVarUrlId
575+
* Var.enUS: entityAttributeVarUrlPageAffichage
572576
*/
573-
String entiteAttribuerVarUrlId;
577+
String entiteAttribuerVarUrlPageAffichage;
574578

575579
/**
576-
* Var.enUS: entityAttributeVarUrlPk
580+
* Var.enUS: entityAttributeVarUrlPageEdition
577581
*/
578-
String entiteAttribuerVarUrlPk;
582+
String entiteAttribuerVarUrlPageEdition;
579583

580584
/**
581585
* Var.enUS: entityAttributeVarId
@@ -795,14 +799,20 @@ public class EcrireGenClasse extends EcrireClasse {
795799
protected String classeDeNom;
796800

797801
protected String classeVarTitre;
802+
protected String classeUriPageEdition;
803+
protected String classeStringFormatUrlPageEdition;
804+
protected String classeUriPageAffichage;
805+
protected String classeStringFormatUrlPageAffichage;
806+
protected String classeVarNom;
807+
protected String classeVarDescription;
798808

799809
protected String classeVarSuggere;
800810

801811
protected String classeVarTexte;
802812

803-
protected String classeVarUrlId;
813+
protected String classeVarUrlPageAffichage;
804814

805-
protected String classeVarUrlPk;
815+
protected String classeVarUrlPageEdition;
806816

807817
protected String classeVarH1;
808818

@@ -2183,94 +2193,94 @@ public void genCodeClasseDebut(String langueNom, JsonObject langueConfig) throws
21832193
classeDeNom = classeDoc.getString("classeDeNom" + "_" + langueNom2 + "_stored_string");
21842194

21852195
if(classeUri != null)
2186-
tl(1, "public static final String ", classeNomSimple, "_", langueConfig.getString(I18n.var_Uri), "_", langueNom2, " = ", q(classeUri), ";");
2196+
tl(1, "public static final String ", langueConfig.getString(I18n.var_Uri), "_", langueNom2, " = ", q(classeUri), ";");
21872197

21882198
if(classeDescription != null)
2189-
tl(1, "public static final String ", classeNomSimple, "_", langueConfig.getString(I18n.var_Description), "_", langueNom2, " = ", q(classeDescription), ";");
2199+
tl(1, "public static final String ", langueConfig.getString(I18n.var_Description), "_", langueNom2, " = ", q(classeDescription), ";");
21902200

21912201
if(classeUnNom != null)
2192-
tl(1, "public static final String ", classeNomSimple, "_", langueConfig.getString(I18n.var_UnNom), "_", langueNom2, " = ", q(classeUnNom), ";");
2202+
tl(1, "public static final String ", langueConfig.getString(I18n.var_UnNom), "_", langueNom2, " = ", q(classeUnNom), ";");
21932203

21942204
if(classeCe != null)
2195-
tl(1, "public static final String ", classeNomSimple, "_", langueConfig.getString(I18n.var_Ce), "_", langueNom2, " = ", q(classeCe), ";");
2205+
tl(1, "public static final String ", langueConfig.getString(I18n.var_Ce), "_", langueNom2, " = ", q(classeCe), ";");
21962206

21972207
if(classeCeNom != null)
2198-
tl(1, "public static final String ", classeNomSimple, "_", langueConfig.getString(I18n.var_CeNom), "_", langueNom2, " = ", q(classeCeNom), ";");
2208+
tl(1, "public static final String ", langueConfig.getString(I18n.var_CeNom), "_", langueNom2, " = ", q(classeCeNom), ";");
21992209

22002210
if(classeUn != null)
2201-
tl(1, "public static final String ", classeNomSimple, "_", langueConfig.getString(I18n.var_Un), "_", langueNom2, " = ", q(classeUn), ";");
2211+
tl(1, "public static final String ", langueConfig.getString(I18n.var_Un), "_", langueNom2, " = ", q(classeUn), ";");
22022212

22032213
if(classeLeNom != null)
2204-
tl(1, "public static final String ", classeNomSimple, "_", langueConfig.getString(I18n.var_LeNom), "_", langueNom2, " = ", q(classeLeNom), ";");
2214+
tl(1, "public static final String ", langueConfig.getString(I18n.var_LeNom), "_", langueNom2, " = ", q(classeLeNom), ";");
22052215

22062216
if(classeNomSingulier != null)
2207-
tl(1, "public static final String ", classeNomSimple, "_", langueConfig.getString(I18n.var_NomSingulier), "_", langueNom2, " = ", q(classeNomSingulier), ";");
2217+
tl(1, "public static final String ", langueConfig.getString(I18n.var_NomSingulier), "_", langueNom2, " = ", q(classeNomSingulier), ";");
22082218

22092219
if(classeNomPluriel != null)
2210-
tl(1, "public static final String ", classeNomSimple, "_", langueConfig.getString(I18n.var_NomPluriel), "_", langueNom2, " = ", q(classeNomPluriel), ";");
2220+
tl(1, "public static final String ", langueConfig.getString(I18n.var_NomPluriel), "_", langueNom2, " = ", q(classeNomPluriel), ";");
22112221

22122222
if(classeNomActuel != null)
2213-
tl(1, "public static final String ", classeNomSimple, "_", langueConfig.getString(I18n.var_NomActuel), "_", langueNom2, " = ", q(classeNomActuel), ";");
2223+
tl(1, "public static final String ", langueConfig.getString(I18n.var_NomActuel), "_", langueNom2, " = ", q(classeNomActuel), ";");
22142224

22152225
if(classeTous != null)
2216-
tl(1, "public static final String ", classeNomSimple, "_", langueConfig.getString(I18n.var_Tous), "_", langueNom2, " = ", q(classeTous), ";");
2226+
tl(1, "public static final String ", langueConfig.getString(I18n.var_Tous), "_", langueNom2, " = ", q(classeTous), ";");
22172227

22182228
if(classeTousNom != null)
2219-
tl(1, "public static final String ", classeNomSimple, "_", langueConfig.getString(I18n.var_TousNom), "_", langueNom2, " = ", q(classeTousNom), ";");
2229+
tl(1, "public static final String ", langueConfig.getString(I18n.var_TousNom), "_", langueNom2, " = ", q(classeTousNom), ";");
22202230

22212231
if(classeRechercherTousNomPar != null)
2222-
tl(1, "public static final String ", classeNomSimple, "_", langueConfig.getString(I18n.var_RechercherTousNomPar), "_", langueNom2, " = ", q(classeRechercherTousNomPar), ";");
2232+
tl(1, "public static final String ", langueConfig.getString(I18n.var_RechercherTousNomPar), "_", langueNom2, " = ", q(classeRechercherTousNomPar), ";");
22232233

22242234
if(classeRechercherTousNom != null)
2225-
tl(1, "public static final String ", classeNomSimple, "_", langueConfig.getString(I18n.var_RechercherTousNom), "_", langueNom2, " = ", q(classeRechercherTousNom), ";");
2235+
tl(1, "public static final String ", langueConfig.getString(I18n.var_RechercherTousNom), "_", langueNom2, " = ", q(classeRechercherTousNom), ";");
22262236

22272237
if(classeH1 != null)
2228-
tl(1, "public static final String ", classeNomSimple, "_H1", "_", langueNom2, " = ", q(classeH1), ";");
2238+
tl(1, "public static final String H1", "_", langueNom2, " = ", q(classeH1), ";");
22292239

22302240
if(classeH2 != null)
2231-
tl(1, "public static final String ", classeNomSimple, "_H2", "_", langueNom2, " = ", q(classeH2), ";");
2241+
tl(1, "public static final String H2", "_", langueNom2, " = ", q(classeH2), ";");
22322242

22332243
if(classeH3 != null)
2234-
tl(1, "public static final String ", classeNomSimple, "_H3", "_", langueNom2, " = ", q(classeH3), ";");
2244+
tl(1, "public static final String H3", "_", langueNom2, " = ", q(classeH3), ";");
22352245

22362246
if(classeTitre != null)
2237-
tl(1, "public static final String ", classeNomSimple, "_", langueConfig.getString(I18n.var_Titre), "_", langueNom2, " = ", q(classeTitre), ";");
2247+
tl(1, "public static final String ", langueConfig.getString(I18n.var_Titre), "_", langueNom2, " = ", q(classeTitre), ";");
22382248

22392249
if(classeLesNoms != null)
2240-
tl(1, "public static final String ", classeNomSimple, "_", langueConfig.getString(I18n.var_LesNoms), "_", langueNom2, " = ", q(classeLesNoms), ";");
2250+
tl(1, "public static final String ", langueConfig.getString(I18n.var_LesNoms), "_", langueNom2, " = ", q(classeLesNoms), ";");
22412251

22422252
if(classeAucunNomTrouve != null)
2243-
tl(1, "public static final String ", classeNomSimple, "_", langueConfig.getString(I18n.var_AucunNomTrouve), "_", langueNom2, " = ", q(classeAucunNomTrouve), ";");
2253+
tl(1, "public static final String ", langueConfig.getString(I18n.var_AucunNomTrouve), "_", langueNom2, " = ", q(classeAucunNomTrouve), ";");
22442254

22452255
if(classeNomVar != null)
2246-
tl(1, "public static final String ", classeNomSimple, "_", langueConfig.getString(I18n.var_NomVar), "_", langueNom2, " = ", q(classeNomVar), ";");
2256+
tl(1, "public static final String ", langueConfig.getString(I18n.var_NomVar), "_", langueNom2, " = ", q(classeNomVar), ";");
22472257
if(classeApiUri != null)
2248-
tl(1, "public static final String ", classeNomSimple, "_", langueConfig.getString(I18n.var_ApiUri), "_", langueNom2, " = ", q(classeApiUri), ";");
2258+
tl(1, "public static final String ", langueConfig.getString(I18n.var_ApiUri), "_", langueNom2, " = ", q(classeApiUri), ";");
22492259
if(classeApiUriPageRecherche != null)
2250-
tl(1, "public static final String ", classeNomSimple, "_", langueConfig.getString(I18n.var_ApiUri), langueConfig.getString(I18n.var_PageRecherche), "_", langueNom2, " = ", q(classeApiUriPageRecherche), ";");
2260+
tl(1, "public static final String ", langueConfig.getString(I18n.var_ApiUri), langueConfig.getString(I18n.var_PageRecherche), "_", langueNom2, " = ", q(classeApiUriPageRecherche), ";");
22512261
if(classeApiUriPageEdition != null)
2252-
tl(1, "public static final String ", classeNomSimple, "_", langueConfig.getString(I18n.var_ApiUri), langueConfig.getString(I18n.var_PageEdition), "_", langueNom2, " = ", q(classeApiUriPageEdition), ";");
2262+
tl(1, "public static final String ", langueConfig.getString(I18n.var_ApiUri), langueConfig.getString(I18n.var_PageEdition), "_", langueNom2, " = ", q(classeApiUriPageEdition), ";");
22532263

22542264
if(classeDeNom != null)
2255-
tl(1, "public static final String ", classeNomSimple, "_", langueConfig.getString(I18n.var_DeNom), "_", langueNom2, " = ", q(classeDeNom), ";");
2265+
tl(1, "public static final String ", langueConfig.getString(I18n.var_DeNom), "_", langueNom2, " = ", q(classeDeNom), ";");
22562266

22572267
if(classeAdjectif != null)
2258-
tl(1, "public static final String ", classeNomSimple, "_", langueConfig.getString(I18n.var_Adjectif), "_", langueNom2, " = ", q(classeAdjectif), ";");
2268+
tl(1, "public static final String ", langueConfig.getString(I18n.var_Adjectif), "_", langueNom2, " = ", q(classeAdjectif), ";");
22592269

22602270
if(classeAdjectifPluriel != null)
2261-
tl(1, "public static final String ", classeNomSimple, "_", langueConfig.getString(I18n.var_AdjectifPluriel), "_", langueNom2, " = ", q(classeAdjectifPluriel), ";");
2271+
tl(1, "public static final String ", langueConfig.getString(I18n.var_AdjectifPluriel), "_", langueNom2, " = ", q(classeAdjectifPluriel), ";");
22622272

22632273
if(classeAdjectifVar != null)
2264-
tl(1, "public static final String ", classeNomSimple, "_", langueConfig.getString(I18n.var_AdjectifVar), "_", langueNom2, " = ", q(classeAdjectifVar), ";");
2274+
tl(1, "public static final String ", langueConfig.getString(I18n.var_AdjectifVar), "_", langueNom2, " = ", q(classeAdjectifVar), ";");
22652275

22662276
if(classeUnNomAdjectif != null)
2267-
tl(1, "public static final String ", classeNomSimple, "_", langueConfig.getString(I18n.var_UnNomAdjectif), "_", langueNom2, " = ", q(classeUnNomAdjectif), ";");
2277+
tl(1, "public static final String ", langueConfig.getString(I18n.var_UnNomAdjectif), "_", langueNom2, " = ", q(classeUnNomAdjectif), ";");
22682278

22692279
if(classeNomAdjectifSingulier != null)
2270-
tl(1, "public static final String ", classeNomSimple, "_", langueConfig.getString(I18n.var_NomAdjectifSingulier), "_", langueNom2, " = ", q(classeNomAdjectifSingulier), ";");
2280+
tl(1, "public static final String ", langueConfig.getString(I18n.var_NomAdjectifSingulier), "_", langueNom2, " = ", q(classeNomAdjectifSingulier), ";");
22712281

22722282
if(classeNomAdjectifPluriel != null)
2273-
tl(1, "public static final String ", classeNomSimple, "_", langueConfig.getString(I18n.var_NomAdjectifPluriel), "_", langueNom2, " = ", q(classeNomAdjectifPluriel), ";");
2283+
tl(1, "public static final String ", langueConfig.getString(I18n.var_NomAdjectifPluriel), "_", langueNom2, " = ", q(classeNomAdjectifPluriel), ";");
22742284

22752285
List<String> classeApiMethodes = Optional.ofNullable(Optional.ofNullable(doc.getJsonArray("classeApiMethodes_" + langueNom2 + "_stored_strings")).orElse(new JsonArray()).stream().map(v -> (String)v).collect(Collectors.toList())).orElse(Arrays.asList());
22762286
for(String classePageMethode : classeApiMethodes) {
@@ -2294,13 +2304,13 @@ public void genCodeClasseDebut(String langueNom, JsonObject langueConfig) throws
22942304

22952305
l();
22962306
if(classeCouleur != null)
2297-
tl(1, "public static final String ", classeNomSimple, "_", langueConfig.getString(I18n.var_Couleur), " = ", q(classeCouleur), ";");
2307+
tl(1, "public static final String ", langueConfig.getString(I18n.var_Couleur), " = ", q(classeCouleur), ";");
22982308

22992309
if(classeIcone != null)
2300-
tl(1, "public static final String ", classeNomSimple, "_", langueConfig.getString(I18n.var_Icone), " = ", q(classeIcone), ";");
2310+
tl(1, "public static final String ", langueConfig.getString(I18n.var_Icone), " = ", q(classeIcone), ";");
23012311

23022312
if(classeLignes != null)
2303-
tl(1, "public static final Integer ", classeNomSimple, "_", langueConfig.getString(I18n.var_Lignes), " = ", classeLignes, ";");
2313+
tl(1, "public static final Integer ", langueConfig.getString(I18n.var_Lignes), " = ", classeLignes, ";");
23042314
}
23052315

23062316
if(classePage) {
@@ -2959,10 +2969,10 @@ public void genCodeMethode(String langueNom, JsonObject langueConfig) throws Exc
29592969
* r.enUS: entityAttributeCanonicalName
29602970
* r: entiteAttribuerNomSimple
29612971
* r.enUS: entityAttributeSimpleName
2962-
* r: entiteAttribuerVarUrlId
2963-
* r.enUS: entityAttributeVarUrlId
2964-
* r: entiteAttribuerVarUrlPk
2965-
* r.enUS: entityAttributeVarUrlPk
2972+
* r: entiteAttribuerVarUrlPageAffichage
2973+
* r.enUS: entityAttributeVarUrlPageAffichage
2974+
* r: entiteAttribuerVarUrlPageEdition
2975+
* r.enUS: entityAttributeVarUrlPageEdition
29662976
* r: entiteAttribuerVarId
29672977
* r.enUS: entityAttributeVarId
29682978
* r: entiteAttribuerVarTitre
@@ -3215,8 +3225,8 @@ public void genCodeEntite(String langueNom, JsonObject langueConfig) throws Exce
32153225
entiteAttribuerNomSimpleGenApiServiceImpl = doc.getString("entiteAttribuerNomSimpleGenApiServiceImpl_" + langueNom + "_stored_string");
32163226
entiteAttribuerNomSimpleApiServiceImpl = doc.getString("entiteAttribuerNomSimpleApiServiceImpl_" + langueNom + "_stored_string");
32173227
entiteAttribuerVar = doc.getString("entiteAttribuerVar_" + langueNom + "_stored_string");
3218-
entiteAttribuerVarUrlId = doc.getString("entiteAttribuerVarUrlId_" + langueNom + "_stored_string");
3219-
entiteAttribuerVarUrlPk = doc.getString("entiteAttribuerVarUrlPk_" + langueNom + "_stored_string");
3228+
entiteAttribuerVarUrlPageAffichage = doc.getString("entiteAttribuerVarUrlPageAffichage_" + langueNom + "_stored_string");
3229+
entiteAttribuerVarUrlPageEdition = doc.getString("entiteAttribuerVarUrlPageEdition_" + langueNom + "_stored_string");
32203230
entiteAttribuerVarId = doc.getString("entiteAttribuerVarId_" + langueNom + "_stored_string");
32213231
entiteAttribuerVarTitre = doc.getString("entiteAttribuerVarTitre_" + langueNom + "_stored_string");
32223232
entiteAttribuerVarDescription = doc.getString("entiteAttribuerVarDescription_" + langueNom + "_stored_string");
@@ -6247,6 +6257,93 @@ public void genCodeClasseFin(String langueNom, JsonObject langueConfig) throws E
62476257
l();
62486258
s(wNomAffichageStatic);
62496259

6260+
//////////////////
6261+
// idPourClasse //
6262+
//////////////////
6263+
if(classeVarId != null || classeEstModeleBase || classeEstResultatBase) {
6264+
l();
6265+
if(!classeEstBase)
6266+
tl(1, "@Override");
6267+
tl(1, "public String ", langueConfig.getString(I18n.var_id), langueConfig.getString(I18n.var_PourClasse), "() {");
6268+
tl(2, "return ", classeVarId == null ? "null" : classeVarId, ";");
6269+
tl(1, "}");
6270+
}
6271+
6272+
/////////////////////
6273+
// titrePourClasse //
6274+
/////////////////////
6275+
if(classeVarTitre != null || classeEstModeleBase || classeEstResultatBase) {
6276+
l();
6277+
if(!classeEstBase)
6278+
tl(1, "@Override");
6279+
tl(1, "public String ", langueConfig.getString(I18n.var_titre), langueConfig.getString(I18n.var_PourClasse), "() {");
6280+
tl(2, "return ", classeVarTitre == null ? "null" : classeVarTitre, ";");
6281+
tl(1, "}");
6282+
}
6283+
6284+
///////////////////
6285+
// nomPourClasse //
6286+
///////////////////
6287+
if(classeVarNom != null || classeEstModeleBase || classeEstResultatBase) {
6288+
l();
6289+
if(!classeEstBase)
6290+
tl(1, "@Override");
6291+
tl(1, "public String ", langueConfig.getString(I18n.var_nom), langueConfig.getString(I18n.var_PourClasse), "() {");
6292+
tl(2, "return ", classeVarNom == null ? "null" : classeVarNom, ";");
6293+
tl(1, "}");
6294+
}
6295+
6296+
///////////////////
6297+
// classeNomAdjectifSingulierPourClasse //
6298+
///////////////////
6299+
if(classeNomAdjectifSingulier != null || classeEstModeleBase || classeEstResultatBase) {
6300+
l();
6301+
if(!classeEstBase)
6302+
tl(1, "@Override");
6303+
tl(1, "public String ", langueConfig.getString(I18n.var_classeNomAdjectifSingulier), langueConfig.getString(I18n.var_PourClasse), "() {");
6304+
tl(2, "return ", classeNomAdjectifSingulier == null ? "null" : String.format("%s.%s_%s", classeNomSimple, langueConfig.getString(I18n.var_NomAdjectifSingulier), langueNom), ";");
6305+
tl(1, "}");
6306+
}
6307+
6308+
///////////////////////////
6309+
// descriptionPourClasse //
6310+
///////////////////////////
6311+
if(classeVarDescription != null || classeEstModeleBase || classeEstResultatBase) {
6312+
l();
6313+
if(!classeEstBase)
6314+
tl(1, "@Override");
6315+
tl(1, "public String ", langueConfig.getString(I18n.var_description), langueConfig.getString(I18n.var_PourClasse), "() {");
6316+
tl(2, "return ", classeVarDescription == null ? "null" : classeVarDescription, ";");
6317+
tl(1, "}");
6318+
}
6319+
6320+
///////////////////////
6321+
// classePageEdition //
6322+
///////////////////////
6323+
if(classeStringFormatUrlPageEdition != null || classeEstModeleBase || classeEstResultatBase) {
6324+
l();
6325+
if(!classeEstBase)
6326+
tl(1, "@Override");
6327+
tl(1, "public String ", langueConfig.getString(I18n.var_classeStringFormatUrlPageEdition), langueConfig.getString(I18n.var_PourClasse), "() {");
6328+
tl(2, "return ", classeStringFormatUrlPageEdition == null ? "null" : "\"%s" + String.format("%s\"", classeStringFormatUrlPageEdition), ";");
6329+
tl(1, "}");
6330+
}
6331+
6332+
/////////////////////////
6333+
// classePageAffichage //
6334+
/////////////////////////
6335+
if(classeStringFormatUrlPageAffichage != null || classeEstModeleBase || classeEstResultatBase) {
6336+
l();
6337+
if(!classeEstBase)
6338+
tl(1, "@Override");
6339+
tl(1, "public String ", langueConfig.getString(I18n.var_classeStringFormatUrlPageAffichage), langueConfig.getString(I18n.var_PourClasse), "() {");
6340+
tl(2, "return ", classeStringFormatUrlPageAffichage == null ? "null" : "\"%s" + String.format("%s\"", classeStringFormatUrlPageAffichage), ";");
6341+
tl(1, "}");
6342+
}
6343+
6344+
////////////////////////////
6345+
// nomAffichagePourClasse //
6346+
////////////////////////////
62506347
l();
62516348
tl(1, "public static String ", langueConfig.getString(I18n.var_nomAffichage), langueConfig.getString(I18n.var_PourClasse), "(String var) {");
62526349
tl(2, "return ", classeNomSimple, ".", langueConfig.getString(I18n.var_nomAffichage), classeNomSimple, "(var);");

0 commit comments

Comments
 (0)