From fed4b2a1fc73b354fd4b47cb50ceebdcd0848fec Mon Sep 17 00:00:00 2001 From: nullsub <chrisudeussen@gmail.com> Date: Fri, 4 May 2018 21:46:17 +0200 Subject: [PATCH] fix project after moving back from develop branch --- .../editpolicydsl/ide/.DslIdeModule.xtendbin | Bin 1648 -> 1648 bytes .../editpolicydsl/ide/.DslIdeSetup.xtendbin | Bin 2449 -> 2449 bytes .../framed/iorm/editpolicydsl/ide/.gitignore | 4 ++++ .../editpolicydsl/ui/.DslUiModule.xtendbin | Bin 2293 -> 2293 bytes .../framed/iorm/editpolicydsl/ui/.gitignore | 2 ++ .../.DslProposalProvider.xtendbin | Bin 1754 -> 1754 bytes .../editpolicydsl/ui/contentassist/.gitignore | 2 ++ .../.DslDescriptionLabelProvider.xtendbin | Bin 1934 -> 1934 bytes .../ui/labeling/.DslLabelProvider.xtendbin | Bin 2371 -> 2371 bytes .../iorm/editpolicydsl/ui/labeling/.gitignore | 4 ++++ .../outline/.DslOutlineTreeProvider.xtendbin | Bin 1781 -> 1781 bytes .../iorm/editpolicydsl/ui/outline/.gitignore | 2 ++ .../ui/quickfix/.DslQuickfixProvider.xtendbin | Bin 1747 -> 1747 bytes .../iorm/editpolicydsl/ui/quickfix/.gitignore | 2 ++ .../editpolicydsl/.DslRuntimeModule.xtendbin | Bin 1679 -> 1679 bytes .../.DslStandaloneSetup.xtendbin | Bin 2022 -> 2022 bytes .../org/framed/iorm/editpolicydsl/.gitignore | 4 ++++ .../formatting2/.DslFormatter.xtendbin | Bin 2905 -> 2905 bytes .../iorm/editpolicydsl/formatting2/.gitignore | 2 ++ .../generator/.DslGenerator.xtendbin | Bin 3413 -> 3413 bytes .../iorm/editpolicydsl/generator/.gitignore | 2 ++ .../scoping/.DslScopeProvider.xtendbin | Bin 1719 -> 1719 bytes .../iorm/editpolicydsl/scoping/.gitignore | 2 ++ .../validation/.DslValidator.xtendbin | Bin 1702 -> 1702 bytes .../iorm/editpolicydsl/validation/.gitignore | 2 ++ 25 files changed, 28 insertions(+) diff --git a/org.framed.iorm.editpolicydsl.ide/xtend-gen/org/framed/iorm/editpolicydsl/ide/.DslIdeModule.xtendbin b/org.framed.iorm.editpolicydsl.ide/xtend-gen/org/framed/iorm/editpolicydsl/ide/.DslIdeModule.xtendbin index 87296db493c8eb6c9396cfca6531d39ce65437d2..be6e89bff3c24812fe29d09deab23c5aa46f8d38 100644 GIT binary patch delta 64 zcmeys^MQvqz?+#xgn@&DgTZg@l8wCFOw4|3mu!}13WPB7SsWQbB9k|>nuF=LtoC49 HpUn{fTSgQ@ delta 64 zcmeys^MQvqz?+#xgn@&DgTcdY@kU;5CT0)2#hay>0wIii7Dq;q$mGqe=3x3Qt38<3 HXLAGq5b_az diff --git a/org.framed.iorm.editpolicydsl.ide/xtend-gen/org/framed/iorm/editpolicydsl/ide/.DslIdeSetup.xtendbin b/org.framed.iorm.editpolicydsl.ide/xtend-gen/org/framed/iorm/editpolicydsl/ide/.DslIdeSetup.xtendbin index 7afaef133cfa8d30173c76530ce30e63df14afa4..db645f3c5c08c274502e01c3570b2e9a8a0376d1 100644 GIT binary patch delta 64 zcmbOzJW-f8z?+#xgn@&DgTZg@l8wBXEX;mumu#+N`N{-l6tX8Uf*6ypaF~N>K2Ccu I9l+@b0Ad6bhX4Qo delta 64 zcmbOzJW-f8z?+#xgn@&DgTcdY@kZWE7G@8-#hWWxzA}Lsh3pB8Ajae?9Oht}kJBDZ I2XHz902i<k!vFvP diff --git a/org.framed.iorm.editpolicydsl.ide/xtend-gen/org/framed/iorm/editpolicydsl/ide/.gitignore b/org.framed.iorm.editpolicydsl.ide/xtend-gen/org/framed/iorm/editpolicydsl/ide/.gitignore index 6b161120..ddae2815 100644 --- a/org.framed.iorm.editpolicydsl.ide/xtend-gen/org/framed/iorm/editpolicydsl/ide/.gitignore +++ b/org.framed.iorm.editpolicydsl.ide/xtend-gen/org/framed/iorm/editpolicydsl/ide/.gitignore @@ -1,2 +1,6 @@ /.DslIdeModule.java._trace /.DslIdeSetup.java._trace +/.DslIdeModule.xtendbin +/.DslIdeSetup.xtendbin +/DslIdeModule.java +/DslIdeSetup.java diff --git a/org.framed.iorm.editpolicydsl.ui/xtend-gen/org/framed/iorm/editpolicydsl/ui/.DslUiModule.xtendbin b/org.framed.iorm.editpolicydsl.ui/xtend-gen/org/framed/iorm/editpolicydsl/ui/.DslUiModule.xtendbin index d100260a0075cec2c768e33c4ccf359919ef6736..9a5b81520806d2cab74f60e3e51043795694cf89 100644 GIT binary patch delta 64 zcmew=_*IZMz?+#xgn@&DgTa68l8wCQnV9|8F4=sa=?OEKaf~gW5yY5m!C?-ji#Y7T I^cD_B0JQNImH+?% delta 64 zcmew=_*IZMz?+#xgn@&DgTc#g@kZYBOw3+(i#OkAdcq859AnF81TiLCaF~PXA`W{n Iy@kUO0Bb}O*Z=?k diff --git a/org.framed.iorm.editpolicydsl.ui/xtend-gen/org/framed/iorm/editpolicydsl/ui/.gitignore b/org.framed.iorm.editpolicydsl.ui/xtend-gen/org/framed/iorm/editpolicydsl/ui/.gitignore index 3d352f14..fbe2a287 100644 --- a/org.framed.iorm.editpolicydsl.ui/xtend-gen/org/framed/iorm/editpolicydsl/ui/.gitignore +++ b/org.framed.iorm.editpolicydsl.ui/xtend-gen/org/framed/iorm/editpolicydsl/ui/.gitignore @@ -1 +1,3 @@ /.DslUiModule.java._trace +/.DslUiModule.xtendbin +/DslUiModule.java diff --git a/org.framed.iorm.editpolicydsl.ui/xtend-gen/org/framed/iorm/editpolicydsl/ui/contentassist/.DslProposalProvider.xtendbin b/org.framed.iorm.editpolicydsl.ui/xtend-gen/org/framed/iorm/editpolicydsl/ui/contentassist/.DslProposalProvider.xtendbin index e113b3c5dc6e1b1ddd57d895deb3e6d6b9719979..6bc64ea8a4aaf3196b8b3c289bfea50e063bbbd6 100644 GIT binary patch delta 64 zcmcb`dyAJhz?+#xgn@&DgTa68l8wAhOw9gkmuwDVYJo6rvN$q=L?+9!nS<$YHhVBV Hlg$wTWm6Ps delta 64 zcmcb`dyAJhz?+#xgn@&DgCWyy@kU-JCgx1L#hZheS|E&@ERKvIk;$@b=3qLU%^pn8 HWOD=nFW(Yn diff --git a/org.framed.iorm.editpolicydsl.ui/xtend-gen/org/framed/iorm/editpolicydsl/ui/contentassist/.gitignore b/org.framed.iorm.editpolicydsl.ui/xtend-gen/org/framed/iorm/editpolicydsl/ui/contentassist/.gitignore index a832923e..196a61ef 100644 --- a/org.framed.iorm.editpolicydsl.ui/xtend-gen/org/framed/iorm/editpolicydsl/ui/contentassist/.gitignore +++ b/org.framed.iorm.editpolicydsl.ui/xtend-gen/org/framed/iorm/editpolicydsl/ui/contentassist/.gitignore @@ -1 +1,3 @@ /.DslProposalProvider.java._trace +/.DslProposalProvider.xtendbin +/DslProposalProvider.java diff --git a/org.framed.iorm.editpolicydsl.ui/xtend-gen/org/framed/iorm/editpolicydsl/ui/labeling/.DslDescriptionLabelProvider.xtendbin b/org.framed.iorm.editpolicydsl.ui/xtend-gen/org/framed/iorm/editpolicydsl/ui/labeling/.DslDescriptionLabelProvider.xtendbin index 74f3fe606b1bbc6468c320fe8376409761099dc6..8cf2eff7e1f22f4a71d80eb7c45c900421fc163d 100644 GIT binary patch delta 64 zcmeC<@8jnU@MdNaVc_84VDMkNWFv1g6SM!?C7UNReTOi5SsfWcB9kw&nS*I=c6%`G H%kBsOW;hg` delta 64 zcmeC<@8jnU@MdNaVc_84VDPeAypgw=iP_6;@#e`)-yw`%R!2sV$mEM`=3tte-5yN) HvO59*9E%a( diff --git a/org.framed.iorm.editpolicydsl.ui/xtend-gen/org/framed/iorm/editpolicydsl/ui/labeling/.DslLabelProvider.xtendbin b/org.framed.iorm.editpolicydsl.ui/xtend-gen/org/framed/iorm/editpolicydsl/ui/labeling/.DslLabelProvider.xtendbin index a55dcdb65f4152d3827d3f2fd32fccf1cffbfbe7..9452df2120215da5b934ad8dce0c1c87b5703bc6 100644 GIT binary patch delta 64 zcmX>sbXbTtz?+#xgn@&DgTa68l8wAQ%*_64mu#NHYy)B3W?R7s5}Dk_VGgDbaM*)s HCQe5HfEyJ- delta 64 zcmX>sbXbTtz?+#xgn@&DgTc#g@kZVrW@azD#hd3a+dvq%*;X)uL?*X!n1ks99QI(E HiPI4PHf|Dw diff --git a/org.framed.iorm.editpolicydsl.ui/xtend-gen/org/framed/iorm/editpolicydsl/ui/labeling/.gitignore b/org.framed.iorm.editpolicydsl.ui/xtend-gen/org/framed/iorm/editpolicydsl/ui/labeling/.gitignore index 42f90a0b..c7d175ec 100644 --- a/org.framed.iorm.editpolicydsl.ui/xtend-gen/org/framed/iorm/editpolicydsl/ui/labeling/.gitignore +++ b/org.framed.iorm.editpolicydsl.ui/xtend-gen/org/framed/iorm/editpolicydsl/ui/labeling/.gitignore @@ -1,2 +1,6 @@ /.DslDescriptionLabelProvider.java._trace /.DslLabelProvider.java._trace +/.DslDescriptionLabelProvider.xtendbin +/.DslLabelProvider.xtendbin +/DslDescriptionLabelProvider.java +/DslLabelProvider.java diff --git a/org.framed.iorm.editpolicydsl.ui/xtend-gen/org/framed/iorm/editpolicydsl/ui/outline/.DslOutlineTreeProvider.xtendbin b/org.framed.iorm.editpolicydsl.ui/xtend-gen/org/framed/iorm/editpolicydsl/ui/outline/.DslOutlineTreeProvider.xtendbin index c44ebe697fd1b3560a1854fc42373842a19abc26..b2510fb55ddba71c46f773e097ddd0f120a01da3 100644 GIT binary patch delta 64 zcmey$`<0hBz?+#xgn@&DgTa68l8wA|Ow9gkmu&81N`^4LusAY;L?&CXnS<#fHhVC= Hh0PHFhlLel delta 64 zcmey$`<0hBz?+#xgn@&DgTc#g@kZV{CT1_Y#hd$>k|B&QERKvIk;xWp=3u&r%^pl| HVRHlkJ=hYY diff --git a/org.framed.iorm.editpolicydsl.ui/xtend-gen/org/framed/iorm/editpolicydsl/ui/outline/.gitignore b/org.framed.iorm.editpolicydsl.ui/xtend-gen/org/framed/iorm/editpolicydsl/ui/outline/.gitignore index 1a94c2a6..4b52d3f4 100644 --- a/org.framed.iorm.editpolicydsl.ui/xtend-gen/org/framed/iorm/editpolicydsl/ui/outline/.gitignore +++ b/org.framed.iorm.editpolicydsl.ui/xtend-gen/org/framed/iorm/editpolicydsl/ui/outline/.gitignore @@ -1 +1,3 @@ /.DslOutlineTreeProvider.java._trace +/.DslOutlineTreeProvider.xtendbin +/DslOutlineTreeProvider.java diff --git a/org.framed.iorm.editpolicydsl.ui/xtend-gen/org/framed/iorm/editpolicydsl/ui/quickfix/.DslQuickfixProvider.xtendbin b/org.framed.iorm.editpolicydsl.ui/xtend-gen/org/framed/iorm/editpolicydsl/ui/quickfix/.DslQuickfixProvider.xtendbin index 288c104c6b4522c002581a23ba35185e9a19b68e..a4b5288d5e5e5f32a23038c44b2cffaf75b27142 100644 GIT binary patch delta 64 zcmcc2dzqIvz?+#xgn@&DgTa68l8wCCOw9gkmu#+P3V|>#u{bh<L?(-|nS<#7HhVBV HiOmrJW}g&c delta 64 zcmcc2dzqIvz?+#xgn@&DgTc#g@kZWkCT1_Y#ha^{LLiJwERKvIk;!6g=3qL2%^plo HVsiul9P$yP diff --git a/org.framed.iorm.editpolicydsl.ui/xtend-gen/org/framed/iorm/editpolicydsl/ui/quickfix/.gitignore b/org.framed.iorm.editpolicydsl.ui/xtend-gen/org/framed/iorm/editpolicydsl/ui/quickfix/.gitignore index d0481310..9fa0e579 100644 --- a/org.framed.iorm.editpolicydsl.ui/xtend-gen/org/framed/iorm/editpolicydsl/ui/quickfix/.gitignore +++ b/org.framed.iorm.editpolicydsl.ui/xtend-gen/org/framed/iorm/editpolicydsl/ui/quickfix/.gitignore @@ -1 +1,3 @@ /.DslQuickfixProvider.java._trace +/.DslQuickfixProvider.xtendbin +/DslQuickfixProvider.java diff --git a/org.framed.iorm.editpolicydsl/xtend-gen/org/framed/iorm/editpolicydsl/.DslRuntimeModule.xtendbin b/org.framed.iorm.editpolicydsl/xtend-gen/org/framed/iorm/editpolicydsl/.DslRuntimeModule.xtendbin index c0c543fe5272384086cc18910ae475fa0f161ab3..b0414b47f6b0a6ba6a72276078bfbd764ea84f05 100644 GIT binary patch delta 64 zcmeC@?dRnU@MdNaVc_84VDMYJWFxOG6SLpiC7W%T{2+`z7Dq;q$mC0`=3ttK%^pnq Hu{i<&GRhM` delta 64 zcmeC@?dRnU@MdNaVc_84U~sovypdOziP_z5@n%~lKM13b#gP#tGWim#Ihf{Qvj@|D GY>oiuzz}u- diff --git a/org.framed.iorm.editpolicydsl/xtend-gen/org/framed/iorm/editpolicydsl/.DslStandaloneSetup.xtendbin b/org.framed.iorm.editpolicydsl/xtend-gen/org/framed/iorm/editpolicydsl/.DslStandaloneSetup.xtendbin index bcc72362c45edb442f2a188425c74d8b05777bb9..4632666180282ac670ad11a9df8fe718f3198224 100644 GIT binary patch delta 64 zcmaFH|BRnEz?+#xgn@&DgTZg@l8w9x%*=jkmuxOzwqyb`*05GFf*6xE+0DUpGP^yP IUdrwW0BySzrT_o{ delta 64 zcmaFH|BRnEz?+#xgn@&DgTdWy@kZVRW@dN0#hVM5Et$ZKHLO*PAjV`(c5^VD%x({+ Im$Ewo03yH<+yDRo diff --git a/org.framed.iorm.editpolicydsl/xtend-gen/org/framed/iorm/editpolicydsl/.gitignore b/org.framed.iorm.editpolicydsl/xtend-gen/org/framed/iorm/editpolicydsl/.gitignore index 7a7b3f9a..081a3adc 100644 --- a/org.framed.iorm.editpolicydsl/xtend-gen/org/framed/iorm/editpolicydsl/.gitignore +++ b/org.framed.iorm.editpolicydsl/xtend-gen/org/framed/iorm/editpolicydsl/.gitignore @@ -1,2 +1,6 @@ /.DslRuntimeModule.java._trace /.DslStandaloneSetup.java._trace +/.DslRuntimeModule.xtendbin +/.DslStandaloneSetup.xtendbin +/DslRuntimeModule.java +/DslStandaloneSetup.java diff --git a/org.framed.iorm.editpolicydsl/xtend-gen/org/framed/iorm/editpolicydsl/formatting2/.DslFormatter.xtendbin b/org.framed.iorm.editpolicydsl/xtend-gen/org/framed/iorm/editpolicydsl/formatting2/.DslFormatter.xtendbin index 88907cea012c6401e1620de8dfe5d3607b3902f4..3e57967ed10e7d3b9b8680bc19dbd447f7f46524 100644 GIT binary patch delta 64 zcmca9c2kTuz?+#xgn@&DgTZg@l8wCmEX;mumu#NT@}C*ZSjh2%5yY50hszvHU*oa| I(-Pc{0If3?ng9R* delta 64 zcmca9c2kTuz?+#xgn@&DgCWyy@kZW$7UoR5#hd4|{AUI;7IOSx1TiMh;W7u)*SPG# Iv;?;!0C;8;oB#j- diff --git a/org.framed.iorm.editpolicydsl/xtend-gen/org/framed/iorm/editpolicydsl/formatting2/.gitignore b/org.framed.iorm.editpolicydsl/xtend-gen/org/framed/iorm/editpolicydsl/formatting2/.gitignore index 43e5d334..62587496 100644 --- a/org.framed.iorm.editpolicydsl/xtend-gen/org/framed/iorm/editpolicydsl/formatting2/.gitignore +++ b/org.framed.iorm.editpolicydsl/xtend-gen/org/framed/iorm/editpolicydsl/formatting2/.gitignore @@ -1 +1,3 @@ /.DslFormatter.java._trace +/.DslFormatter.xtendbin +/DslFormatter.java diff --git a/org.framed.iorm.editpolicydsl/xtend-gen/org/framed/iorm/editpolicydsl/generator/.DslGenerator.xtendbin b/org.framed.iorm.editpolicydsl/xtend-gen/org/framed/iorm/editpolicydsl/generator/.DslGenerator.xtendbin index a1380b2e7abf42c77582abe6edbff99d25567caf..1fd7c44ca0987f3f88190cca8c9f0d63b552b490 100644 GIT binary patch delta 64 zcmcaAbybQtz?+#xgn@&DgTZg@l8wAP?96^^mu!|{U&{<;oZ&jj2x3g0!D9}lFY(xe IX%SvW0C`IlKmY&$ delta 64 zcmcaAbybQtz?+#xgn@&DgTdWy@kU-Ac4l|G#hYc=*D`|{XShx>f*6x$@R)<?OFZ^q IT7=gT04`7xb^rhX diff --git a/org.framed.iorm.editpolicydsl/xtend-gen/org/framed/iorm/editpolicydsl/generator/.gitignore b/org.framed.iorm.editpolicydsl/xtend-gen/org/framed/iorm/editpolicydsl/generator/.gitignore index 3548ffd5..aef33840 100644 --- a/org.framed.iorm.editpolicydsl/xtend-gen/org/framed/iorm/editpolicydsl/generator/.gitignore +++ b/org.framed.iorm.editpolicydsl/xtend-gen/org/framed/iorm/editpolicydsl/generator/.gitignore @@ -1 +1,3 @@ /.DslGenerator.java._trace +/.DslGenerator.xtendbin +/DslGenerator.java diff --git a/org.framed.iorm.editpolicydsl/xtend-gen/org/framed/iorm/editpolicydsl/scoping/.DslScopeProvider.xtendbin b/org.framed.iorm.editpolicydsl/xtend-gen/org/framed/iorm/editpolicydsl/scoping/.DslScopeProvider.xtendbin index eb95f62dfba2e589639a865f9ed366e321ca617f..cd609509301dd2df7c33b8da44d3ecd5f4054a6c 100644 GIT binary patch delta 64 zcmdnayPcOez?+#xgn@&DgTZg@l8wB<Ow4|3muyaE3V<-Su{bh<L?-`YH3!osZ1!Nf HjLi`MTuu~z delta 64 zcmdnayPcOez?+#xgn@&DgTdWy@kZWYCT4fL#ha6v0w9cSERKvIk;%VU&B3$@n?0B= HV{-%m5mOPg diff --git a/org.framed.iorm.editpolicydsl/xtend-gen/org/framed/iorm/editpolicydsl/scoping/.gitignore b/org.framed.iorm.editpolicydsl/xtend-gen/org/framed/iorm/editpolicydsl/scoping/.gitignore index 9735d986..df6cdbd9 100644 --- a/org.framed.iorm.editpolicydsl/xtend-gen/org/framed/iorm/editpolicydsl/scoping/.gitignore +++ b/org.framed.iorm.editpolicydsl/xtend-gen/org/framed/iorm/editpolicydsl/scoping/.gitignore @@ -1 +1,3 @@ /.DslScopeProvider.java._trace +/.DslScopeProvider.xtendbin +/DslScopeProvider.java diff --git a/org.framed.iorm.editpolicydsl/xtend-gen/org/framed/iorm/editpolicydsl/validation/.DslValidator.xtendbin b/org.framed.iorm.editpolicydsl/xtend-gen/org/framed/iorm/editpolicydsl/validation/.DslValidator.xtendbin index 377076038449c99b2fc8341a10ccfeadb3c477a7..4c1a2a55807f969945fb0c7f523a7dae4b47f762 100644 GIT binary patch delta 64 zcmZ3+yNs7Nz?+#xgn@&DgTZg@l8wCPOw4|3muz-tiiR+jvN$q=L?*vvH3!qmZ1!L} HmCX?VNQe{b delta 64 zcmZ3+yNs7Nz?+#xgn@&DgTdWy@kU;ACT4fL#hcxkq9Kf>ERKvIk;yMv&B3%Xn?0CL HWpe}o{eBT4 diff --git a/org.framed.iorm.editpolicydsl/xtend-gen/org/framed/iorm/editpolicydsl/validation/.gitignore b/org.framed.iorm.editpolicydsl/xtend-gen/org/framed/iorm/editpolicydsl/validation/.gitignore index ef5c5e45..18e6cefa 100644 --- a/org.framed.iorm.editpolicydsl/xtend-gen/org/framed/iorm/editpolicydsl/validation/.gitignore +++ b/org.framed.iorm.editpolicydsl/xtend-gen/org/framed/iorm/editpolicydsl/validation/.gitignore @@ -1 +1,3 @@ /.DslValidator.java._trace +/.DslValidator.xtendbin +/DslValidator.java -- GitLab