Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTristan FAURE2016-10-10 15:42:52 +0000
committerTristan FAURE2016-10-10 15:42:52 +0000
commitb1987f685b3e64b06d63cf09c7e620f6ad936aa9 (patch)
treefe04c2fda12bc60018ec585e2f8d9d565ab88e06
parenta82dd1bc26991f7d5030cb3a4486de28047d169b (diff)
downloadorg.eclipse.gendoc-refs/for/master.tar.gz
org.eclipse.gendoc-refs/for/master.tar.xz
org.eclipse.gendoc-refs/for/master.zip
Bug 501477 : replace variables in Include Tagrefs/for/master
Change-Id: I0000000000000000000000000000000000000 Signed-off-by: Tristan FAURE <faure.tristan@gmail.com>
-rw-r--r--plugins/org.eclipse.gendoc.tags.handlers/src/org/eclipse/gendoc/tags/handlers/impl/scripts/IncludeTagHandler.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/plugins/org.eclipse.gendoc.tags.handlers/src/org/eclipse/gendoc/tags/handlers/impl/scripts/IncludeTagHandler.java b/plugins/org.eclipse.gendoc.tags.handlers/src/org/eclipse/gendoc/tags/handlers/impl/scripts/IncludeTagHandler.java
index 9640cf1..9c2b8ec 100644
--- a/plugins/org.eclipse.gendoc.tags.handlers/src/org/eclipse/gendoc/tags/handlers/impl/scripts/IncludeTagHandler.java
+++ b/plugins/org.eclipse.gendoc.tags.handlers/src/org/eclipse/gendoc/tags/handlers/impl/scripts/IncludeTagHandler.java
@@ -17,6 +17,7 @@ import org.eclipse.gendoc.documents.IDocumentService;
import org.eclipse.gendoc.services.GendocServices;
import org.eclipse.gendoc.services.exception.GenDocException;
import org.eclipse.gendoc.tags.ITag;
+import org.eclipse.gendoc.tags.handlers.IConfigurationService;
import org.eclipse.gendoc.tags.handlers.AbstractPrePostTagHandler;
import org.eclipse.gendoc.tags.handlers.impl.RegisteredTags;
@@ -32,6 +33,8 @@ public class IncludeTagHandler extends AbstractPrePostTagHandler {
String result = super.doRun(tag);
if ((tag != null) && (tag.getAttributes() != null)) {
String filePath = tag.getAttributes().get(RegisteredTags.INCLUDE_FILE_PATH);
+ IConfigurationService configService = GendocServices.getDefault().getService(IConfigurationService.class);
+ filePath = configService.replaceParameters(filePath);
IDocumentService documentService = GendocServices.getDefault().getService(IDocumentService.class);
String id = documentService.getAdditionalResourceService().includeFile(filePath);
String output = "&lt;drop/&gt;</w:p><w:altChunk xmlns:r=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships\" r:id=\"" + id + "\" />";

Back to the top