Skip to content

Changes to bring in new options and to support GenModel and generics amont other #6

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

Merged
abelhegedus merged 6 commits into from
Feb 10, 2017
Merged

Changes to bring in new options and to support GenModel and generics amont other #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0fed845
Adjusted java version
castortech Feb 8, 2017
6192db4
Removed dependency on UI to allow command line application not to be
castortech Feb 8, 2017
f3368f0
Added support to select genmodel and not only ecore from the UI to
castortech Feb 8, 2017
11144e4
Added support for new options in running documentation application and
castortech Feb 8, 2017
463ba79
Full refactoring of gen doc to support many options and the ability to
castortech Feb 8, 2017
5c47542
Removed unused dependency to commons.io
castortech Feb 9, 2017
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
16 changes: 8 additions & 8 deletions plugins/ecoredocgen.incquery/.classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src/"/>
<classpathentry kind="src" path="src-gen/"/>
<classpathentry kind="output" path="bin"/>
</classpath>
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src/"/>
<classpathentry kind="src" path="src-gen/"/>
<classpathentry kind="output" path="bin"/>
</classpath>
2 changes: 1 addition & 1 deletion plugins/hu.bme.mit.documentation.ecore.ui/.classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
Expand Down
6 changes: 3 additions & 3 deletions plugins/hu.bme.mit.documentation.ecore.ui/.settings/org.eclipse.jdt.core.prefs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
org.eclipse.jdt.core.compiler.compliance=1.6
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.source=1.6
org.eclipse.jdt.core.compiler.source=1.8
2 changes: 1 addition & 1 deletion plugins/hu.bme.mit.documentation.ecore.ui/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime;bundle-version="3.7.0",
org.eclipse.core.resources;bundle-version="3.7.101"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-Vendor: Budapest University of Technology and Economics, Fault Tolerant Systems Research Group
Export-Package: hu.bme.mit.documentation.ecore.ui.handlers
14 changes: 10 additions & 4 deletions plugins/hu.bme.mit.documentation.ecore.ui/plugin.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,16 @@
ifEmpty="false">
<adapt
type="org.eclipse.core.resources.IFile">
<test
property="org.eclipse.core.resources.name"
value="*.ecore">
</test>
<or>
<test
property="org.eclipse.core.resources.name"
value="*.ecore">
</test>
<test
property="org.eclipse.core.resources.name"
value="*.genmodel">
</test>
</or>
</adapt>
</iterate>
</with>
Expand Down
22 changes: 10 additions & 12 deletions ...ion.ecore.ui/src/hu/bme/mit/documentation/ecore/ui/handlers/AbstractGenerateEcoreDoc.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
import hu.bme.mit.documentation.generator.ecore.UtilDocGenerator;

import java.io.File;
import java.io.IOException;

import org.eclipse.core.commands.AbstractHandler;
import org.eclipse.core.commands.ExecutionEvent;
Expand All @@ -32,22 +33,15 @@
*
*/
public abstract class AbstractGenerateEcoreDoc extends AbstractHandler {

/*
* (non-Javadoc)
*
* @see org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands. ExecutionEvent)
*/
@Override
public Object execute(ExecutionEvent event) throws ExecutionException {
ISelection selection = HandlerUtil.getCurrentSelection(event);

if (selection instanceof IStructuredSelection) {

for (Object element : ((IStructuredSelection) selection).toList()) {
if (element instanceof IFile) {
IFile file = (IFile) element;
if(file.getFileExtension().equals("ecore")){
if(file.getFileExtension().equals("ecore") || file.getFileExtension().equals("genmodel")){
URI ecoreURI = URI.createPlatformResourceURI(file.getFullPath().toString(), true);

String ecoreFileName = file.getName().substring(0,file.getName().indexOf("."));
Expand All @@ -67,10 +61,14 @@ public Object execute(ExecutionEvent event) throws ExecutionException {
filterFile = folder.getFile(filterFileName);
}
IDocGenerator docGen = getCodeGenerator();
UtilDocGenerator.generateDocForEPackage(ecoreURI,
new File(outFile.getLocationURI()),
new File(filterFile.getLocationURI()),
docGen);
try {
UtilDocGenerator.generateDocForModel(ecoreURI,
new File(outFile.getLocationURI()),
new File(filterFile.getLocationURI()),
docGen);
} catch (IOException e) {
throw new ExecutionException("Generation Exception", e);
}
}
}
}
Expand Down
2 changes: 0 additions & 2 deletions ...ntation.ecore.ui/src/hu/bme/mit/documentation/ecore/ui/handlers/GenerateEcoreDocHTML.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
*
*/
public class GenerateEcoreDocHTML extends AbstractGenerateEcoreDoc {

@Override
protected IDocGenerator getCodeGenerator() {
return new EPackageDocGenHtml();
Expand All @@ -21,5 +20,4 @@ protected IDocGenerator getCodeGenerator() {
protected String getFileExtension() {
return "html";
}

}
1 change: 0 additions & 1 deletion ...tation.ecore.ui/src/hu/bme/mit/documentation/ecore/ui/handlers/GenerateEcoreDocLatex.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
*
*/
public class GenerateEcoreDocLatex extends AbstractGenerateEcoreDoc {

@Override
protected IDocGenerator getCodeGenerator() {
return new EPackageDocGen();
Expand Down
2 changes: 1 addition & 1 deletion plugins/hu.bme.mit.documentation.ecore/.classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="xtend-gen"/>
<classpathentry kind="src" path="src/"/>
Expand Down
6 changes: 3 additions & 3 deletions plugins/hu.bme.mit.documentation.ecore/.settings/org.eclipse.jdt.core.prefs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
org.eclipse.jdt.core.compiler.compliance=1.6
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.source=1.6
org.eclipse.jdt.core.compiler.source=1.8
6 changes: 4 additions & 2 deletions plugins/hu.bme.mit.documentation.ecore/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,10 @@ Export-Package: hu.bme.mit.documentation.generator.ecore
Require-Bundle: org.eclipse.xtext.xbase.lib,
org.apache.log4j;bundle-version="1.2.0",
org.eclipse.emf.ecore.xmi;bundle-version="2.7.0",
hu.qgears.documentation;bundle-version="1.0.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
hu.qgears.documentation;bundle-version="1.0.0",
org.eclipse.emf.codegen.ecore,
org.eclipse.emf.ecore
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-Vendor: Budapest University of Technology and Economics, Fault Tolerant Systems Research Group
Bundle-ClassPath: lib/markdownpapers-core-1.2.7.jar,
.
Expand Down
Loading