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

Jump to bottom

Task 54 port to xtext 2.20 #55

Merged
merged 8 commits into from
Dec 11, 2019
Merged

Task 54 port to xtext 2.20 #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b0de1f8
54: Switch to Xtext 2.20
LorenzoBettini Dec 11, 2019
cd9fb2c
54: objectweb.asm 7.2.0
LorenzoBettini Dec 11, 2019
a7d1ff6
54: Tycho 1.5.1
LorenzoBettini Dec 11, 2019
dd6abec
54: mwe.core optional in edelta.tests
LorenzoBettini Dec 11, 2019
bc1863a
54: use projectWizard in MWE2
LorenzoBettini Dec 11, 2019
c8e9096
54: removed old wizard initial contents
LorenzoBettini Dec 11, 2019
ea6b448
54: Sonar and JaCoCo exclusions for new project wizard
LorenzoBettini Dec 11, 2019
3464f71
54: Sonar and JaCoCo exclusions for HelloWorldProject
LorenzoBettini Dec 11, 2019
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
4 changes: 2 additions & 2 deletions edelta.parent/edelta.feature/feature.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
provider-name="Lorenzo Bettini">

<requires>
<import feature="org.eclipse.xtext.xbase" version="2.19.0" match="equivalent"/>
<import feature="org.eclipse.xtext.ui" version="2.19.0" match="equivalent"/>
<import feature="org.eclipse.xtext.xbase" version="2.20.0" match="equivalent"/>
<import feature="org.eclipse.xtext.ui" version="2.20.0" match="equivalent"/>
<import plugin="org.eclipse.pde.ui"/>
</requires>

Expand Down
4 changes: 2 additions & 2 deletions edelta.parent/edelta.target/edelta.target.target
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.emf.mwe2.launcher.feature.group" version="0.0.0"/>
<repository location="https://download.eclipse.org/modeling/emft/mwe/updates/releases/2.11.0/"/>
<repository location="https://download.eclipse.org/modeling/emft/mwe/updates/releases/2.11.1/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
<repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.19.0/"/>
<repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.20.0/"/>
</location>
</locations>
</target>
4 changes: 2 additions & 2 deletions edelta.parent/edelta.tests.parent/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@
<exclude>**/**ExecutableExtensionFactory.class</exclude>
<exclude>**/*Abstract*ProposalProvider.class</exclude>
<exclude>**/internal/*.class</exclude>
<exclude>**/*NewProjectWizard.class</exclude>
<exclude>**/*ProjectCreator.class</exclude>
<exclude>**/*ProjectTemplateProvider.class</exclude>
<exclude>**/HelloWorldProject.class</exclude>
</excludes>
</configuration>
<executions>
Expand Down
5 changes: 3 additions & 2 deletions edelta.parent/edelta.tests/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,16 @@ Require-Bundle: edelta,
edelta.testutils,
org.junit;bundle-version="4.7.0",
org.eclipse.xtext.xbase.lib;bundle-version="2.13.0",
org.objectweb.asm;bundle-version="[7.1.0,7.2.0)";resolution:=optional,
org.objectweb.asm;bundle-version="[7.2.0,7.3.0)";resolution:=optional,
org.eclipse.xtext.ecore,
org.eclipse.jdt.core,
org.eclipse.xtext.testing,
org.eclipse.xtext.xbase.testing,
edelta.refactorings.lib,
org.mockito;bundle-version="2.23.0",
net.bytebuddy.byte-buddy;bundle-version="1.9.0",
org.objenesis;bundle-version="2.6.0"
org.objenesis;bundle-version="2.6.0",
org.eclipse.emf.mwe.core;bundle-version="[1.0.0,2.0.0)";resolution:=optional
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Export-Package: edelta.tests;x-internal=true
Import-Package: org.hamcrest.core,
Expand Down
13 changes: 2 additions & 11 deletions edelta.parent/edelta.ui.tests/src/edelta/ui/tests/utils/EdeltaTestableNewProjectWizard.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,26 +4,17 @@
package edelta.ui.tests.utils;

import org.eclipse.xtext.ui.wizard.IExtendedProjectInfo;
import org.eclipse.xtext.ui.wizard.IProjectCreator;

import com.google.inject.Inject;

import edelta.ui.wizard.EdeltaNewProjectWizard;
import org.eclipse.xtext.ui.wizard.template.TemplateNewProjectWizard;

