diff options
| author | Francois Le Fevre | 2017-09-05 12:04:35 +0000 |
|---|---|---|
| committer | Quentin Le Menez | 2017-09-06 07:42:24 +0000 |
| commit | e07bdda2ab181ebbdbd98b4c5ea42e3c613d1ada (patch) | |
| tree | 9c38f7107773b4ae4a6c1462ba8f4d374c242f31 | |
| parent | a1208dccd44fe14fd554fb0212658ca4343704fe (diff) | |
| download | org.eclipse.papyrus-e07bdda2ab181ebbdbd98b4c5ea42e3c613d1ada.tar.gz org.eclipse.papyrus-e07bdda2ab181ebbdbd98b4c5ea42e3c613d1ada.tar.xz org.eclipse.papyrus-e07bdda2ab181ebbdbd98b4c5ea42e3c613d1ada.zip | |
Bug 521867 - [Diagram] enforce template encoding in ISO-8859-1
Actions
-adding management of right encoding
-switching tomaven porject to ensure it load the preferences
Change-Id: I93d2a73e032114626d6362cb536a9f4a0db4dafa
Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=521867
Signed-off-by: Francois Le Fevre <francois.le-fevre@cea.fr>
5 files changed, 23 insertions, 2 deletions
diff --git a/plugins/developer/org.eclipse.papyrus.def/.project b/plugins/developer/org.eclipse.papyrus.def/.project index 72184c061a6..2d16d0466af 100644 --- a/plugins/developer/org.eclipse.papyrus.def/.project +++ b/plugins/developer/org.eclipse.papyrus.def/.project @@ -62,8 +62,14 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.m2e.core.maven2Builder</name> + <arguments> + </arguments> + </buildCommand> </buildSpec> <natures> + <nature>org.eclipse.m2e.core.maven2Nature</nature> <nature>org.eclipse.jdt.core.javanature</nature> <nature>org.eclipse.pde.PluginNature</nature> <nature>org.openarchitectureware.base.oawNature</nature> diff --git a/plugins/developer/org.eclipse.papyrus.def/.settings/org.eclipse.core.resources.prefs b/plugins/developer/org.eclipse.papyrus.def/.settings/org.eclipse.core.resources.prefs index 896a9a53a53..e10e3165bba 100644 --- a/plugins/developer/org.eclipse.papyrus.def/.settings/org.eclipse.core.resources.prefs +++ b/plugins/developer/org.eclipse.papyrus.def/.settings/org.eclipse.core.resources.prefs @@ -1,2 +1,3 @@ eclipse.preferences.version=1 -encoding/<project>=UTF-8
\ No newline at end of file +encoding/<project>=ISO-8859-1 +encoding/xtend=ISO-8859-1 diff --git a/plugins/developer/org.eclipse.papyrus.def/.settings/org.eclipse.m2e.core.prefs b/plugins/developer/org.eclipse.papyrus.def/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 00000000000..f897a7f1cb2 --- /dev/null +++ b/plugins/developer/org.eclipse.papyrus.def/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,4 @@ +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 diff --git a/plugins/developer/org.eclipse.papyrus.def/.settings/org.eclipse.xtend.core.Xtend.prefs b/plugins/developer/org.eclipse.papyrus.def/.settings/org.eclipse.xtend.core.Xtend.prefs new file mode 100644 index 00000000000..df3c3c49d40 --- /dev/null +++ b/plugins/developer/org.eclipse.papyrus.def/.settings/org.eclipse.xtend.core.Xtend.prefs @@ -0,0 +1,6 @@ +//outlet.DEFAULT_OUTPUT.sourceFolder.src/main/java.directory=xtend-gen +BuilderConfiguration.is_project_specific=true +eclipse.preferences.version=1 +outlet.DEFAULT_OUTPUT.hideLocalSyntheticVariables=true +outlet.DEFAULT_OUTPUT.installDslAsPrimarySource=false +outlet.DEFAULT_OUTPUT.userOutputPerSourceFolder=true diff --git a/plugins/developer/org.eclipse.papyrus.def/pom.xml b/plugins/developer/org.eclipse.papyrus.def/pom.xml index 706612dcad6..53e2267dfe5 100644 --- a/plugins/developer/org.eclipse.papyrus.def/pom.xml +++ b/plugins/developer/org.eclipse.papyrus.def/pom.xml @@ -12,6 +12,10 @@ <version>1.3.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
+ <properties>
+ <project.build.sourceEncoding>ISO-8859-1</project.build.sourceEncoding>
+ </properties>
+
<build>
<plugins>
<plugin>
@@ -49,7 +53,7 @@ <configuration>
<outputDirectory>xtend-gen</outputDirectory>
<testOutputDirectory>${project.build.directory}/xtend-gen/test</testOutputDirectory>
- <encoding>UTF-8</encoding>
+ <encoding>ISO-8859-1</encoding>
</configuration>
</plugin>
</plugins>
|