Added generated file name to output of a generation.

eclipse-acceleo · Mar 27, 2024 · 5c19ae4 · 5c19ae4
1 parent 3c3361e
commit 5c19ae4
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 5 deletions.
diff --git a/...eleo.aql.ide.ui/src-module/org/eclipse/acceleo/aql/ide/ui/module/files/standaloneMain.mtl b/...eleo.aql.ide.ui/src-module/org/eclipse/acceleo/aql/ide/ui/module/files/standaloneMain.mtl
@@ -395,7 +395,14 @@
 
     	protected IAcceleoGenerationStrategy createGenerationStrategy(final ResourceSet resourceSetForModels) {
     		final IAcceleoGenerationStrategy strategy = new DefaultGenerationStrategy(resourceSetForModels
-    				.getURIConverter(), new DefaultWriterFactory());
+    				.getURIConverter(), new DefaultWriterFactory()) {
+    			@Override
+    			public IAcceleoWriter createWriterFor(URI uri, OpenModeKind openMode, Charset charset,
+    					String lineDelimiter) throws IOException {
+    				System.out.println(uri.toString());
+    				return super.createWriterFor(uri, openMode, charset, lineDelimiter);
+    			}
+    		};
 
     		return strategy;
     	}

diff --git a/...rg.eclipse.acceleo.aql.launcher/src/org/eclipse/acceleo/aql/launcher/AcceleoLauncher.java b/...rg.eclipse.acceleo.aql.launcher/src/org/eclipse/acceleo/aql/launcher/AcceleoLauncher.java
@@ -11,19 +11,23 @@
 package org.eclipse.acceleo.aql.launcher;
 
 import java.io.File;
+import java.io.IOException;
 import java.io.PrintStream;
+import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
 import org.eclipse.acceleo.Module;
+import org.eclipse.acceleo.OpenModeKind;
 import org.eclipse.acceleo.aql.AcceleoUtil;
 import org.eclipse.acceleo.aql.evaluation.AcceleoEvaluator;
 import org.eclipse.acceleo.aql.evaluation.GenerationResult;
 import org.eclipse.acceleo.aql.evaluation.strategy.DefaultGenerationStrategy;
 import org.eclipse.acceleo.aql.evaluation.strategy.IAcceleoGenerationStrategy;
+import org.eclipse.acceleo.aql.evaluation.writer.IAcceleoWriter;
 import org.eclipse.acceleo.aql.ide.evaluation.strategy.AcceleoWorkspaceWriterFactory;
 import org.eclipse.acceleo.aql.parser.AcceleoParser;
 import org.eclipse.acceleo.aql.parser.ModuleLoader;
@@ -234,7 +238,6 @@ private List<URI> convertToURIs(CmdLineParser parser, String... paths) throws Cm
 	}
 
 	private GenerationResult launchGeneration() {
-
 		IQualifiedNameResolver resolver = new OSGiQualifiedNameResolver(bundle,
 				AcceleoParser.QUALIFIER_SEPARATOR);
 
@@ -278,7 +281,14 @@ private GenerationResult launchGeneration() {
 	private void evaluate(AcceleoEvaluator evaluator, IQualifiedNameQueryEnvironment queryEnvironment,
 			Module mainModule, ResourceSet modelResourceSet, URI targetURI, URI logURI) {
 		final IAcceleoGenerationStrategy strategy = new DefaultGenerationStrategy(modelResourceSet
-				.getURIConverter(), new AcceleoWorkspaceWriterFactory());
+				.getURIConverter(), new AcceleoWorkspaceWriterFactory()) {
+			@Override
+			public IAcceleoWriter createWriterFor(URI uri, OpenModeKind openMode, Charset charset,
+					String lineDelimiter) throws IOException {
+				System.out.println(uri);
+				return super.createWriterFor(uri, openMode, charset, lineDelimiter);
+			}
+		};
 		AcceleoUtil.generate(evaluator, queryEnvironment, mainModule, modelResourceSet, strategy, targetURI,
 				logURI);
 	}

diff --git a/...rg.eclipse.acceleo.aql.ls.debug/src/org/eclipse/acceleo/aql/ls/debug/AcceleoDebugger.java b/...rg.eclipse.acceleo.aql.ls.debug/src/org/eclipse/acceleo/aql/ls/debug/AcceleoDebugger.java
@@ -17,20 +17,23 @@
 import java.io.PrintStream;
 import java.lang.reflect.Type;
 import java.net.URISyntaxException;
+import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
 import org.eclipse.acceleo.AcceleoASTNode;
 import org.eclipse.acceleo.Expression;
 import org.eclipse.acceleo.Module;
+import org.eclipse.acceleo.OpenModeKind;
 import org.eclipse.acceleo.Query;
 import org.eclipse.acceleo.Statement;
 import org.eclipse.acceleo.Template;
 import org.eclipse.acceleo.aql.AcceleoUtil;
 import org.eclipse.acceleo.aql.evaluation.AcceleoEvaluator;
 import org.eclipse.acceleo.aql.evaluation.strategy.DefaultGenerationStrategy;
 import org.eclipse.acceleo.aql.evaluation.strategy.IAcceleoGenerationStrategy;
+import org.eclipse.acceleo.aql.evaluation.writer.IAcceleoWriter;
 import org.eclipse.acceleo.aql.ide.AcceleoPlugin;
 import org.eclipse.acceleo.aql.ide.evaluation.strategy.AcceleoWorkspaceWriterFactory;
 import org.eclipse.acceleo.aql.parser.AcceleoAstResult;
@@ -100,7 +103,14 @@ public void run() {
 							AcceleoParser.QUALIFIER_SEPARATOR, false));
 
 					final IAcceleoGenerationStrategy strategy = new DefaultGenerationStrategy(model
-							.getResourceSet().getURIConverter(), new AcceleoWorkspaceWriterFactory());
+							.getResourceSet().getURIConverter(), new AcceleoWorkspaceWriterFactory()) {
+						@Override
+						public IAcceleoWriter createWriterFor(URI uri, OpenModeKind openMode, Charset charset,
+								String lineDelimiter) throws IOException {
+							consolePrint(uri.toString());
+							return super.createWriterFor(uri, openMode, charset, lineDelimiter);
+						}
+					};
 					AcceleoUtil.generate(evaluator, queryEnvironment, module, model, strategy,
 							getDestination(), logURI);
 					if (evaluator.getGenerationResult().getDiagnostic().getSeverity() != Diagnostic.OK) {
@@ -387,7 +397,14 @@ protected void generateNoDebug(IQualifiedNameQueryEnvironment environment, Modul
 				false));
 
 		final IAcceleoGenerationStrategy strategy = new DefaultGenerationStrategy(modelResource
-				.getResourceSet().getURIConverter(), new AcceleoWorkspaceWriterFactory());
+				.getResourceSet().getURIConverter(), new AcceleoWorkspaceWriterFactory()) {
+			@Override
+			public IAcceleoWriter createWriterFor(URI uri, OpenModeKind openMode, Charset charset,
+					String lineDelimiter) throws IOException {
+				consolePrint(uri.toString());
+				return super.createWriterFor(uri, openMode, charset, lineDelimiter);
+			}
+		};
 		AcceleoUtil.generate(noDebugEvaluator, environment, module, modelResource, strategy, getDestination(),
 				logURI);
 		if (noDebugEvaluator.getGenerationResult().getDiagnostic().getSeverity() != Diagnostic.OK) {