From 78254b5b83bc3350e59b28657512836fc602228f Mon Sep 17 00:00:00 2001 From: Tamas Miklossy Date: Sat, 28 Sep 2019 09:11:26 +0200 Subject: [PATCH] [https://github.com/eclipse/xtext/issues/1486] - Remove unnecessary modeling32.png file and all the references to it. The modeling32.png file has been replaced by the xtext32.png file. Signed-off-by: Tamas Miklossy --- .../build.gradle | 2 +- .../org.xtext.example.lsMavenFatjar.ide/pom.xml | 1 - .../pom.xml | 1 - .../xtext/wizard/IdeProjectDescriptor.xtend | 3 +-- .../xtext/xtext/wizard/IdeProjectDescriptor.java | 6 +----- org.eclipse.xtext/build.gradle | 2 +- org.eclipse.xtext/modeling32.png | Bin 2414 -> 0 bytes 7 files changed, 4 insertions(+), 11 deletions(-) delete mode 100644 org.eclipse.xtext/modeling32.png diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.lsGradleFatjar/org.xtext.example.lsGradleFatjar.parent/org.xtext.example.lsGradleFatjar.ide/build.gradle b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.lsGradleFatjar/org.xtext.example.lsGradleFatjar.parent/org.xtext.example.lsGradleFatjar.ide/build.gradle index 06e06ed1c..f7e320ba0 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.lsGradleFatjar/org.xtext.example.lsGradleFatjar.parent/org.xtext.example.lsGradleFatjar.ide/build.gradle +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.lsGradleFatjar/org.xtext.example.lsGradleFatjar.parent/org.xtext.example.lsGradleFatjar.ide/build.gradle @@ -17,7 +17,7 @@ shadowJar { configurations = [project.configurations.runtime] exclude('META-INF/INDEX.LIST', 'META-INF/*.SF', 'META-INF/*.DSA', 'META-INF/*.RSA','schema/*', '.options', '.api_description', '*.profile', '*.html', 'about.*', 'about_files/*', - 'plugin.xml', 'modeling32.png', 'systembundle.properties', 'profile.list') + 'plugin.xml', 'systembundle.properties', 'profile.list') classifier = 'ls' append('plugin.properties') } diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.lsMavenFatjar/org.xtext.example.lsMavenFatjar.parent/org.xtext.example.lsMavenFatjar.ide/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.lsMavenFatjar/org.xtext.example.lsMavenFatjar.parent/org.xtext.example.lsMavenFatjar.ide/pom.xml index 0e363694a..8308f5c7f 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.lsMavenFatjar/org.xtext.example.lsMavenFatjar.parent/org.xtext.example.lsMavenFatjar.ide/pom.xml +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.lsMavenFatjar/org.xtext.example.lsMavenFatjar.parent/org.xtext.example.lsMavenFatjar.ide/pom.xml @@ -84,7 +84,6 @@ about.* about_files/* plugin.xml - modeling32.png systembundle.properties profile.list **/*._trace diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.lsMavenTychoFatjar/org.xtext.example.lsMavenTychoFatjar.parent/org.xtext.example.lsMavenTychoFatjar.ide/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.lsMavenTychoFatjar/org.xtext.example.lsMavenTychoFatjar.parent/org.xtext.example.lsMavenTychoFatjar.ide/pom.xml index 0815b0742..aaa582ea6 100644 --- a/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.lsMavenTychoFatjar/org.xtext.example.lsMavenTychoFatjar.parent/org.xtext.example.lsMavenTychoFatjar.ide/pom.xml +++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.lsMavenTychoFatjar/org.xtext.example.lsMavenTychoFatjar.parent/org.xtext.example.lsMavenTychoFatjar.ide/pom.xml @@ -157,7 +157,6 @@ about.* about_files/* plugin.xml - modeling32.png systembundle.properties profile.list **/*._trace diff --git a/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/IdeProjectDescriptor.xtend b/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/IdeProjectDescriptor.xtend index c2e8f0ad6..59abaf0f8 100644 --- a/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/IdeProjectDescriptor.xtend +++ b/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/IdeProjectDescriptor.xtend @@ -244,7 +244,6 @@ class IdeProjectDescriptor extends ProjectDescriptor { about.* about_files/* plugin.xml - modeling32.png systembundle.properties profile.list **/*._trace @@ -337,7 +336,7 @@ class IdeProjectDescriptor extends ProjectDescriptor { configurations = [project.configurations.runtime] exclude('META-INF/INDEX.LIST', 'META-INF/*.SF', 'META-INF/*.DSA', 'META-INF/*.RSA','schema/*', '.options', '.api_description', '*.profile', '*.html', 'about.*', 'about_files/*', - 'plugin.xml', 'modeling32.png', 'systembundle.properties', 'profile.list') + 'plugin.xml', 'systembundle.properties', 'profile.list') classifier = 'ls' append('plugin.properties') } diff --git a/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/IdeProjectDescriptor.java b/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/IdeProjectDescriptor.java index f4eebbcc1..b29c8ddbb 100644 --- a/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/IdeProjectDescriptor.java +++ b/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/IdeProjectDescriptor.java @@ -863,10 +863,6 @@ public class IdeProjectDescriptor extends ProjectDescriptor { _builder.newLine(); _builder.append("\t\t"); _builder.append("\t\t\t\t\t"); - _builder.append("modeling32.png"); - _builder.newLine(); - _builder.append("\t\t"); - _builder.append("\t\t\t\t\t"); _builder.append("systembundle.properties"); _builder.newLine(); _builder.append("\t\t"); @@ -1172,7 +1168,7 @@ public class IdeProjectDescriptor extends ProjectDescriptor { _builder_1.append("\'.options\', \'.api_description\', \'*.profile\', \'*.html\', \'about.*\', \'about_files/*\',"); _builder_1.newLine(); _builder_1.append("\t\t"); - _builder_1.append("\'plugin.xml\', \'modeling32.png\', \'systembundle.properties\', \'profile.list\')"); + _builder_1.append("\'plugin.xml\', \'systembundle.properties\', \'profile.list\')"); _builder_1.newLine(); _builder_1.append("\t"); _builder_1.append("classifier = \'ls\'"); diff --git a/org.eclipse.xtext/build.gradle b/org.eclipse.xtext/build.gradle index d8d2124f7..ee5591a58 100644 --- a/org.eclipse.xtext/build.gradle +++ b/org.eclipse.xtext/build.gradle @@ -26,6 +26,6 @@ sourceSets.main { jar { from('.') { - include 'org/**', 'modeling32.png', 'xtext32.png' + include 'org/**', 'xtext32.png' } } diff --git a/org.eclipse.xtext/modeling32.png b/org.eclipse.xtext/modeling32.png deleted file mode 100644 index 6b08de2ada775b81a7d93d35ecdbc8bbed6da81f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2414 zcmV-!36b`RP)mG85FUz8YqR{-rnBN_xo$VbKdjbHiRY1wv+qh zy!SolJ-_GU_dMquMrc70)S+vDBxRp~#32gAhd2-uVnB4>GsbMXM(ghBrT{$?KOu^g z7~U&*p~!K*uBQTAm7vX#CMjHz`gsai61d72l1lqf!krH+8{?=!I4_20H8h6BnKVk_ zp938KZB<&El)x>JlzeWGV4k#`gR2sRzw@Ak1|@`aarAYNghH$VBMD4M zFhz-T?eX72UuAe+D1mu@o$QxLk1z?YL5jw#rj{=imRV(^#nGJQ6FIH1P_+tgowzh& z7!I>-tz_u=qs7^`KfR7*iefRnE=TGi^{`q09K&u2@ z1X&E}fP7vG4?|v?t|axDYLBB?>7r)Sg`7@flNHM5G%A%%(sYY7!zSC($+9#ujmkyK zC>(OV(cd#FD~iHewtahBcYlBXgRQNtE4jCFx!l^++im7#y6Fejxd{HH)P=INbm4XZ*$<-s0mR3fkb?Xf1I=g7&U|n0 z-aqJz7wh}m+S*z-Z{GY3+qU(cJ9oYw_<^H@D+;D_;i+Xhx}AjOuQs5DW7xOG6LBPIjC41kQpqF}%2<|5rU_429=WbZw(SXpUG+$Ko*oQbbg^<)-0;MAL0DOfHTP zODf<=aNqZYP!Kv484Bz`aAn7iEtH!nB_DtMiQlMdkjDoFOsYf*h&-SDWcr)1B}kc)BD1VNi$~XM($DDafKIn2()S#4g>!!+r=1wIk;z&?>e+}X+7QZrIob$j@uDa zgIZE4dgINvs9faWo{&nV@r#Ls^=r;OC1fhIUBkZ12eCYWeL7X4nY>2%ypCR{{H#v1 z1sz4lqEf}63Oo^l^9614Tw8j;p~gm)QmJN&*Tt#6zK)WONm{k4U4)Vw=m7)S)GLYa zN41?Z`3BBr8!n%ms*-{X0HZ{nb0Tsu3z@+CP+Y{`g2JZgxd#F-^hTwk(Zr=mkqNqP z(3Q&t0J|WoC$a@-OEKhun?X$hxS@-?f2wFwv1~@03oj|+BcAsT*B&uWg2ugUkp9R zQc+bxQ z4KEKK09Q(4;Lhc3)SO@fjDvEE-J10#b>5PuhqtbypYM5{W@ct;ZuccoYrsJm0%Ec( zht>~dvqvvP3dGve?adg%k%@gSUn%4=x2)O3C$=w2(O>^Q8patU3*gd*hB$56vJPIc z=)i$Lirz(j3xaw!&>#Y>G5_#%_Shp=-y?9|3X;n@I$EFHzI{hL9&dbM-@Xri`s$uHbLQ;n z>u*ofuAeIO9U%m8$ z)m>c=@fQ;l6QAK2>$SJH-!%GABYq(X=Qqp2+RcP=7APSWsj8 zJl4bQ$9B=bX)Ke;^bQXX|5;Vlrs(DL^z^yiyLay&K7Ra@73mJ|vHtIFT(n@}w-lzN z{xp1&4h;>{XOox3T(P;Zxg(e$TWB@kZl9UY_-iZBo4I4?y`kU1>eTr7_^H9c!J~uk zyz>#$9;e}vk!VjH!Tb?$cwlPk zNQwS~#=0|^4qV_;FrW!lkYA@94v7C66u`MC(2*rJEOQV?98t+<(ME}OO4juMw&8N> zm%Tt-GAp7qgF!)fLbmvk31GOB1g^ZzM&SQ5a7_UwZoPpcN-{T3+