Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

EMF modeling language fixes #702

Merged
merged 9 commits into from
Sep 29, 2022
Merged

EMF modeling language fixes #702

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
11f768b
Allow languages to stay hidden in the CLI.
tsaglam Sep 29, 2022
642c2e7
Hide dynamic emf language in the CLI and adapt emf CLI arguments to b…
tsaglam Sep 29, 2022
0f1536f
Update README.md
tsaglam Sep 29, 2022
aefc7bf
Adapt language test case to consider hidden languages.
tsaglam Sep 29, 2022
057941d
Replace hidden language with language dependency removal in the CLI m…
tsaglam Sep 29, 2022
5fec802
Adapt language test to accept the hidden EMF language.
tsaglam Sep 29, 2022
1e507c2
Fix issue with persisting tree view files.
tsaglam Sep 29, 2022
5d1cb86
Update README.md
tsaglam Sep 29, 2022
681a2c1
Merge branch 'master' into emf-fixes
tsaglam Sep 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,7 @@ In the following, a list of all supported languages with their supported languag
| [Scala](https://www.scala-lang.org) | 2.13.8 | scala | beta | Scalameta |
| [Scheme](http://www.scheme-reports.org) | ? | scheme | unknown | JavaCC |
| [Swift](https://www.swift.org) | 5.4 | swift | beta | ANTLR 4 |
| [EMF Metamodel](https://www.eclipse.org/modeling/emf/) | 2.25.0 | emf-metamodel | alpha | EMF |
| [EMF Metamodel](https://www.eclipse.org/modeling/emf/) (dynamic) | 2.25.0 | emf-metamodel-dynamic | alpha | EMF |
| [EMF Metamodel](https://www.eclipse.org/modeling/emf/) | 2.25.0 | emf | alpha | EMF |
| Text (naive) | - | text | legacy | CoreNLP |

## Download and Installation
Expand Down Expand Up @@ -67,7 +66,7 @@ named arguments:
-h, --help show this help message and exit
-new NEW [NEW ...] Root-directory with submissions to check for plagiarism (same as the root directory)
-old OLD [OLD ...] Root-directory with prior submissions to compare against
-l {cpp,csharp,emf-metamodel,emf-metamodel-dynamic,go,java,kotlin,python3,rlang,scala,scheme,swift,text}
-l {cpp,csharp,emf,go,java,kotlin,python3,rlang,scala,scheme,swift,text}
Select the language to parse the submissions (default: java)
-bc BC Path of the directory containing the base code (common framework used in all
submissions)
Expand Down
5 changes: 0 additions & 5 deletions cli/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,11 +85,6 @@
<artifactId>emf-metamodel</artifactId>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>de.jplag</groupId>
<artifactId>emf-metamodel-dynamic</artifactId>
<version>${revision}</version>
</dependency>
<!-- CLI -->
<dependency>
<groupId>org.kohsuke.metainf-services</groupId>
Expand Down
2 changes: 1 addition & 1 deletion cli/src/test/java/de/jplag/cli/LanguageTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ void testInvalidLanguage() throws Exception {
@Test
void testLoading() {
var languages = LanguageLoader.getAllAvailableLanguages();
Assertions.assertEquals(13, languages.size(), "Loaded Languages: " + languages.keySet());
Assertions.assertEquals(12, languages.size(), "Loaded Languages: " + languages.keySet());
}

@Test
Expand Down
2 changes: 1 addition & 1 deletion languages/emf-metamodel-dynamic/src/main/java/de/jplag/emf/dynamic/Language.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
@MetaInfServices(de.jplag.Language.class)
public class Language extends de.jplag.emf.Language {
private static final String NAME = "EMF metamodels (dynamically created token set)";
public static final String IDENTIFIER = "emf-metamodel-dynamic";
public static final String IDENTIFIER = "emf-dynamic";

private static final int DEFAULT_MIN_TOKEN_MATCH = 10;

Expand Down
2 changes: 1 addition & 1 deletion languages/emf-metamodel/src/main/java/de/jplag/emf/Language.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public class Language implements de.jplag.Language {
public static final String FILE_ENDING = "." + EcorePackage.eNAME;

private static final String NAME = "EMF metamodel";
public static final String IDENTIFIER = "emf-metamodel";
public static final String IDENTIFIER = "emf";
private static final int DEFAULT_MIN_TOKEN_MATCH = 6;

protected final EcoreParser parser;
Expand Down
2 changes: 1 addition & 1 deletion languages/emf-metamodel/src/main/java/de/jplag/emf/util/MetamodelTreeView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ public MetamodelToken convertToMetadataEnrichedTokenAndAdd(MetamodelToken token,
* @param suffix is the suffix of the file to be written.
*/
public void writeToFile(String suffix) {
File treeViewFile = new File(file, suffix);
File treeViewFile = new File(file + suffix);
try (BufferedWriter writer = new BufferedWriter(new FileWriter(treeViewFile));) {
if (!treeViewFile.createNewFile()) {
logger.warn("Overwriting tree view file: {}", treeViewFile);
Expand Down