Commit graph

166 commits

Author SHA1 Message Date
Sebastian Zarnekow
09c3ceac85 Make bin/main also the default output directory to avoid buildship confusion 2019-02-10 14:55:03 +01:00
Karsten Thoms
98a17c35da [eclipse/xtext#1274] Updated .classpath by Gradle
Changes done by Buildship 3.0.1.v20181217-1554

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2019-02-07 17:03:45 +01:00
Arne Deutsch
8d34e55e11 #1018 Maintain existing formatting.
To avoid reformatting we maintain the separators (e.g. line breaks) with
the entries (e.g. inside the required bundles entry).

Signed-off-by: Arne Deutsch <Arne.Deutsch@itemis.de>
2019-02-07 12:23:49 +01:00
Christian Dietrich
640e11f60c [eclipse/xtext#1391] pin guava version to 21
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2019-02-04 11:48:42 +01:00
Christian Dietrich
63e99b9e11 [eclipse/xtext#1283] update to MWE 2.10 M2
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2019-01-30 07:07:46 +01:00
Karsten Thoms
3017efb3f6 [#1009] Remove managed dependencies from build descriptors
- removed managed versions of
  - org.eclipse.emf.mwe2.launch
  - xtext-antlr-generator
  - org.junit:junit
  - org.junit.jupiter.api
  - xtext-dev-bom
- updated test expectation
- GradleBuildFile: Use single quoted dependencies for managed
dependencies (where version is null)
- added xtext-antlr-generator as optional dependency to Maven runtime
module. This avoids download of antlr-generator-3.2.0-patch.jar from
itemis server.
- XtextVersion: pin xtext-antlr-version to 2.1.1. Still needed for Tycho
based build for configuration of exec-maven-plugin.

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2019-01-29 15:33:09 +01:00
Christian Dietrich
e654364f73 [eclipse/xtext#1182] added support for java 11 as target
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2019-01-22 21:55:07 +01:00
Sebastian Zarnekow
ecc7ae0bc3
[eclipse/xtext#1249] use bom for version management (#988) 2019-01-11 16:41:50 +01:00
Christian Dietrich
1b4f6c78a4 change version 2.16.0 -> 2.17.0
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2018-12-05 09:48:47 +01:00
Titouan Vervack
818e1c00d4 Fixed typos in javadoc
Signed-off-by: Titouan Vervack <titouan.vervack@sigasi.com>
2018-11-26 20:01:30 +01:00
Titouan Vervack
51df51946f Wrap CancelableUnitOfWork in a CancelableUnitOfWork instead of a lambda
Signed-off-by: Titouan Vervack <titouan.vervack@sigasi.com>
2018-11-21 15:29:59 +01:00
Arne Deutsch
66fd1cabbc #953: Support setting of entries with attributes.
- Added test cases to cover setting of entries that have other
attributes then version alone.
- Fix MergeableManifest to support given test cases.
- Refactor existing test cases a bit to avoid uneccessary
"Collections.singleton"

Signed-off-by: Arne Deutsch <Arne.Deutsch@itemis.de>
2018-11-19 11:38:29 +01:00
Sebastian Zarnekow
87d26da6e8 Incorporate review feedback 2018-11-09 16:51:07 +01:00
Sebastian Zarnekow
e8850a77ec Cleanup some warnings 2018-11-09 15:59:28 +01:00
Sebastian Zarnekow
65371722ba Minor improvements to isHex 2018-11-09 11:14:32 +01:00
Sebastian Zarnekow
5ddfcadce9 Improved JavaStringConverter after heavy benchmark session 2018-11-09 11:14:32 +01:00
Sebastian Zarnekow
fa00a330ac Base the STRINGValueConverter on the reusable new JavaStringConverter 2018-11-09 11:14:32 +01:00
Sebastian Zarnekow
09ee0502c4 Make JavaStringConverter even easier to reuse 2018-11-09 11:14:32 +01:00
Sebastian Zarnekow
868447b18b Fix regression 2018-11-09 11:14:31 +01:00
Sebastian Zarnekow
965e055537 Made implementation easier to reuse 2018-11-09 11:14:31 +01:00
Christian Dietrich
fb271c39a0 Updated xtext-gradle-plugin to 2.0.2
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2018-10-30 13:59:29 +01:00
Arne Deutsch
4c983ade43 #918: Fix MergeableManifest2 and add missing unit tests
Signed-off-by: Arne Deutsch <Arne.Deutsch@itemis.de>
2018-10-19 14:02:39 +02:00
Arne Deutsch
5e5dc014eb #864: Rewrite MergeableManifest to MergeableManifest2 to avoid refl.
Adding extensive unit tests to ensure behavior does not change.
Use only MergeableManifest2 internally.

Signed-off-by: Arne Deutsch <Arne.Deutsch@itemis.de>
2018-10-17 16:48:32 +02:00
Christian Dietrich
ac598a676d fixed javadoc
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2018-10-12 21:44:12 +02:00
Karsten Thoms
bb85fe78c5 [539677] getValue should return null for null arg
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2018-10-01 10:34:24 +02:00
Karsten Thoms
2b7e2b4609 [eclipse/xtext#1272] Compile with Xtend 2.15
Order of static & final modifiers changed
(eclipse/xtext-xtend#554)

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2018-09-21 17:45:41 +02:00
Sebastian Zarnekow
ac40983dc2 Removed copied code from Strings.java 2018-09-15 21:28:31 +02:00
Christian Dietrich
cc2c4fbc54 restored old state for MergableManifest
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2018-09-11 10:27:01 +02:00
Christian Dietrich
2f0f093fb5 updated versions to 2.16.0
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2018-09-03 11:11:51 +02:00
Christian Dietrich
543560cfa6 [eclipse/xtext-core#828] Use the newest version of xtext-gradle-plugin: 2.0.1
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2018-08-23 21:49:19 +02:00
Christian Dietrich
05a9483b3c fixed broken javadoc
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2018-07-23 13:30:58 +02:00
Titouan Vervack
528de63088 Added an extra api call that omits the default result
Signed-off-by: Titouan Vervack <titouan.vervack@sigasi.com>
2018-06-11 11:08:40 +02:00
Titouan Vervack
63c4439ad4 Reduced "potential null pointer access" errors
Signed-off-by: Titouan Vervack <titouan.vervack@sigasi.com>
2018-06-05 18:11:37 +02:00
Karsten Thoms
24ce555b09
Merge pull request #751 from ArneDeutsch/xtext-core-506
[#506] Removed reflection call.
2018-05-28 12:56:52 +02:00
Arne Deutsch
8e93dbbda4 [#506] Removed reflection call.
Do not inherit and modify (by reflection) the original
java.util.jar.Manifest but instead C&P and modify the code. Adapt
ManifestMergerTest by importing the new classes.

Signed-off-by: Arne Deutsch <Arne.Deutsch@itemis.de>
2018-05-28 10:54:21 +02:00
Karsten Thoms
7dcc65bb2e [release] Increment version to 2.15.0
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2018-05-22 23:53:44 +02:00
Karsten Thoms
e1ff4dc910 [refactoring] Deprecate methods with correspondence in Guava
Also refactored methods to use Guava

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2018-04-23 14:52:31 +02:00
Christian Dietrich
2d69f5c34e
Merge pull request #682 from tivervac/nullSafeReadOnlyAndModify2
Added null- and exception-safe variants of (priority)readOnly and modify
2018-04-20 15:55:16 +02:00
Karsten Thoms
17616407db
Merge pull request #670 from eclipse/kth_issue666_junit5
[#666] JUnit 5 support
2018-04-17 17:05:31 +02:00
Karsten Thoms
875e62c901 [#666] JUnit 5 Support
- implemented review comments
- adding JUnitVersion.DEFAULT
- added missing copyright headers for JUnitFragment and Junit4Fragment2
- changed lower bound for org.junit.jupiter.api.extension to 5.1.0

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2018-04-17 12:49:57 +02:00
Karsten Thoms
3999e54b89 [#666] Extend Xtext Generator for JUnit 5
- Added enum JUnitVersion
- Create JUnitFragment from Junit4Fragment2
  - provide setter for JUnit version
  - Deprecated Junit4Fragment2 and extend from JUnitFragment
  - changed StandardLanguage#junitSupport type to JUnitFragment
- Extended JUnitFragment to produce JUnit version specific code
- Added junitVersion property to WizardConfiguration
- generate JUnit 5 specific configuration to workflow when JUnit 5 is
configured
- TestProjectDescriptor: Configure JUnit 5 dependencies

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2018-04-16 13:27:43 +02:00
Titouan Vervack
b8c37767d5 Added wildcard extends
Signed-off-by: Titouan Vervack <titouan.vervack@sigasi.com>
2018-04-16 11:05:31 +02:00
Arne Deutsch
ec683f723c [eclipse/xtext#1177] Adapt JavaVersion to support Java 10.
This allows e.g. the selection of Java 10 in the new xtext project
wizard.

Signed-off-by: Arne Deutsch <Arne.Deutsch@itemis.de>
2018-04-12 15:13:20 +02:00
Arne Deutsch
179757480d [eclipse/xtext-core#686] Update new project wizard.
Remove IDEA from the new project wizard. IDE plugins are not well
maintained any more, no need to bother new users with not working stuff.

Set version of xtext-gradle-plugin to 1.0.21.

Update test projects according to removed IDEA support.

Signed-off-by: Arne Deutsch <Arne.Deutsch@itemis.de>
2018-04-09 15:19:01 +02:00
Titouan Vervack
b76f97ad24 Added null- and exception-safe variants of (priority)readOnly and modify
Also added I[Read|Write]Access where applicable

Signed-off-by: Titouan Vervack <titouan.vervack@sigasi.com>
2018-03-29 17:58:21 +02:00
Christian Dietrich
14fd588a2d
Merge pull request #679 from tivervac/redundant_modifier
Removed redundant modifiers
2018-03-28 18:57:08 +02:00
Titouan Vervack
127fa42d17 Removed redundant modifiers
Signed-off-by: Titouan Vervack <titouan.vervack@sigasi.com>
2018-03-28 17:41:41 +02:00
Christian Dietrich
a0ab4b290b [eclipse/xtext-core#517] Moved Class File Constant Calculation to JavaVersion Enum
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2018-03-27 13:37:26 +02:00
Arne Deutsch
3ecaa1a493 [#449] Avoid stack overflow with deep EMF containment trees.
Signed-off-by: Arne Deutsch <Arne.Deutsch@itemis.de>
2018-03-21 14:22:01 +01:00
Christian Dietrich
58113d0f41 Regenerated against lastest xbase-lib
https://github.com/eclipse/xtext/issues/1174

Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2018-02-26 15:07:09 +01:00
Christian Dietrich
1a86a763fb maintained x-friends https://github.com/eclipse/xtext/issues/1173
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2018-02-26 12:39:26 +01:00
Christian Dietrich
7ab31042c8 maintained x-friends https://github.com/eclipse/xtext/issues/1173
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2018-02-23 15:57:53 +01:00
Christian Dietrich
43b62060bb fixed broken impl
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2018-02-02 12:50:17 +01:00
Karsten Thoms
266c673d87 [#627] Compute Xtext version from Bundle-Version
Reads the version from the 'Maven-Version'
attribute from org.eclipse.xtext.util manifest. It has a static value
of 'unspecified' and gets replaced in a Gradle build.
In devmode the value is not replaced, but the right version can be
computed from the Bundle-Version attribute.

Change-Id: I5b5028ca35c04e4708a07b0c0544dce20810d273
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2018-02-02 09:16:51 +01:00
Karsten Thoms
809377cd27 [420984] Compiler optimization: Suppress creation of unused exception variable
Recompiled Xtend files

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2018-01-16 14:54:22 +01:00
Karsten Thoms
90cef27ab4 [eclipse/xtext#1160] Update copyright date range
Recompiled Xtend files

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2018-01-16 09:11:22 +01:00
Karsten Thoms
2184d4de50
Merge pull request #615 from eclipse/kth_issue1160
[eclipse/xtext#1160] Update copyright date range
2018-01-16 06:14:56 +01:00
Karsten Thoms
134c788006 [eclipse/xtext#1160] Update copyright date range
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2018-01-15 16:28:39 +01:00
Christian Dietrich
09cb0c1a90 [#517] Move More Code to JavaVersion
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2018-01-15 15:50:07 +01:00
Christian Dietrich
4419101282 fixed broken for loop
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2017-12-21 16:37:23 +01:00
Sebastian Zarnekow
fe10480c63 Support 1.9 and 9 notation for the JavaVersion 2017-12-21 14:48:18 +01:00
Karsten Thoms
d5e6578a6d
Merge pull request #588 from FStolte/issue1152
[eclipse/xtext#1152] Java 9 - Added Automatic-Module-Name header
2017-12-18 10:04:26 +01:00
Florian Stolte
1bc930b5b6 [eclipse/xtext#1152] Java 9 - Added Automatic-Module-Name header
- added header to existing manifest files
- added header to manifest generation in xtext generator and wizard

Signed-off-by: Florian Stolte <fstolte@itemis.de>
2017-12-14 14:16:20 +01:00
Florian Stolte
bc1f236450 [#582] Updated version of xtext-gradle-plugin
- updated from 1.0.19 to 1.0.20
- updated the version in the gradle file
- updated the version used by the wizard
- updated the version in examples

Signed-off-by: Florian Stolte <fstolte@itemis.de>
2017-12-14 09:33:53 +01:00
Christian Dietrich
7e1cf4b5a4 added missing types to CodeGenUtil2.getJavaDefaultTypes() #509
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2017-11-28 15:01:37 +01:00
Christian Dietrich
d6b1825a38 added support for Java 9 # 500
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2017-11-24 12:59:57 +01:00
Karsten Thoms
07b182918c
Merge pull request #529 from eclipse/me/newline_fix
Fixed #460: Test failure on Windows due to CarriageReturn char
2017-11-22 12:17:49 +01:00
Christian Dietrich
8f51de3cc4 use newer gradle plugin
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2017-11-22 08:48:26 +01:00
Christian Dietrich
3ba9c9fa57 More Cleanup
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2017-11-18 22:33:08 +01:00
Christian Dietrich
c043e300e1 Cleanup the code a bit
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2017-11-18 22:33:08 +01:00
Christian Dietrich
402e245a88 some minor cleanups
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2017-11-18 22:33:08 +01:00
Christian Dietrich
5bef8e69c8 correctly decode vs code uris on windows #528
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2017-11-18 22:33:08 +01:00
Moritz Eysholdt
f41d82c540 Fixed #460: Test failure on Windows due to CarriageReturn char 2017-11-08 08:48:31 +01:00
Christian Dietrich
4960af9c0a set version to 2.14
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2017-10-27 09:03:34 +02:00
Karsten Thoms
c507600bb9 [#355] Update MWE to 2.9.1
Changed wizard test expectation

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2017-09-28 11:19:33 +02:00
Moritz Eysholdt
0845899c84 Support Modifications on a TextRegionAccess
Signed-off-by: Moritz Eysholdt <moritz.eysholdt@typefox.io>
2017-08-11 08:07:05 +02:00
Karsten Thoms
089faaa24e Added null guard for result of listFiles
According to contract of File.listFiles() the result can be null if an
I/O error occurred.

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2017-07-14 10:18:12 +02:00
Karsten Thoms
f46a269fdd gradleprojectbuilder added by Buildship project import
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2017-07-01 23:09:36 +02:00
Christian Dietrich
cafeaec480 use xtext gradle plugin version 1.0.18
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2017-06-09 17:28:55 +02:00
Miro Spönemann
a75bac8287 Increased version number to 2.13.0-SNAPSHOT 2017-05-24 13:41:16 +02:00
Christian Dietrich
69e1ff82ff Increased guava version to include version 21. https://github.com/eclipse/xtext-lib/issues/30
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2017-05-17 15:08:53 +02:00
Christian Dietrich
8354a3b7d4 Introduce Nullable Annotation to allow Null-Injections with google guice. see https://github.com/eclipse/xtext-eclipse/issues/153 for details
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2017-02-14 10:04:18 +01:00
Moritz Eysholdt
923422737e fixed #238 in PolymorphicDispatcher#compare by not sorting methods
This fix prevents exceptions such as "IllegalArgumentException:
Comparison method violates its general contract" by not sorting the list
of methods at all. Since the method selection algorithm scans the
complete list of methods, the order of the list does not impact the
algorithm's outcome. 

The fix does not change the precedence of methods since the
implementation of compare(method1, method2) is kept the same.

However, this bug taught us that compare(m1, m2) is not suitable to
establish a total order among a list of methods and that 
compare(m1, m2)==0 && compare(m2, m3)==0 
does NOT imply compare(m1, m3)==0.

Example:
m1(A a), m2(B b), m3(C c), class A{}, class B{}, class C extends A{}

This observation required another change: When scanning the list of
methods for candidates, it does not suffice to compare the current
candidate with the last best candidate. Instead, it is needed to compare
the current candidate with all best candidates, because
compare(currentCandidate, lastBestCandidate)==0 does NOT imply compare()
to return 0 for the other best candidates. 

When calling compare(m1, m2) among the best candidates it is always
expected to return 0, meaning the candidates are unrelated (e.g.
independent inheritance hierarchies of their parameter types) or equal.

see https://github.com/eclipse/xtext-core/issues/238

Signed-off-by: Moritz Eysholdt <moritz.eysholdt@typefox.io>
2017-02-04 01:01:27 +01:00
Miro Spönemann
ba911b4790 Lifted version number to 2.12.0-SNAPSHOT 2017-01-18 11:47:03 +01:00
Miro Spönemann
0515d22685 Refreshed projects with Buildship 2.0 2017-01-12 10:32:06 +01:00
Lorenzo Bettini
00a949a153 479196: use version range [2.1.1,3)
see
https://github.com/eclipse/xtext-core/pull/235#issuecomment-271882660

Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=479196
Signed-off-by: Lorenzo Bettini <lorenzo.bettini@gmail.com>
2017-01-11 15:40:49 +01:00
Lorenzo Bettini
9eb9ad3345 479196: get antlr-generator version using a method
Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=479196
Signed-off-by: Lorenzo Bettini <lorenzo.bettini@gmail.com>
2017-01-11 15:24:46 +01:00
Karsten Thoms
838b32c429 [#212] Refactored to avoid JDT 508834
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2017-01-06 13:41:40 +01:00
Karsten Thoms
89fc6af674 Added @SafeVarargs annotation for methods with varargs
Suppress compiler warning

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2017-01-05 07:16:44 +01:00
Miro Spönemann
0e312a85c8 Fixed #215: Wrong version dependency to org.eclipse.emf.mwe2.launch generated by wizard 2017-01-03 16:52:52 +01:00
Karsten Thoms
56f1d1079e [492072] Regenerated Xtend code
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2017-01-02 14:33:55 +01:00
Karsten Thoms
c9b7bf5af2 [492072] Minimized usage of local variables
The Xtend compiler was optimized to minimize the usage of synthetic variables for member feature calls and right-hand assignments

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2016-12-22 00:54:25 +01:00
Karsten Thoms
f2b5cdfe39 [507077] Do not emit empty concatenation
Changes to generated Xtend code due to compiler optimization

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2016-12-19 15:47:59 +01:00
Karsten Thoms
b4d74f732b [eclipse/xtext#1089] Regenerated xtend-gen code
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2016-12-02 16:47:33 +01:00
Karsten Thoms
08194ce996 [eclipse/xtext#1089] Replace (not)equal operators by triple (not)equals
For comparison with null the triple (not) equal operator should be used. Resolved compiler warnings

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2016-12-02 16:46:25 +01:00
Karsten Thoms
79c3eab77c [#5] Changes to .classpath generated by Buildship import
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2016-11-30 10:00:21 +01:00
Karsten Thoms
8c381f8d59 Gradle composite
see https://github.com/eclipse/xtext-umbrella/issues/3

Remove org.eclipse.buildship.core.prefs
Files are generated on Gradle project import or by Oomph setup

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2016-11-28 14:41:08 +01:00
Karsten Thoms
c637df9451 Gradle composite
connection.project.dir changed to composite build location in new
umbrella project
value 'containers' added by Buildship

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2016-11-25 08:49:49 +01:00
Miro Spönemann
e71f62da79 Fixed #160: Gradle build generates Maven-Version attribute
Signed-off-by: Miro Spönemann <miro.spoenemann@typefox.io>
2016-10-23 19:39:43 +02:00
Miro Spönemann
b92f63bc54 eclipse/xtext#1080: Add name and description to generated poms
Signed-off-by: Miro Spönemann <miro.spoenemann@typefox.io>
2016-10-23 13:36:04 +02:00