/**
* Manually set the project name (usually set in the dialog text edit)
*
* @author Lorenzo Bettini
*/
public class EdeltaTestableNewProjectWizard extends EdeltaNewProjectWizard {
public class EdeltaTestableNewProjectWizard extends TemplateNewProjectWizard {

public static final String TEST_PROJECT = "TestProject";

@Inject
public EdeltaTestableNewProjectWizard(IProjectCreator projectCreator) {
super(projectCreator);
}

@Override
public IExtendedProjectInfo getProjectInfo() {
IExtendedProjectInfo projectInfo = super.getProjectInfo();
Expand Down
5 changes: 4 additions & 1 deletion edelta.parent/edelta.ui/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,10 @@ Require-Bundle: edelta,
org.eclipse.xtext.builder,
org.eclipse.jdt.debug.ui,
org.eclipse.core.runtime,
org.eclipse.core.resources
org.eclipse.core.resources,
org.eclipse.jdt.core,
org.eclipse.pde.core,
org.eclipse.ui.forms
Import-Package: org.apache.log4j
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Export-Package: edelta.ui.contentassist,
Expand Down
Binary file added edelta.parent/edelta.ui/icons/new_Edelta_proj.gif
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed edelta.parent/edelta.ui/icons/newpprj_wiz.png
View file
Open in desktop
Binary file not shown.
Binary file added edelta.parent/edelta.ui/icons/project_template.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
34 changes: 24 additions & 10 deletions edelta.parent/edelta.ui/plugin.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -605,17 +605,31 @@
</extension>
<extension
point="org.eclipse.ui.newWizards">
<category id="edelta.ui.category" name="Edelta">
</category>
<wizard
category="edelta.ui.category"
class="edelta.ui.EdeltaExecutableExtensionFactory:edelta.ui.wizard.EdeltaNewProjectWizard"
icon="icons/newpprj_wiz.png"
id="edelta.ui.wizard.EdeltaNewProjectWizard"
name="Edelta Project"
project="true">
category="edelta.ui.category"
class="edelta.ui.EdeltaExecutableExtensionFactory:org.eclipse.xtext.ui.wizard.template.TemplateNewProjectWizard"
id="edelta.ui.wizard.EdeltaNewProjectWizard"
name="Edelta Project"
icon="icons/new_Edelta_proj.gif"
project="true">
</wizard>
<category
id="edelta.ui.category"
name="Edelta">
</category>
</extension>
<extension
point="org.eclipse.xtext.ui.projectTemplate">
<projectTemplateProvider
class="edelta.ui.EdeltaExecutableExtensionFactory:edelta.ui.wizard.EdeltaProjectTemplateProvider"
grammarName="edelta.Edelta">
</projectTemplateProvider>
</extension>
<extension
point="org.eclipse.ui.perspectiveExtensions">
<perspectiveExtension targetID="org.eclipse.ui.resourcePerspective">
<newWizardShortcut id="edelta.ui.wizard.EdeltaNewProjectWizard"/>
</perspectiveExtension>
<perspectiveExtension targetID="org.eclipse.jdt.ui.JavaPerspective">
<newWizardShortcut id="edelta.ui.wizard.EdeltaNewProjectWizard"/>
</perspectiveExtension>
</extension>
</plugin>
25 changes: 22 additions & 3 deletions edelta.parent/edelta.ui/plugin.xml_gen
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -605,12 +605,31 @@
</extension>
<extension
point="org.eclipse.ui.newWizards">
<category id="edelta.ui.category" name="Edelta">
</category>
<wizard
category="org.eclipse.xtext.projectwiz"
class="edelta.ui.EdeltaExecutableExtensionFactory:edelta.ui.wizard.EdeltaNewProjectWizard"
category="edelta.ui.category"
class="edelta.ui.EdeltaExecutableExtensionFactory:org.eclipse.xtext.ui.wizard.template.TemplateNewProjectWizard"
id="edelta.ui.wizard.EdeltaNewProjectWizard"
name="Edelta Project"
project="true">
icon="icons/new_Edelta_proj.gif"
project="true">
</wizard>
</extension>
<extension
point="org.eclipse.xtext.ui.projectTemplate">
<projectTemplateProvider
class="edelta.ui.EdeltaExecutableExtensionFactory:edelta.ui.wizard.EdeltaProjectTemplateProvider"
grammarName="edelta.Edelta">
</projectTemplateProvider>
</extension>
<extension
point="org.eclipse.ui.perspectiveExtensions">
<perspectiveExtension targetID="org.eclipse.ui.resourcePerspective">
<newWizardShortcut id="edelta.ui.wizard.EdeltaNewProjectWizard"/>
</perspectiveExtension>
<perspectiveExtension targetID="org.eclipse.jdt.ui.JavaPerspective">
<newWizardShortcut id="edelta.ui.wizard.EdeltaNewProjectWizard"/>
</perspectiveExtension>
</extension>
</plugin>
5 changes: 0 additions & 5 deletions edelta.parent/edelta.ui/src/edelta/ui/EdeltaUiModule.xtend
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package edelta.ui

import edelta.ui.wizard.EdeltaProjectCreatorCustom
import org.eclipse.xtend.lib.annotations.FinalFieldsConstructor

/**
Expand All @@ -9,8 +8,4 @@ import org.eclipse.xtend.lib.annotations.FinalFieldsConstructor
@FinalFieldsConstructor
class EdeltaUiModule extends AbstractEdeltaUiModule {

override bindIProjectCreator() {
EdeltaProjectCreatorCustom
}

}
127 changes: 0 additions & 127 deletions edelta.parent/edelta.ui/src/edelta/ui/wizard/EdeltaNewProjectWizardInitialContents.xtend
View file
Open in desktop

This file was deleted.

29 changes: 0 additions & 29 deletions edelta.parent/edelta.ui/src/edelta/ui/wizard/EdeltaProjectCreatorCustom.java
View file
Open in desktop

This file was deleted.

10 changes: 0 additions & 10 deletions edelta.parent/edelta.ui/src/edelta/ui/wizard/EdeltaProjectInfo.java
View file
Open in desktop

This file was deleted.

Loading