Class indexing now loads super class data from dependent projects

computate-org · Dec 15, 2023 · 4196637 · 4196637
1 parent 90e4b00
commit 4196637
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/src/main/java/org/computate/frFR/java/EcrireGenClasse.java b/src/main/java/org/computate/frFR/java/EcrireGenClasse.java
@@ -254,6 +254,7 @@ public class EcrireGenClasse extends EcrireClasse {
 	protected List<String> classeSuperParametreTypeNoms;
 
 	protected List<String> classesSuperEtMoiSansGen;
+	protected List<String> entiteClassesSuperEtMoiSansGen;
 
 	/**
 	 * Var.enUS: classSuperWriteMethods
@@ -3090,7 +3091,7 @@ public void genCodeEntite(String langueNom, YAMLConfiguration langueConfig) thro
 			entiteDefaut = doc.getString("entiteDefaut_stored_string");
 			entiteHtml = doc.getBoolean("entiteHtml_stored_boolean");
 
-			classesSuperEtMoiSansGen = Optional.ofNullable(doc.getJsonArray("classesSuperEtMoiSansGen_stored_strings")).orElse(new JsonArray()).stream().map(v -> (String)v).collect(Collectors.toList());
+			entiteClassesSuperEtMoiSansGen = Optional.ofNullable(doc.getJsonArray("classesSuperEtMoiSansGen_stored_strings")).orElse(new JsonArray()).stream().map(v -> (String)v).collect(Collectors.toList());
 
 			entiteMethodesAvantVisibilite = Optional.ofNullable(doc.getJsonArray("entiteMethodesAvantVisibilite_stored_strings")).orElse(new JsonArray()).stream().map(v -> (String)v).collect(Collectors.toList());
 			entiteMethodesAvantVar = Optional.ofNullable(doc.getJsonArray("entiteMethodesAvantVar_" + langueNom + "_stored_strings")).orElse(new JsonArray()).stream().map(v -> (String)v).collect(Collectors.toList());
@@ -5698,6 +5699,7 @@ public void genCodeClasseFin(String langueNom, YAMLConfiguration langueConfig) t
 			tl(1, "}");
 		}
 
+		LOG.info(String.format("classesSuperEtMoiSansGen: %s", classesSuperEtMoiSansGen));
 		if(classeApi 
 				|| (
 						classePartsModeleBase != null && classesSuperEtMoiSansGen.contains(classePartsModeleBase.nomCanonique(langueNomGlobale))

diff --git a/src/main/java/org/computate/frFR/java/IndexerClasse.java b/src/main/java/org/computate/frFR/java/IndexerClasse.java
@@ -747,6 +747,7 @@ public void peuplerClassesSuperQdoxInterfacesEtMoi(
 						peuplerClassesSuperQdoxInterfacesEtMoi(classeSuper, classesSuperQdox, classesSuperQdoxEtMoi, classesSuperQdoxEtMoiSansGen, classesSuperQdoxEtInterfaces, classesSuperQdoxInterfacesEtMoi, classeSuperDoc);
 					} else {
 						List<String> classesSuperEtMoiSansGen = Optional.ofNullable(classeSuperDoc.getFieldValues("classesSuperEtMoiSansGen_stored_strings")).orElse(Arrays.asList()).stream().map(v -> (String)v).collect(Collectors.toList());
+						LOG.info(String.format("classesSuperEtMoiSansGen: %s", classesSuperEtMoiSansGen));
 						for(String classeSuperNomCanonique: classesSuperEtMoiSansGen) {
 							JavaClass classeSuperActuel = bricoleur.getClassByName(classeSuperNomCanonique);
 							classesSuperQdoxEtMoiSansGen.add(classeSuperActuel);