Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVincent Lorenzo2018-09-21 08:10:00 +0000
committerVincent Lorenzo2018-09-26 08:39:15 +0000
commitda741dd16d14db38d224b22a6fc2261938af495e (patch)
treef30c4613bc5f3947c73ad6edafbc16e55389c6ac
parentb1374f47fafe0586849ee976dcdfb5d7393893a3 (diff)
downloadorg.eclipse.papyrus-da741dd16d14db38d224b22a6fc2261938af495e.tar.gz
org.eclipse.papyrus-da741dd16d14db38d224b22a6fc2261938af495e.tar.xz
org.eclipse.papyrus-da741dd16d14db38d224b22a6fc2261938af495e.zip
Bug 539315 : [Xtext] Add missing header in the plugin org.eclipse.papyrus.uml.xtext.integration.ui + some others code enhancement
- add missing headers - add non-nls tag - upgrade to java 1.8 some plugins Change-Id: I875bcb25517aa9df420ffcc163dadc2c36664712 Signed-off-by: Vincent Lorenzo <vincent.lorenzo@cea.fr>
-rw-r--r--plugins/uml/alf/org.eclipse.papyrus.uml.alf.common.ui/pom.xml11
-rw-r--r--plugins/uml/alf/org.eclipse.papyrus.uml.alf.common/pom.xml11
-rw-r--r--plugins/uml/alf/org.eclipse.papyrus.uml.alf.libraries/pom.xml9
-rw-r--r--plugins/uml/alf/org.eclipse.papyrus.uml.alf.to.fuml/pom.xml9
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.common.xtext/pom.xml12
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext.ui/pom.xml10
-rw-r--r--plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext/pom.xml10
-rw-r--r--plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.core/.classpath2
-rw-r--r--plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.core/.settings/org.eclipse.jdt.core.prefs6
-rw-r--r--plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.core/META-INF/MANIFEST.MF4
-rw-r--r--plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.core/pom.xml13
-rw-r--r--plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.ui/pom.xml10
-rw-r--r--plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.ui/src/org/eclipse/papyrus/uml/xtext/integration/ActiveEditorTracker.java6
-rw-r--r--plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.ui/src/org/eclipse/papyrus/uml/xtext/integration/CompletionProposalAdapter.java2
-rw-r--r--plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.ui/src/org/eclipse/papyrus/uml/xtext/integration/CompletionProposalUtils.java10
-rw-r--r--plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.ui/src/org/eclipse/papyrus/uml/xtext/integration/InvalidSyntaxAdapter.java15
-rw-r--r--plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.ui/src/org/eclipse/papyrus/uml/xtext/integration/MultiplicityXTextParserUtils.java14
-rw-r--r--plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.ui/src/org/eclipse/papyrus/uml/xtext/integration/PapyrusDefaultAutoEditStrategyProvider.java4
-rw-r--r--plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.ui/src/org/eclipse/papyrus/uml/xtext/integration/StyledTextXtextAdapter.java6
-rw-r--r--plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.ui/src/org/eclipse/papyrus/uml/xtext/integration/XtextFakeResourceContext.java4
-rw-r--r--plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.ui/src/org/eclipse/papyrus/uml/xtext/integration/XtextSourceViewerEx.java4
-rw-r--r--plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.ui/src/org/eclipse/papyrus/uml/xtext/integration/XtextStyledTextHighlightingHelper.java17
-rw-r--r--plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.ui/src/org/eclipse/papyrus/uml/xtext/integration/XtextStyledTextHighlightingReconciler.java23
-rw-r--r--plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.validation/.classpath2
-rw-r--r--plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.validation/.settings/org.eclipse.jdt.core.prefs6
-rw-r--r--plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.validation/META-INF/MANIFEST.MF4
-rw-r--r--plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.validation/pom.xml12
27 files changed, 152 insertions, 84 deletions
diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common.ui/pom.xml b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common.ui/pom.xml
index 54f07539b15..6c7cf6ac29c 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common.ui/pom.xml
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common.ui/pom.xml
@@ -1,9 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.eclipse.papyrus</groupId>
- <artifactId>org.eclipse.papyrus.uml-alf</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <groupId>org.eclipse.papyrus</groupId>
+ <artifactId>org.eclipse.papyrus.uml-alf</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.papyrus.uml.alf.common.ui</artifactId>
<version>2.0.0-SNAPSHOT</version>
diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common/pom.xml b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common/pom.xml
index bb5a24ba7fd..231714ebfc9 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common/pom.xml
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.common/pom.xml
@@ -1,9 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.eclipse.papyrus</groupId>
- <artifactId>org.eclipse.papyrus.uml-alf</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <groupId>org.eclipse.papyrus</groupId>
+ <artifactId>org.eclipse.papyrus.uml-alf</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.papyrus.uml.alf.common</artifactId>
<version>2.0.0-SNAPSHOT</version>
diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf.libraries/pom.xml b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.libraries/pom.xml
index 0f7a643d51c..8dfd4cb866f 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf.libraries/pom.xml
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.libraries/pom.xml
@@ -1,11 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.eclipse.papyrus</groupId>
- <artifactId>org.eclipse.papyrus.uml-alf</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <groupId>org.eclipse.papyrus</groupId>
+ <artifactId>org.eclipse.papyrus.uml-alf</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.papyrus.uml.alf.libraries</artifactId>
<version>2.0.0-SNAPSHOT</version>
diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf.to.fuml/pom.xml b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.to.fuml/pom.xml
index ce347501824..312a14ea87d 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf.to.fuml/pom.xml
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.to.fuml/pom.xml
@@ -1,11 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.eclipse.papyrus</groupId>
- <artifactId>org.eclipse.papyrus.uml-alf</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <groupId>org.eclipse.papyrus</groupId>
+ <artifactId>org.eclipse.papyrus.uml-alf</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.papyrus.uml.alf.to.fuml</artifactId>
<version>1.2.0-SNAPSHOT</version>
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.common.xtext/pom.xml b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.common.xtext/pom.xml
index dacb4f406e6..e0542d0437b 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.common.xtext/pom.xml
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.common.xtext/pom.xml
@@ -1,10 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.eclipse.papyrus</groupId>
- <artifactId>org.eclipse.papyrus.uml-textedit</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <groupId>org.eclipse.papyrus</groupId>
+ <artifactId>org.eclipse.papyrus.uml-textedit</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.papyrus.uml.textedit.common.xtext</artifactId>
<version>2.1.0-SNAPSHOT</version>
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext.ui/pom.xml b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext.ui/pom.xml
index 0f991d494cd..a1bf1e17a07 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext.ui/pom.xml
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext.ui/pom.xml
@@ -1,10 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.eclipse.papyrus</groupId>
- <artifactId>org.eclipse.papyrus.uml-textedit</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <groupId>org.eclipse.papyrus</groupId>
+ <artifactId>org.eclipse.papyrus.uml-textedit</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.papyrus.uml.textedit.property.xtext.ui</artifactId>
<version>2.1.0-SNAPSHOT</version>
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext/pom.xml b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext/pom.xml
index f40380a30e1..46d6d3c5aed 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext/pom.xml
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.xtext/pom.xml
@@ -1,10 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.eclipse.papyrus</groupId>
- <artifactId>org.eclipse.papyrus.uml-textedit</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <groupId>org.eclipse.papyrus</groupId>
+ <artifactId>org.eclipse.papyrus.uml-textedit</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.papyrus.uml.textedit.property.xtext</artifactId>
<version>2.1.0-SNAPSHOT</version>
diff --git a/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.core/.classpath b/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.core/.classpath
index 64c5e31b7a2..eca7bdba8f0 100644
--- a/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.core/.classpath
+++ b/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.core/.classpath
@@ -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/J2SE-1.5"/>
+ <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"/>
diff --git a/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.core/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.core/.settings/org.eclipse.jdt.core.prefs
index 15d5f917b9c..74c6d08d7e4 100644
--- a/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.core/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.core/.settings/org.eclipse.jdt.core.prefs
@@ -1,16 +1,16 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.release=disabled
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.8
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
diff --git a/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.core/META-INF/MANIFEST.MF b/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.core/META-INF/MANIFEST.MF
index 775e11cdb32..5558020f984 100644
--- a/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.core/META-INF/MANIFEST.MF
+++ b/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.core/META-INF/MANIFEST.MF
@@ -2,9 +2,9 @@ Manifest-Version: 1.0
Export-Package: org.eclipse.papyrus.uml.xtext.integration.core
Require-Bundle: org.eclipse.xtext;bundle-version="[2.10.0,3.0.0)";visibility:=reexport
Bundle-Vendor: Eclipse Modeling Project
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.1.0.qualifier
Bundle-Name: XText integration Core
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.papyrus.uml.xtext.integration.core;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.papyrus.uml.xtext.integration.core
diff --git a/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.core/pom.xml b/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.core/pom.xml
index c33fe216309..b7a38c07082 100644
--- a/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.core/pom.xml
+++ b/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.core/pom.xml
@@ -1,11 +1,14 @@
-<?xml version="1.0" encoding="UTF-8"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.eclipse.papyrus</groupId>
- <artifactId>org.eclipse.papyrus.uml-xtext</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <groupId>org.eclipse.papyrus</groupId>
+ <artifactId>org.eclipse.papyrus.uml-xtext</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.papyrus.uml.xtext.integration.core</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project> \ No newline at end of file
diff --git a/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.ui/pom.xml b/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.ui/pom.xml
index 7f521c4da14..11d2e16d7de 100644
--- a/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.ui/pom.xml
+++ b/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.ui/pom.xml
@@ -1,10 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.eclipse.papyrus</groupId>
- <artifactId>org.eclipse.papyrus.uml-xtext</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <groupId>org.eclipse.papyrus</groupId>
+ <artifactId>org.eclipse.papyrus.uml-xtext</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.papyrus.uml.xtext.integration.ui</artifactId>
<version>2.1.0-SNAPSHOT</version>
diff --git a/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.ui/src/org/eclipse/papyrus/uml/xtext/integration/ActiveEditorTracker.java b/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.ui/src/org/eclipse/papyrus/uml/xtext/integration/ActiveEditorTracker.java
index 07a0cd970f2..1e4c2c5da9b 100644
--- a/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.ui/src/org/eclipse/papyrus/uml/xtext/integration/ActiveEditorTracker.java
+++ b/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.ui/src/org/eclipse/papyrus/uml/xtext/integration/ActiveEditorTracker.java
@@ -50,7 +50,7 @@ import org.eclipse.ui.PlatformUI;
public class ActiveEditorTracker implements IPageListener, IPartListener,
IWindowListener {
- private static final String SINGLETON_MSG = "This class is a singleton and may only be instantiated once!";
+ private static final String SINGLETON_MSG = "This class is a singleton and may only be instantiated once!"; //$NON-NLS-1$
private IWorkbenchWindow workbenchWindow;
@@ -175,7 +175,7 @@ public class ActiveEditorTracker implements IPageListener, IPartListener,
public void pageOpened(IWorkbenchPage page) {
// do nothing
- System.out.println("PAGE OPENED: " + page);
+ System.out.println("PAGE OPENED: " + page); //$NON-NLS-1$
}
public void partActivated(IWorkbenchPart part) {
@@ -277,7 +277,7 @@ public class ActiveEditorTracker implements IPageListener, IPartListener,
}
final IWorkbenchPartReference reference = activePage.getReference(part);
if (reference == null) {
- throw new IllegalStateException("Impossible?!");
+ throw new IllegalStateException("Impossible?!"); //$NON-NLS-1$
}
lastActiveEditorId = reference.getId();
activeEditors.put(lastActiveEditorId, part);
diff --git a/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.ui/src/org/eclipse/papyrus/uml/xtext/integration/CompletionProposalAdapter.java b/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.ui/src/org/eclipse/papyrus/uml/xtext/integration/CompletionProposalAdapter.java
index 6f1269e740c..50e10f34faa 100644
--- a/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.ui/src/org/eclipse/papyrus/uml/xtext/integration/CompletionProposalAdapter.java
+++ b/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.ui/src/org/eclipse/papyrus/uml/xtext/integration/CompletionProposalAdapter.java
@@ -604,7 +604,7 @@ public class CompletionProposalAdapter implements ICompletionListener {
return (Boolean) result;
} else {
throw new IllegalStateException(
- "Method is expected to return boolean!");
+ "Method is expected to return boolean!"); //$NON-NLS-1$
}
} catch (InvocationTargetException e) {
throw e.getCause(); // cause was thrown by method m.
diff --git a/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.ui/src/org/eclipse/papyrus/uml/xtext/integration/CompletionProposalUtils.java b/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.ui/src/org/eclipse/papyrus/uml/xtext/integration/CompletionProposalUtils.java
index 2d3658d4789..bfd2531f1f8 100644
--- a/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.ui/src/org/eclipse/papyrus/uml/xtext/integration/CompletionProposalUtils.java
+++ b/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.ui/src/org/eclipse/papyrus/uml/xtext/integration/CompletionProposalUtils.java
@@ -54,14 +54,14 @@ public class CompletionProposalUtils {
String completionString,
String displayString,
ContentAssistContext context) {
- String additionalProposalInfo = "" + namedElement.getQualifiedName() + "\n" + '(' + namedElement.eClass().getName() + ')';
+ String additionalProposalInfo = "" + namedElement.getQualifiedName() + "\n" + '(' + namedElement.eClass().getName() + ')'; //$NON-NLS-1$ //$NON-NLS-2$
CustomCompletionProposal completionProposal = new CustomCompletionProposal(completionString, // String to be inserted
context.getOffset(), // Offset
context.getSelectedText().length(), // Replacement length
completionString.length(), // cursorPosition
labelProvider.getImage(namedElement), // image
- " " + displayString, // displayString
+ " " + displayString, // displayString //$NON-NLS-1$
null, // contextInformation
additionalProposalInfo, // additionalProposalInfo
context);
@@ -85,14 +85,14 @@ public class CompletionProposalUtils {
String completionString,
String displayString,
ContentAssistContext context) {
- String additionalProposalInfo = "" + namedElement.getQualifiedName() + "\n" + '(' + namedElement.eClass().getName() + ')';
+ String additionalProposalInfo = "" + namedElement.getQualifiedName() + "\n" + '(' + namedElement.eClass().getName() + ')'; //$NON-NLS-1$ //$NON-NLS-2$
CustomCompletionProposal completionProposal = new CustomCompletionProposal(completionString, // String to be inserted
context.getOffset() - context.getPrefix().length(), // Offset
context.getPrefix().length(), // Replacement length
completionString.length(), // cursorPosition
labelProvider.getImage(namedElement), // image
- " " + displayString, // displayString
+ " " + displayString, // displayString //$NON-NLS-1$
null, // contextInformation
additionalProposalInfo, // additionalProposalInfo
context);
@@ -119,7 +119,7 @@ public class CompletionProposalUtils {
context.getSelectedText().length(), // Replacement length
completionString.length(), // cursorPosition
null, // image
- " " + displayString, // displayString
+ " " + displayString, // displayString //$NON-NLS-1$
null, // contextInformation
null, // additionalProposalInfo
context);
diff --git a/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.ui/src/org/eclipse/papyrus/uml/xtext/integration/InvalidSyntaxAdapter.java b/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.ui/src/org/eclipse/papyrus/uml/xtext/integration/InvalidSyntaxAdapter.java
index 662ada1f4a1..69a71ec0a10 100644
--- a/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.ui/src/org/eclipse/papyrus/uml/xtext/integration/InvalidSyntaxAdapter.java
+++ b/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.ui/src/org/eclipse/papyrus/uml/xtext/integration/InvalidSyntaxAdapter.java
@@ -1,3 +1,18 @@
+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ * CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+
package org.eclipse.papyrus.uml.xtext.integration;
import org.eclipse.emf.common.notify.Notification;
diff --git a/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.ui/src/org/eclipse/papyrus/uml/xtext/integration/MultiplicityXTextParserUtils.java b/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.ui/src/org/eclipse/papyrus/uml/xtext/integration/MultiplicityXTextParserUtils.java
index e2a840ff46d..e25415e1f59 100644
--- a/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.ui/src/org/eclipse/papyrus/uml/xtext/integration/MultiplicityXTextParserUtils.java
+++ b/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.ui/src/org/eclipse/papyrus/uml/xtext/integration/MultiplicityXTextParserUtils.java
@@ -35,12 +35,12 @@ public class MultiplicityXTextParserUtils {
/**
* The character representing the unlimited number
*/
- private static final String UNLIMITED_KEYWORD = "*";
+ private static final String UNLIMITED_KEYWORD = "*"; //$NON-NLS-1$
/**
* The quote character.
*/
- private static final String QUOTE = "\"";
+ private static final String QUOTE = "\""; //$NON-NLS-1$
/**
* This allow to create the command for one bound of multiplicity and add it in the composite command.
@@ -54,7 +54,7 @@ public class MultiplicityXTextParserUtils {
* @return The command to update the multiplicity.
*/
public static ICommand updateOneMultiplicityCommand(final IElementEditService provider, final EObject eObject, final String bound) {
- final CompositeCommand compositeCommand = new CompositeCommand("Multiplicity update");
+ final CompositeCommand compositeCommand = new CompositeCommand("Multiplicity update"); //$NON-NLS-1$
CompositeCommand updateLower, updateUpper;
if (UNLIMITED_KEYWORD.equals(bound)) {
// The bound filled is the '*' character
@@ -93,7 +93,7 @@ public class MultiplicityXTextParserUtils {
* @return The command to update the multiplicity.
*/
public static ICommand updateTwoMultiplicityCommand(final IElementEditService provider, final EObject eObject, final String lowerBound, final String upperBound) {
- final CompositeCommand compositeCommand = new CompositeCommand("Multiplicity update");
+ final CompositeCommand compositeCommand = new CompositeCommand("Multiplicity update"); //$NON-NLS-1$
CompositeCommand updateLower = updateLowerValueSpecificationMultiplicityCommand(provider, eObject, lowerBound);
if (!updateLower.isEmpty()) {
@@ -130,7 +130,7 @@ public class MultiplicityXTextParserUtils {
* @return The command to update the lower multiplicity.
*/
private static CompositeCommand updateLowerValueSpecificationMultiplicityCommand(final IElementEditService provider, final EObject eObject, final String bound) {
- final CompositeCommand compositeCommand = new CompositeCommand("Lower Multiplicity update");
+ final CompositeCommand compositeCommand = new CompositeCommand("Lower Multiplicity update"); //$NON-NLS-1$
ValueSpecification newLowerValueSpecification = (ValueSpecification) eObject.eGet(UMLPackage.eINSTANCE.getMultiplicityElement_LowerValue());
@@ -170,7 +170,7 @@ public class MultiplicityXTextParserUtils {
* @return The command to update the upper multiplicity.
*/
private static CompositeCommand updateUpperValueSpecificationMultiplicityCommand(final IElementEditService provider, final EObject eObject, final String bound) {
- final CompositeCommand compositeCommand = new CompositeCommand("Upper Multiplicity update");
+ final CompositeCommand compositeCommand = new CompositeCommand("Upper Multiplicity update"); //$NON-NLS-1$
ValueSpecification newUpperValueSpecification = (ValueSpecification) eObject.eGet(UMLPackage.eINSTANCE.getMultiplicityElement_UpperValue());
@@ -216,7 +216,7 @@ public class MultiplicityXTextParserUtils {
*/
private static ICommand updateLiteralStringMultiplicityCommand(final IElementEditService provider, final EObject eObject, final ValueSpecification initialValueSpecification, final EStructuralFeature feature,
final String bound) {
- final CompositeCommand compositeCommand = new CompositeCommand("String Multiplicity update");
+ final CompositeCommand compositeCommand = new CompositeCommand("String Multiplicity update"); //$NON-NLS-1$
ValueSpecification newValueSpecification = initialValueSpecification;
diff --git a/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.ui/src/org/eclipse/papyrus/uml/xtext/integration/PapyrusDefaultAutoEditStrategyProvider.java b/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.ui/src/org/eclipse/papyrus/uml/xtext/integration/PapyrusDefaultAutoEditStrategyProvider.java
index 7baaa158bed..f148cd92d3b 100644
--- a/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.ui/src/org/eclipse/papyrus/uml/xtext/integration/PapyrusDefaultAutoEditStrategyProvider.java
+++ b/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.ui/src/org/eclipse/papyrus/uml/xtext/integration/PapyrusDefaultAutoEditStrategyProvider.java
@@ -32,8 +32,8 @@ public class PapyrusDefaultAutoEditStrategyProvider extends DefaultAutoEditStrat
*/
@Override
protected void configureStringLiteral(final IEditStrategyAcceptor acceptor) {
- acceptor.accept(partitionInsert.newInstance("\"", "\""), IDocument.DEFAULT_CONTENT_TYPE);
- acceptor.accept(partitionInsert.newInstance("'", "'"), IDocument.DEFAULT_CONTENT_TYPE);
+ acceptor.accept(partitionInsert.newInstance("\"", "\""), IDocument.DEFAULT_CONTENT_TYPE); //$NON-NLS-1$ //$NON-NLS-2$
+ acceptor.accept(partitionInsert.newInstance("'", "'"), IDocument.DEFAULT_CONTENT_TYPE); //$NON-NLS-1$ //$NON-NLS-2$
// Don't add the partition deletion for the ' and " characters
acceptor.accept(partitionEndSkippingEditStrategy.get(), TerminalsTokenTypeToPartitionMapper.STRING_LITERAL_PARTITION);
}
diff --git a/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.ui/src/org/eclipse/papyrus/uml/xtext/integration/StyledTextXtextAdapter.java b/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.ui/src/org/eclipse/papyrus/uml/xtext/integration/StyledTextXtextAdapter.java
index 57f1ce33645..16c6b0e03cc 100644
--- a/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.ui/src/org/eclipse/papyrus/uml/xtext/integration/StyledTextXtextAdapter.java
+++ b/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.ui/src/org/eclipse/papyrus/uml/xtext/integration/StyledTextXtextAdapter.java
@@ -132,7 +132,7 @@ public class StyledTextXtextAdapter {
// connect Xtext document to fake resource
initXtextDocument(fakeResourceContext);
try {
- fakeResourceContext.getFakeResource().load(new StringInputStream(""), Collections.EMPTY_MAP);
+ fakeResourceContext.getFakeResource().load(new StringInputStream(""), Collections.EMPTY_MAP); //$NON-NLS-1$
} catch (IOException e) {
e.printStackTrace();
}
@@ -191,10 +191,10 @@ public class StyledTextXtextAdapter {
decoration.setShowHover(true);
decoration.setShowOnlyOnFocus(true);
- final Image image = ImageDescriptor.createFromFile(XtextStyledTextCellEditor.class, "content_assist_cue.gif")
+ final Image image = ImageDescriptor.createFromFile(XtextStyledTextCellEditor.class, "content_assist_cue.gif") //$NON-NLS-1$
.createImage();
decoration.setImage(image);
- decoration.setDescriptionText("Content Assist Available (CTRL + Space)");
+ decoration.setDescriptionText("Content Assist Available (CTRL + Space)"); //$NON-NLS-1$
decoration.setMarginWidth(2);
styledText.addDisposeListener(new DisposeListener() {
public void widgetDisposed(DisposeEvent e) {
diff --git a/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.ui/src/org/eclipse/papyrus/uml/xtext/integration/XtextFakeResourceContext.java b/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.ui/src/org/eclipse/papyrus/uml/xtext/integration/XtextFakeResourceContext.java
index a02e8397857..c17e9df1349 100644
--- a/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.ui/src/org/eclipse/papyrus/uml/xtext/integration/XtextFakeResourceContext.java
+++ b/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.ui/src/org/eclipse/papyrus/uml/xtext/integration/XtextFakeResourceContext.java
@@ -83,7 +83,7 @@ public class XtextFakeResourceContext {
IProject activeProject = getActiveProject();
// fallback to avoid dependency on open editor
String activeProjectName = activeProject != null ? activeProject
- .getName() : "fakeResource";
+ .getName() : "fakeResource"; //$NON-NLS-1$
fakeResource.setURI(createFakeResourceUri(activeProjectName));
}
@@ -92,7 +92,7 @@ public class XtextFakeResourceContext {
}
private URI createFakeResourceBaseFragment(String activeProject) {
- return URI.createPlatformResourceURI(activeProject + "/embedded", true);
+ return URI.createPlatformResourceURI(activeProject + "/embedded", true); //$NON-NLS-1$
}
private URI createFakeResourceUri(String activeProject) {
diff --git a/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.ui/src/org/eclipse/papyrus/uml/xtext/integration/XtextSourceViewerEx.java b/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.ui/src/org/eclipse/papyrus/uml/xtext/integration/XtextSourceViewerEx.java
index fcd44f65b49..c973fe82add 100644
--- a/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.ui/src/org/eclipse/papyrus/uml/xtext/integration/XtextSourceViewerEx.java
+++ b/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.ui/src/org/eclipse/papyrus/uml/xtext/integration/XtextSourceViewerEx.java
@@ -103,7 +103,7 @@ class XtextSourceViewerEx extends XtextSourceViewer {
Field declaredField;
try {
declaredField = TextSourceViewerConfiguration.class
- .getDeclaredField("fPreferenceStore");
+ .getDeclaredField("fPreferenceStore"); //$NON-NLS-1$
declaredField.setAccessible(true);
declaredField.set(configuration, preferenceStore);
} catch (Exception e) {
@@ -121,7 +121,7 @@ class XtextSourceViewerEx extends XtextSourceViewer {
private void setPrivateHandleProjectionChangesField(boolean value) {
try {
Field declaredField = ProjectionViewer.class
- .getDeclaredField("fHandleProjectionChanges");
+ .getDeclaredField("fHandleProjectionChanges"); //$NON-NLS-1$
declaredField.setAccessible(true);
declaredField.set(this, value);
} catch (Exception e) {
diff --git a/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.ui/src/org/eclipse/papyrus/uml/xtext/integration/XtextStyledTextHighlightingHelper.java b/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.ui/src/org/eclipse/papyrus/uml/xtext/integration/XtextStyledTextHighlightingHelper.java
index 98d4cd0512b..9d2134e2b53 100644
--- a/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.ui/src/org/eclipse/papyrus/uml/xtext/integration/XtextStyledTextHighlightingHelper.java
+++ b/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.ui/src/org/eclipse/papyrus/uml/xtext/integration/XtextStyledTextHighlightingHelper.java
@@ -1,3 +1,18 @@
+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ * CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+
package org.eclipse.papyrus.uml.xtext.integration;
import org.eclipse.jface.preference.IPreferenceStore;
@@ -142,7 +157,7 @@ class XtextStyledTextHighlightingHelper implements IPropertyChangeListener {
public void propertyChange(PropertyChangeEvent event) {
if (fReconciler != null
- && event.getProperty().contains(".syntaxColorer.tokenStyles")) {
+ && event.getProperty().contains(".syntaxColorer.tokenStyles")) { //$NON-NLS-1$
textAttributeProvider.propertyChange(event);
fReconciler.refresh();
}
diff --git a/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.ui/src/org/eclipse/papyrus/uml/xtext/integration/XtextStyledTextHighlightingReconciler.java b/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.ui/src/org/eclipse/papyrus/uml/xtext/integration/XtextStyledTextHighlightingReconciler.java
index 443d1488836..b6f5bfe6e04 100644
--- a/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.ui/src/org/eclipse/papyrus/uml/xtext/integration/XtextStyledTextHighlightingReconciler.java
+++ b/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.ui/src/org/eclipse/papyrus/uml/xtext/integration/XtextStyledTextHighlightingReconciler.java
@@ -1,3 +1,18 @@
+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ * CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+
package org.eclipse.papyrus.uml.xtext.integration;
import java.util.ArrayList;
@@ -106,10 +121,9 @@ class XtextStyledTextHighlightingReconciler implements
* @param highlighting
* The highlighting
*/
+ @Override
public void addPosition(int offset, int length, String... ids) {
- TextAttribute highlighting = ids.length == 1 ? attributeProvider
- .getAttribute(ids[0]) : attributeProvider
- .getMergedAttributes(ids);
+ TextAttribute highlighting = ids.length == 1 ? attributeProvider.getAttribute(ids[0]) : attributeProvider.getMergedAttributes(ids);
boolean isExisting = false;
// TODO: use binary search
for (int i = 0, n = removedPositions.size(); i < n; i++) {
@@ -216,6 +230,7 @@ class XtextStyledTextHighlightingReconciler implements
* org.eclipse.jface.text.ITextInputListener#inputDocumentAboutToBeChanged
* (org.eclipse.jface.text.IDocument, org.eclipse.jface.text.IDocument)
*/
+ @Override
public void inputDocumentAboutToBeChanged(IDocument oldInput,
IDocument newInput) {
if (oldInput != null) {
@@ -228,6 +243,7 @@ class XtextStyledTextHighlightingReconciler implements
* org.eclipse.jface.text.ITextInputListener#inputDocumentChanged(org.eclipse
* .jface.text.IDocument, org.eclipse.jface.text.IDocument)
*/
+ @Override
public void inputDocumentChanged(IDocument oldInput, IDocument newInput) {
if (newInput != null) {
refresh();
@@ -254,6 +270,7 @@ class XtextStyledTextHighlightingReconciler implements
}
}
+ @Override
public void modelChanged(XtextResource resource) {
// ensure at most one thread can be reconciling at any time
synchronized (fReconcileLock) {
diff --git a/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.validation/.classpath b/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.validation/.classpath
index 64c5e31b7a2..eca7bdba8f0 100644
--- a/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.validation/.classpath
+++ b/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.validation/.classpath
@@ -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/J2SE-1.5"/>
+ <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"/>
diff --git a/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.validation/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.validation/.settings/org.eclipse.jdt.core.prefs
index 15d5f917b9c..74c6d08d7e4 100644
--- a/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.validation/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.validation/.settings/org.eclipse.jdt.core.prefs
@@ -1,16 +1,16 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.release=disabled
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.8
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
diff --git a/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.validation/META-INF/MANIFEST.MF b/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.validation/META-INF/MANIFEST.MF
index 048614d7e8d..616f61b5eba 100644
--- a/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.validation/META-INF/MANIFEST.MF
+++ b/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.validation/META-INF/MANIFEST.MF
@@ -5,9 +5,9 @@ Require-Bundle: org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)",
org.eclipse.emf.validation;bundle-version="[1.0.0,2.0.0)"
Bundle-Vendor: Eclipse Modeling Project
Bundle-ActivationPolicy: lazy
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.1.0.qualifier
Bundle-Name: GMF Xtext Integration Validation
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.papyrus.uml.xtext.integration.validation;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.papyrus.uml.xtext.integration.validation
diff --git a/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.validation/pom.xml b/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.validation/pom.xml
index c8c3e795179..07eb5f8f2ba 100644
--- a/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.validation/pom.xml
+++ b/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.validation/pom.xml
@@ -1,12 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.eclipse.papyrus</groupId>
- <artifactId>org.eclipse.papyrus.uml-xtext</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <groupId>org.eclipse.papyrus</groupId>
+ <artifactId>org.eclipse.papyrus.uml-xtext</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.papyrus.uml.xtext.integration.validation</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project> \ No newline at end of file

Back to the top