Skip to content

Commit 034733e

Browse files
authored
Merge pull request #11 from entityc/bobgarner/new-command-line
Bobgarner/new command line
2 parents be59db5 + 0a47194 commit 034733e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+2201
-943
lines changed

docs/emc/EMC_config.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -422,9 +422,9 @@ The following properties and methods are available for this class:
422422

423423
<hr/>
424424

425-
#### `String` **`directoryName`**
425+
#### `String` **`directoryPath`**
426426

427-
Returns the directory name if available. Otherwise returns `null`
427+
Returns the directory path if available. Otherwise returns `null`
428428

429429
<hr/>
430430

pom.xml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,16 @@
7474
</descriptorRefs>
7575
</configuration>
7676
</plugin>
77+
<plugin>
78+
<groupId>org.apache.maven.plugins</groupId>
79+
<artifactId>maven-compiler-plugin</artifactId>
80+
<version>3.8.1</version>
81+
<configuration>
82+
<compilerArgs>
83+
<arg>-parameters</arg>
84+
</compilerArgs>
85+
</configuration>
86+
</plugin>
7787
</plugins>
7888
</build>
7989
<dependencies>

src/main/java/org/entityc/compiler/ASTVisitor.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2264,6 +2264,7 @@ public Object visitTemplates(EntityLanguageParser.TemplatesContext ctx) {
22642264
MTRepositoryImport thisImport = new MTRepositoryImport(ctx.templatesBody().templatesImport(), false);
22652265
thisImport.setRepositoryName(repositoryImport.getRepositoryName());
22662266
thisImport.setFilename(template.getFilename());
2267+
thisImport.setDirectoryPath(template.getDirectoryPath());
22672268
template.setRepositoryImport(thisImport);
22682269
}
22692270
}
@@ -2283,7 +2284,7 @@ public MTTemplate visitTemplate(EntityLanguageParser.TemplateContext ctx) {
22832284
MTTemplate template = new MTTemplate(ctx, currentConfiguration, ctx.id().getText());
22842285

22852286
if (ctx.STRING() != null) {
2286-
template.setDirectoryName(ECStringUtil.ProcessParserString(ctx.STRING().getText()));
2287+
template.setDirectoryPath(ECStringUtil.ProcessParserString(ctx.STRING().getText()));
22872288
}
22882289
EntityLanguageParser.TemplateBodyContext body = ctx.templateBody();
22892290
if (body == null) {

src/main/java/org/entityc/compiler/CommandLineParser.java

Lines changed: 0 additions & 192 deletions
This file was deleted.

0 commit comments

Comments
 (0)