Index: Application/Ringtoets/src/Application.Ringtoets.Setup/Licentie.rtf =================================================================== diff -u -ra3c8c0cb4384de51a18d77cc7bea487f97ba21e1 -rd971fe1df4d36020e33ad952830f71a9a605d860 --- Application/Ringtoets/src/Application.Ringtoets.Setup/Licentie.rtf (.../Licentie.rtf) (revision a3c8c0cb4384de51a18d77cc7bea487f97ba21e1) +++ Application/Ringtoets/src/Application.Ringtoets.Setup/Licentie.rtf (.../Licentie.rtf) (revision d971fe1df4d36020e33ad952830f71a9a605d860) @@ -1,15 +1,15 @@ {\rtf1\adeflang1025\ansi\ansicpg1252\uc1\adeff0\deff0\stshfdbch31505\stshfloch31506\stshfhich31506\stshfbi0\deflang2057\deflangfe2052\themelang2057\themelangfe2052\themelangcs0{\fonttbl{\f0\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\f2\fbidi \fmodern\fcharset0\fprq1{\*\panose 02070309020205020404}Courier New;} -{\f13\fbidi \fnil\fcharset134\fprq2{\*\panose 02010600030101010101}SimSun{\*\falt ????????????????????\'a1\'a7??????????};}{\f34\fbidi \froman\fcharset0\fprq2{\*\panose 02040503050406030204}Cambria Math;} -{\f37\fbidi \fswiss\fcharset0\fprq2{\*\panose 020f0502020204030204}Calibri;}{\f38\fbidi \fswiss\fcharset0\fprq2{\*\panose 020b0604030504040204}Tahoma;}{\f43\fbidi \fnil\fcharset134\fprq2{\*\panose 00000000000000000000}@SimSun;} -{\flomajor\f31500\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\fdbmajor\f31501\fbidi \fnil\fcharset134\fprq2{\*\panose 02010600030101010101}SimSun{\*\falt ????????????????????\'a1\'a7??????????};} +{\f13\fbidi \fnil\fcharset134\fprq2{\*\panose 02010600030101010101}SimSun{\*\falt ?????????????????????\'a1\'ec?????????};}{\f34\fbidi \froman\fcharset0\fprq2{\*\panose 02040503050406030204}Cambria Math;} +{\f37\fbidi \fswiss\fcharset0\fprq2{\*\panose 020f0502020204030204}Calibri;}{\f38\fbidi \fswiss\fcharset0\fprq2{\*\panose 020b0604030504040204}Tahoma;}{\f43\fbidi \fnil\fcharset134\fprq2{\*\panose 02010600030101010101}@SimSun;} +{\flomajor\f31500\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\fdbmajor\f31501\fbidi \fnil\fcharset134\fprq2{\*\panose 02010600030101010101}SimSun{\*\falt ?????????????????????\'a1\'ec?????????};} {\fhimajor\f31502\fbidi \froman\fcharset0\fprq2{\*\panose 02040503050406030204}Cambria;}{\fbimajor\f31503\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;} -{\flominor\f31504\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\fdbminor\f31505\fbidi \fnil\fcharset134\fprq2{\*\panose 02010600030101010101}SimSun{\*\falt ????????????????????\'a1\'a7??????????};} +{\flominor\f31504\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\fdbminor\f31505\fbidi \fnil\fcharset134\fprq2{\*\panose 02010600030101010101}SimSun{\*\falt ?????????????????????\'a1\'ec?????????};} {\fhiminor\f31506\fbidi \fswiss\fcharset0\fprq2{\*\panose 020f0502020204030204}Calibri;}{\fbiminor\f31507\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\f44\fbidi \froman\fcharset238\fprq2 Times New Roman CE;} {\f45\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\f47\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\f48\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\f49\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);} {\f50\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\f51\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\f52\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\f64\fbidi \fmodern\fcharset238\fprq1 Courier New CE;} {\f65\fbidi \fmodern\fcharset204\fprq1 Courier New Cyr;}{\f67\fbidi \fmodern\fcharset161\fprq1 Courier New Greek;}{\f68\fbidi \fmodern\fcharset162\fprq1 Courier New Tur;}{\f69\fbidi \fmodern\fcharset177\fprq1 Courier New (Hebrew);} {\f70\fbidi \fmodern\fcharset178\fprq1 Courier New (Arabic);}{\f71\fbidi \fmodern\fcharset186\fprq1 Courier New Baltic;}{\f72\fbidi \fmodern\fcharset163\fprq1 Courier New (Vietnamese);} -{\f176\fbidi \fnil\fcharset0\fprq2 SimSun Western{\*\falt ????????????????????\'a1\'a7??????????};}{\f384\fbidi \froman\fcharset238\fprq2 Cambria Math CE;}{\f385\fbidi \froman\fcharset204\fprq2 Cambria Math Cyr;} +{\f176\fbidi \fnil\fcharset0\fprq2 SimSun Western{\*\falt ?????????????????????\'a1\'ec?????????};}{\f384\fbidi \froman\fcharset238\fprq2 Cambria Math CE;}{\f385\fbidi \froman\fcharset204\fprq2 Cambria Math Cyr;} {\f387\fbidi \froman\fcharset161\fprq2 Cambria Math Greek;}{\f388\fbidi \froman\fcharset162\fprq2 Cambria Math Tur;}{\f391\fbidi \froman\fcharset186\fprq2 Cambria Math Baltic;}{\f392\fbidi \froman\fcharset163\fprq2 Cambria Math (Vietnamese);} {\f414\fbidi \fswiss\fcharset238\fprq2 Calibri CE;}{\f415\fbidi \fswiss\fcharset204\fprq2 Calibri Cyr;}{\f417\fbidi \fswiss\fcharset161\fprq2 Calibri Greek;}{\f418\fbidi \fswiss\fcharset162\fprq2 Calibri Tur;} {\f421\fbidi \fswiss\fcharset186\fprq2 Calibri Baltic;}{\f422\fbidi \fswiss\fcharset163\fprq2 Calibri (Vietnamese);}{\f424\fbidi \fswiss\fcharset238\fprq2 Tahoma CE;}{\f425\fbidi \fswiss\fcharset204\fprq2 Tahoma Cyr;} @@ -18,15 +18,15 @@ {\flomajor\f31508\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\flomajor\f31509\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\flomajor\f31511\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;} {\flomajor\f31512\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\flomajor\f31513\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\flomajor\f31514\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);} {\flomajor\f31515\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\flomajor\f31516\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);} -{\fdbmajor\f31520\fbidi \fnil\fcharset0\fprq2 SimSun Western{\*\falt ????????????????????\'a1\'a7??????????};}{\fhimajor\f31528\fbidi \froman\fcharset238\fprq2 Cambria CE;}{\fhimajor\f31529\fbidi \froman\fcharset204\fprq2 Cambria Cyr;} +{\fdbmajor\f31520\fbidi \fnil\fcharset0\fprq2 SimSun Western{\*\falt ?????????????????????\'a1\'ec?????????};}{\fhimajor\f31528\fbidi \froman\fcharset238\fprq2 Cambria CE;}{\fhimajor\f31529\fbidi \froman\fcharset204\fprq2 Cambria Cyr;} {\fhimajor\f31531\fbidi \froman\fcharset161\fprq2 Cambria Greek;}{\fhimajor\f31532\fbidi \froman\fcharset162\fprq2 Cambria Tur;}{\fhimajor\f31535\fbidi \froman\fcharset186\fprq2 Cambria Baltic;} {\fhimajor\f31536\fbidi \froman\fcharset163\fprq2 Cambria (Vietnamese);}{\fbimajor\f31538\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\fbimajor\f31539\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;} {\fbimajor\f31541\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\fbimajor\f31542\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\fbimajor\f31543\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);} {\fbimajor\f31544\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\fbimajor\f31545\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\fbimajor\f31546\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);} {\flominor\f31548\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\flominor\f31549\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\flominor\f31551\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;} {\flominor\f31552\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\flominor\f31553\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\flominor\f31554\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);} {\flominor\f31555\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\flominor\f31556\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);} -{\fdbminor\f31560\fbidi \fnil\fcharset0\fprq2 SimSun Western{\*\falt ????????????????????\'a1\'a7??????????};}{\fhiminor\f31568\fbidi \fswiss\fcharset238\fprq2 Calibri CE;}{\fhiminor\f31569\fbidi \fswiss\fcharset204\fprq2 Calibri Cyr;} +{\fdbminor\f31560\fbidi \fnil\fcharset0\fprq2 SimSun Western{\*\falt ?????????????????????\'a1\'ec?????????};}{\fhiminor\f31568\fbidi \fswiss\fcharset238\fprq2 Calibri CE;}{\fhiminor\f31569\fbidi \fswiss\fcharset204\fprq2 Calibri Cyr;} {\fhiminor\f31571\fbidi \fswiss\fcharset161\fprq2 Calibri Greek;}{\fhiminor\f31572\fbidi \fswiss\fcharset162\fprq2 Calibri Tur;}{\fhiminor\f31575\fbidi \fswiss\fcharset186\fprq2 Calibri Baltic;} {\fhiminor\f31576\fbidi \fswiss\fcharset163\fprq2 Calibri (Vietnamese);}{\fbiminor\f31578\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\fbiminor\f31579\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;} {\fbiminor\f31581\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\fbiminor\f31582\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\fbiminor\f31583\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);} @@ -45,11 +45,11 @@ \sbasedon10 \slink19 \slocked \ssemihidden \styrsid7675473 Balloon Text Char;}{\s21\ql \li720\ri0\sa200\sl276\slmult1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin720\itap0\contextualspace \rtlch\fcs1 \af0\afs22\alang1025 \ltrch\fcs0 \fs22\lang2057\langfe2052\loch\f31506\hich\af31506\dbch\af31505\cgrid\langnp2057\langfenp2052 \sbasedon0 \snext21 \sqformat \spriority34 \styrsid1010843 List Paragraph;}}{\*\rsidtbl \rsid23861\rsid488029\rsid799973\rsid984897\rsid1010843\rsid1055020 \rsid1180769\rsid1201894\rsid1206572\rsid1391986\rsid1800570\rsid1862769\rsid1918796\rsid2112962\rsid2185294\rsid2448324\rsid2703580\rsid3020322\rsid3093214\rsid3426710\rsid3474088\rsid3612330\rsid3686156\rsid4150084\rsid4392039\rsid4733976\rsid4742281 -\rsid5267739\rsid5593428\rsid5862844\rsid5910193\rsid6624093\rsid6822061\rsid6904447\rsid6947589\rsid7414554\rsid7672292\rsid7675473\rsid7691196\rsid7881760\rsid8282417\rsid8336808\rsid8355315\rsid8415516\rsid8471656\rsid8613675\rsid9251590\rsid9259169 -\rsid9259511\rsid9324301\rsid9447286\rsid9534683\rsid9597286\rsid9837452\rsid10243997\rsid10645519\rsid10889275\rsid10903480\rsid10907227\rsid10965045\rsid10969153\rsid11404854\rsid11541481\rsid11865015\rsid11875882\rsid12255994\rsid12603449\rsid12614763 -\rsid12714335\rsid12780684\rsid12874015\rsid12992049\rsid13187850\rsid13327662\rsid13378822\rsid13707436\rsid13846203\rsid13923732\rsid14042855\rsid14624369\rsid14690030\rsid14697806\rsid14769386\rsid15292511\rsid15341850\rsid15549573\rsid15600639 -\rsid15998385\rsid16073068\rsid16086011\rsid16653078}{\mmathPr\mmathFont34\mbrkBin0\mbrkBinSub0\msmallFrac0\mdispDef1\mlMargin0\mrMargin0\mdefJc1\mwrapIndent1440\mintLim0\mnaryLim1}{\info{\title License Agreement}{\author Deltares} -{\operator Bas des Bouvrie}{\creatim\yr2016\mo1\dy13\hr16\min25}{\revtim\yr2016\mo2\dy19\hr15}{\printim\yr2016\mo1\dy13\hr13\min29}{\version27}{\edmins29}{\nofpages3}{\nofwords861}{\nofchars4912}{\*\company Stichting Deltares}{\nofcharsws5762} +\rsid5267739\rsid5593428\rsid5862844\rsid5910193\rsid6624093\rsid6822061\rsid6904447\rsid6947589\rsid7414554\rsid7672292\rsid7675473\rsid7691196\rsid7822308\rsid7881760\rsid8282417\rsid8336808\rsid8355315\rsid8415516\rsid8471656\rsid8613675\rsid9251590 +\rsid9259169\rsid9259511\rsid9324301\rsid9447286\rsid9534683\rsid9597286\rsid9837452\rsid10243997\rsid10645519\rsid10889275\rsid10903480\rsid10907227\rsid10965045\rsid10969153\rsid11404854\rsid11541481\rsid11865015\rsid11875882\rsid12255994\rsid12603449 +\rsid12614763\rsid12714335\rsid12780684\rsid12874015\rsid12992049\rsid13187850\rsid13327662\rsid13378822\rsid13707436\rsid13846203\rsid13923732\rsid14042855\rsid14624369\rsid14690030\rsid14697806\rsid14769386\rsid15292511\rsid15341850\rsid15549573 +\rsid15600639\rsid15998385\rsid16073068\rsid16086011\rsid16653078}{\mmathPr\mmathFont34\mbrkBin0\mbrkBinSub0\msmallFrac0\mdispDef1\mlMargin0\mrMargin0\mdefJc1\mwrapIndent1440\mintLim0\mnaryLim1}{\info{\title License Agreement}{\author Deltares} +{\operator Bas des Bouvrie}{\creatim\yr2016\mo1\dy13\hr16\min25}{\revtim\yr2016\mo2\dy25\hr14\min21}{\printim\yr2016\mo1\dy13\hr13\min29}{\version28}{\edmins30}{\nofpages3}{\nofwords856}{\nofchars4882}{\*\company Stichting Deltares}{\nofcharsws5727} {\vern49167}}{\*\xmlnstbl {\xmlns1 http://schemas.microsoft.com/office/word/2003/wordml}}\paperw12240\paperh15840\margl1440\margr1440\margt1440\margb1440\gutter0\ltrsect \widowctrl\ftnbj\aenddoc\hyphhotz425\trackmoves0\trackformatting1\donotembedsysfont1\relyonvml0\donotembedlingdata0\grfdocevents0\validatexml1\showplaceholdtext0\ignoremixedcontent0\saveinvalidxml0\showxmlerrors1 \noxlattoyen\expshrtn\noultrlspc\dntblnsbdb\nospaceforul\formshade\horzdoc\dgmargin\dghspace180\dgvspace180\dghorigin1440\dgvorigin1440\dghshow1\dgvshow1 @@ -206,23 +206,23 @@ \par }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\insrsid1055020 \hich\af2\dbch\af31505\loch\f2 8}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\insrsid12714335 \hich\af2\dbch\af31505\loch\f2 . Ringtoets.HydraRing.Data.dll \par }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\insrsid1055020 \hich\af2\dbch\af31505\loch\f2 9}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\insrsid6947589 \hich\af2\dbch\af31505\loch\f2 . Ringtoets.HydraRing.Forms}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\insrsid4392039 \hich\af2\dbch\af31505\loch\f2 .dll -\par }\pard \ltrpar\ql \fi-360\li1215\ri0\nowidctlpar\wrapdefault\faauto\rin0\lin1215\itap0\pararsid8282417 {\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\insrsid8282417 \hich\af2\dbch\af31505\loch\f2 10\hich\af2\dbch\af31505\loch\f2 . Ringtoets.HydraRing.IO.dll - -\par \hich\af2\dbch\af31505\loch\f2 11. Ringtoets.HydraRing.Plugin.dll}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\insrsid8282417\charrsid13327662 +\par }\pard \ltrpar\ql \fi-360\li1215\ri0\nowidctlpar\wrapdefault\faauto\rin0\lin1215\itap0\pararsid7822308 {\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\insrsid8282417 \hich\af2\dbch\af31505\loch\f2 10\hich\af2\dbch\af31505\loch\f2 . Ringtoets.HydraRing.IO.dll +}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\insrsid8282417\charrsid13327662 \par }\pard \ltrpar\ql \fi-360\li1215\ri0\nowidctlpar\wrapdefault\faauto\rin0\lin1215\itap0\pararsid15600639 {\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\insrsid1055020 \hich\af2\dbch\af31505\loch\f2 1}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 -\f2\fs21\insrsid8282417 \hich\af2\dbch\af31505\loch\f2 2}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\insrsid15600639\charrsid13327662 \hich\af2\dbch\af31505\loch\f2 . Ringtoets.Integration.Data.dll -\par }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\insrsid8282417 \hich\af2\dbch\af31505\loch\f2 13}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\insrsid15600639\charrsid13327662 \hich\af2\dbch\af31505\loch\f2 . Ringtoets.Integration}{\rtlch\fcs1 \af2\afs21 +\f2\fs21\insrsid7822308 \hich\af2\dbch\af31505\loch\f2 1}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\insrsid15600639\charrsid13327662 \hich\af2\dbch\af31505\loch\f2 . Ringtoets.Integration.Data.dll +\par }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\insrsid7822308 \hich\af2\dbch\af31505\loch\f2 12}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\insrsid15600639\charrsid13327662 \hich\af2\dbch\af31505\loch\f2 . Ringtoets.Integration}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\insrsid15600639\charrsid15600639 \hich\af2\dbch\af31505\loch\f2 .Forms.dll -\par }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\insrsid8282417 \hich\af2\dbch\af31505\loch\f2 14}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\insrsid15600639\charrsid15600639 \hich\af2\dbch\af31505\loch\f2 . Ringtoets.Integration.Plugin.dll -\par }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\insrsid8282417 \hich\af2\dbch\af31505\loch\f2 15}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\insrsid15600639\charrsid15600639 \hich\af2\dbch\af31505\loch\f2 . Ringtoets.Piping.Calculation.dll -\par }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\insrsid8282417 \hich\af2\dbch\af31505\loch\f2 16}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\insrsid15600639\charrsid15600639 \hich\af2\dbch\af31505\loch\f2 . Ringtoets.Piping.Data.dll -\par }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\insrsid8282417 \hich\af2\dbch\af31505\loch\f2 17}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\insrsid15600639\charrsid15600639 \hich\af2\dbch\af31505\loch\f2 . Ringtoets.Piping.Forms.dll -\par }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\insrsid8282417 \hich\af2\dbch\af31505\loch\f2 18}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\insrsid15600639\charrsid15600639 \hich\af2\dbch\af31505\loch\f2 . Ringtoets.Piping.IO.dll -\par }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\insrsid8282417 \hich\af2\dbch\af31505\loch\f2 19}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\insrsid15600639\charrsid15600639 \hich\af2\dbch\af31505\loch\f2 . Ringtoets.Piping.Plugin.dll -\par }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\insrsid8282417 \hich\af2\dbch\af31505\loch\f2 20}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\insrsid15600639\charrsid15600639 \hich\af2\dbch\af31505\loch\f2 . Ringtoets.Piping.Service.dll +\par }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\insrsid7822308 \hich\af2\dbch\af31505\loch\f2 13}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\insrsid15600639\charrsid15600639 \hich\af2\dbch\af31505\loch\f2 . Ringtoets.Integration.Plugin.dll +\par }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\insrsid7822308 \hich\af2\dbch\af31505\loch\f2 14}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\insrsid15600639\charrsid15600639 \hich\af2\dbch\af31505\loch\f2 . Ringtoets.Piping.Calculation.dll +\par }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\insrsid7822308 \hich\af2\dbch\af31505\loch\f2 15}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\insrsid15600639\charrsid15600639 \hich\af2\dbch\af31505\loch\f2 . Ringtoets.Piping.Data.dll +\par }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\insrsid7822308 \hich\af2\dbch\af31505\loch\f2 16}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\insrsid15600639\charrsid15600639 \hich\af2\dbch\af31505\loch\f2 . Ringtoets.Piping.Forms.dll +\par }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\insrsid7822308 \hich\af2\dbch\af31505\loch\f2 17}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\insrsid15600639\charrsid15600639 \hich\af2\dbch\af31505\loch\f2 . Ringtoets.Piping.IO.dll +\par }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\insrsid7822308 \hich\af2\dbch\af31505\loch\f2 18}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\insrsid15600639\charrsid15600639 \hich\af2\dbch\af31505\loch\f2 . Ringtoets.Piping.Plugin.dll +\par }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\insrsid7822308 \hich\af2\dbch\af31505\loch\f2 19}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\insrsid15600639\charrsid15600639 \hich\af2\dbch\af31505\loch\f2 . Ringtoets.Piping.Service.dll \par }\pard \ltrpar\ql \li0\ri0\nowidctlpar\wrapdefault\faauto\rin0\lin0\itap0\pararsid15600639 {\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\insrsid15600639\charrsid15600639 -\par }{\rtlch\fcs1 \ab\af2\afs24 \ltrch\fcs0 \b\f2\fs24\insrsid15600639\charrsid8355315 \hich\af2\dbch\af31505\loch\f2 A. \tab }{\rtlch\fcs1 \ab\af2\afs24 \ltrch\fcs0 \b\f2\fs24\lang1043\langfe2052\langnp1043\insrsid15600639\charrsid1800570 -\hich\af2\dbch\af31505\loch\f2 \hich\f2 Software licentievoorwaarden onder de \'93\loch\f2 \hich\f2 GNU LESSER GENERAL PUBLIC LICENSE\'94\loch\f2 versie 3 zoals gepubliceerd door de Free Software Found\hich\af2\dbch\af31505\loch\f2 ation. +\par }{\rtlch\fcs1 \ab\af2\afs24 \ltrch\fcs0 \b\f2\fs24\lang1043\langfe2052\langnp1043\insrsid15600639\charrsid7822308 \hich\af2\dbch\af31505\loch\f2 A. \tab }{\rtlch\fcs1 \ab\af2\afs24 \ltrch\fcs0 +\b\f2\fs24\lang1043\langfe2052\langnp1043\insrsid15600639\charrsid1800570 \hich\af2\dbch\af31505\loch\f2 \hich\f2 Software licentievoorwaarden onder de \'93\loch\f2 \hich\f2 GNU LESSER GENERAL PUBLIC LICENSE\'94\loch\f2 + versie 3 zoals gepubliceerd door de Free Software Found\hich\af2\dbch\af31505\loch\f2 ation. \par }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639\charrsid1800570 \par }\pard \ltrpar\ql \li0\ri0\nowidctlpar\wrapdefault\faauto\rin0\lin0\itap0\pararsid9259511 {\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639\charrsid5593428 \hich\af2\dbch\af31505\loch\f2 1. }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid9259511\charrsid1010843 \hich\af2\dbch\af31505\loch\f2 Dit programma genaamd \hich\f2 \lquote \loch\f2 Ringtoets\hich\f2 \rquote \loch\f2 @@ -239,7 +239,7 @@ \par }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15549573 \hich\af2\dbch\af31505\loch\f2 3}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639\charrsid14624369 \hich\af2\dbch\af31505\loch\f2 . U mag het programma }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639 \hich\af2\dbch\af31505\loch\f2 zelf verder verspreiden}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639\charrsid14624369 \hich\af2\dbch\af31505\loch\f2 en/of aanpassen }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid1010843 \hich\af2\dbch\af31505\loch\f2 -overeenkomstig }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639\charrsid14624369 \hich\af2\dbch\af31505\loch\f2 de GNU Lesser General Public License versie 3. +overeenkomstig }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639\charrsid14624369 \hich\af2\dbch\af31505\loch\f2 de GNU Lesser Genera\hich\af2\dbch\af31505\loch\f2 l Public License versie 3. \par \par }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15549573 \hich\af2\dbch\af31505\loch\f2 4}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639\charrsid14624369 \hich\af2\dbch\af31505\loch\f2 . Het programma wordt verspreid in de hoop dat het van nut is, maar ZONDER ENIGE GA}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639 \hich\af2\dbch\af31505\loch\f2 RANTIE}{ @@ -249,18 +249,18 @@ voor meer details. \par \par }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15549573 \hich\af2\dbch\af31505\loch\f2 5}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639\charrsid14624369 -\hich\af2\dbch\af31505\loch\f2 . De tekst van de GNU Lesser G\hich\af2\dbch\af31505\loch\f2 eneral Public License }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639 \hich\af2\dbch\af31505\loch\f2 versie 3 }{ +\hich\af2\dbch\af31505\loch\f2 . De tekst van de GNU Lesser General Public License\hich\af2\dbch\af31505\loch\f2 }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639 \hich\af2\dbch\af31505\loch\f2 versie 3 }{ \rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639\charrsid14624369 \hich\af2\dbch\af31505\loch\f2 wordt gezamenlijk met de Software}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639 \hich\af2\dbch\af31505\loch\f2 geleverd}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639\charrsid14624369 \hich\af2\dbch\af31505\loch\f2 . }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639\charrsid5593428 \hich\af2\dbch\af31505\loch\f2 Zo niet, zie dan }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid4150084 \hich\af2\dbch\af31505\loch\f2 <}{\field\fldedit{\*\fldinst {\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639 \hich\af2\dbch\af31505\loch\f2 HYPERLINK "}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639\charrsid1800570 \hich\af2\dbch\af31505\loch\f2 http://www.gnu.org/licenses/lgpl-3.0.en.html}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639 \hich\af2\dbch\af31505\loch\f2 " }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639 {\*\datafield 00d0c9ea79f9bace118c8200aa004ba90b0200000003000000e0c9ea79f9bace118c8200aa004ba90b7200000068007400740070003a002f002f007700770077002e0067006e0075002e006f00720067002f006c006900630065006e007300650073002f006c00670070006c002d0033002e0030002e0065006e002e006800 -74006d006c000000795881f43b1d7f48af2c825dc485276300000000a5ab0000000000004400e900006e14ec68d800000000000700b2004f000000ec}}}{\fldrslt {\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \cs15\f2\fs21\ul\cf17\lang1043\langfe2052\langnp1043\insrsid15600639\charrsid9534683 -\hich\af2\dbch\af31505\loch\f2 http://www.gnu.org/licenses/lgpl-3.0.en.html}}}\sectd \ltrsect\linex0\headery708\footery708\colsx708\sectdefaultcl\sftnbj {\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid4150084 -\hich\af2\dbch\af31505\loch\f2 >}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid12603449 \hich\af2\dbch\af31505\loch\f2 }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639 -\hich\af2\dbch\af31505\loch\f2 voor de tekst}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639\charrsid5593428 . +74006d006c000000795881f43b1d7f48af2c825dc485276300000000a5ab0000000000004400e900006e14ec68d800000000000700b2004f000000ec00}}}{\fldrslt {\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 +\cs15\f2\fs21\ul\cf17\lang1043\langfe2052\langnp1043\insrsid15600639\charrsid9534683 \hich\af2\dbch\af31505\loch\f2 http://www.gnu.org/licenses/lgpl-3.0.en.html}}}\sectd \ltrsect\linex0\headery708\footery708\colsx708\sectdefaultcl\sftnbj {\rtlch\fcs1 +\af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid4150084 \hich\af2\dbch\af31505\loch\f2 >}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid12603449 \hich\af2\dbch\af31505\loch\f2 }{\rtlch\fcs1 +\af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639 \hich\af2\dbch\af31505\loch\f2 voor de tekst}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639\charrsid5593428 . \par \par }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15549573 \hich\af2\dbch\af31505\loch\f2 6}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639\charrsid14624369 \hich\af2\dbch\af31505\loch\f2 . Alle namen}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid14769386 \hich\af2\dbch\af31505\loch\f2 , }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 @@ -272,15 +272,14 @@ \par \par }\pard \ltrpar\ql \li855\ri0\nowidctlpar\wrapdefault\faauto\rin0\lin855\itap0\pararsid15600639 {\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639\charrsid13187850 \par }\pard \ltrpar\ql \li0\ri0\nowidctlpar\wrapdefault\faauto\rin0\lin0\itap0\pararsid15600639 {\rtlch\fcs1 \ab\af2\afs24 \ltrch\fcs0 \b\f2\fs24\lang1043\langfe2052\langnp1043\insrsid15600639\charrsid5593428 \hich\af2\dbch\af31505\loch\f2 B.\tab }{ -\rtlch\fcs1 \ab\af2\afs24 \ltrch\fcs0 \b\f2\fs24\lang1043\langfe2052\langnp1043\insrsid15600639\charrsid1800570 \hich\af2\dbch\af31505\loch\f2 \hich\f2 Software licentievoorwaarden onder de \'93\loch\f2 \hich\f2 GNU GENERAL PUBLIC LICENSE\'94\loch\f2 - versie 3 zoals gepubliceerd door de Free Software Foundation.}{\rtlch\fcs1 \ab\af2\afs24 \ltrch\fcs0 \b\f2\fs24\lang1043\langfe2052\langnp1043\insrsid15600639\charrsid5593428 +\rtlch\fcs1 \ab\af2\afs24 \ltrch\fcs0 \b\f2\fs24\lang1043\langfe2052\langnp1043\insrsid15600639\charrsid1800570 \hich\af2\dbch\af31505\loch\f2 \hich\f2 Software licentievoorwaarden onder de \'93\loch\f2 \hich\f2 GNU GENERAL PUBLIC LICENSE\'94 +\hich\af2\dbch\af31505\loch\f2 versie 3 zoals gepubliceerd door de Free Software Foundation.}{\rtlch\fcs1 \ab\af2\afs24 \ltrch\fcs0 \b\f2\fs24\lang1043\langfe2052\langnp1043\insrsid15600639\charrsid5593428 \par }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639\charrsid1800570 \par }\pard \ltrpar\ql \li0\ri0\nowidctlpar\wrapdefault\faauto\rin0\lin0\itap0\pararsid16073068 {\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639\charrsid5593428 \hich\af2\dbch\af31505\loch\f2 1. }{\rtlch\fcs1 -\af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid16073068\charrsid1010843 \hich\af2\dbch\af31505\loch\f2 Dit programma genaamd \hich\f2 \lquote \loch\f2 Ringtoets\hich\f2 \rquote \hich\af2\dbch\af31505\loch\f2 +\af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid16073068\charrsid1010843 \hich\af2\dbch\af31505\loch\f2 Dit programma genaamd \hich\f2 \lquote \loch\f2 Ringtoets\hich\f2 \rquote \loch\f2 is software voor het gebruik bij het toetsen van dijken overeenkomstig het }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid16073068 \hich\af2\dbch\af31505\loch\f2 WTI 2017 }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 -\f2\fs21\lang1043\langfe2052\langnp1043\insrsid16073068\charrsid1010843 \hich\af2\dbch\af31505\loch\f2 -voor dijken. Ringtoets is nog in ontwikkeling en nog niet voldoende getest om te gebruiken anders dan voor kennisname van haar functionaliteiten. Ieder ander gebruik wordt\hich\af2\dbch\af31505\loch\f2 ten stelligste afgeraden door Deltares. }{ -\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid16073068 +\f2\fs21\lang1043\langfe2052\langnp1043\insrsid16073068\charrsid1010843 \hich\af2\dbch\af31505\loch\f2 voor dijken. Ringtoets is nog in ontwikkeling en nog niet voldoende get\hich\af2\dbch\af31505\loch\f2 +est om te gebruiken anders dan voor kennisname van haar functionaliteiten. Ieder ander gebruik wordt ten stelligste afgeraden door Deltares. }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid16073068 \par }\pard \ltrpar\ql \li0\ri0\nowidctlpar\wrapdefault\faauto\rin0\lin0\itap0\pararsid15600639 {\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15549573 \par \hich\af2\dbch\af31505\loch\f2 2. }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639\charrsid5593428 \hich\af2\dbch\af31505\loch\f2 Copyright}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid3020322 \hich\af2\dbch\af31505\loch\f2 \hich\f2 \'a9}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639\charrsid5593428 \hich\af2\dbch\af31505\loch\f2 @@ -299,7 +298,7 @@ \rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639\charrsid14624369 \hich\af2\dbch\af31505\loch\f2 . }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639 \hich\af2\dbch\af31505\loch\f2 Lees de tekst van de }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639\charrsid14624369 \hich\af2\dbch\af31505\loch\f2 GNU General Public License}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid7881760 \hich\af2\dbch\af31505\loch\f2 versie 3}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639\charrsid14624369 \hich\af2\dbch\af31505\loch\f2 - voor meer details. + voor meer \hich\af2\dbch\af31505\loch\f2 details. \par \par }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15549573 \hich\af2\dbch\af31505\loch\f2 5}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639\charrsid14624369 \hich\af2\dbch\af31505\loch\f2 . De tekst van de GNU General Public License }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid11875882 \hich\af2\dbch\af31505\loch\f2 versie 3 }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 @@ -310,18 +309,18 @@ \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639\charrsid3686156 \hich\af2\dbch\af31505\loch\f2 http://www.gnu.org/licenses/gpl-3.0.en.html}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639 \hich\af2\dbch\af31505\loch\f2 " }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639 {\*\datafield 00d0c9ea79f9bace118c8200aa004ba90b0200000003000000e0c9ea79f9bace118c8200aa004ba90b7000000068007400740070003a002f002f007700770077002e0067006e0075002e006f00720067002f006c006900630065006e007300650073002f00670070006c002d0033002e0030002e0065006e002e0068007400 -6d006c000000795881f43b1d7f48af2c825dc485276300000000a5ab000000477d4c0000945e0000000065002f30000060b30004000000000000}}}{\fldrslt {\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \cs15\f2\fs21\ul\cf17\lang1043\langfe2052\langnp1043\insrsid15600639\charrsid9534683 +6d006c000000795881f43b1d7f48af2c825dc485276300000000a5ab000000477d4c0000945e0000000065002f30000060b3000400000000000000}}}{\fldrslt {\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \cs15\f2\fs21\ul\cf17\lang1043\langfe2052\langnp1043\insrsid15600639\charrsid9534683 \hich\af2\dbch\af31505\loch\f2 http://www.gnu.org/licenses/gpl-3.0.en.html}}}\sectd \ltrsect\linex0\headery708\footery708\colsx708\sectdefaultcl\sftnbj {\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid4150084 \hich\af2\dbch\af31505\loch\f2 >}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639 \hich\af2\dbch\af31505\loch\f2 voor de tekst}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639\charrsid5593428 . \par \par }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15549573 \hich\af2\dbch\af31505\loch\f2 6}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639\charrsid14624369 \hich\af2\dbch\af31505\loch\f2 . Alle namen}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid12992049 \hich\af2\dbch\af31505\loch\f2 , }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639\charrsid14624369 \hich\af2\dbch\af31505\loch\f2 logo\hich\f2 \rquote \loch\f2 s en verwijzingen naar "Deltares" zijn }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 -\f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639 \hich\af2\dbch\af31505\loch\f2 geregistreerde merknamen van}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639\charrsid14624369 -\hich\af2\dbch\af31505\loch\f2 Stichting Deltares, }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639 \hich\af2\dbch\af31505\loch\f2 en blijven te allen tijde eigendom van}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 -\f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639\charrsid14624369 \hich\af2\dbch\af31505\loch\f2 Stichting Deltares. }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639\charrsid13187850 -\hich\af2\dbch\af31505\loch\f2 Alle rechten voorbehouden.}{\rtlch\fcs1 \ab\af2\afs24 \ltrch\fcs0 \b\f2\fs24\lang1043\langfe2052\langnp1043\insrsid15600639\charrsid5593428 +\f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639 \hich\af2\dbch\af31505\loch\f2 gereg\hich\af2\dbch\af31505\loch\f2 istreerde merknamen van}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 +\f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639\charrsid14624369 \hich\af2\dbch\af31505\loch\f2 Stichting Deltares, }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639 \hich\af2\dbch\af31505\loch\f2 +en blijven te allen tijde eigendom van}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639\charrsid14624369 \hich\af2\dbch\af31505\loch\f2 Stichting Deltares. }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 +\f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639\charrsid13187850 \hich\af2\dbch\af31505\loch\f2 Alle rechten voorbehouden.}{\rtlch\fcs1 \ab\af2\afs24 \ltrch\fcs0 \b\f2\fs24\lang1043\langfe2052\langnp1043\insrsid15600639\charrsid5593428 \par }\pard \ltrpar\ql \li0\ri0\sa200\sl276\slmult1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid15600639 {\rtlch\fcs1 \af0 \ltrch\fcs0 \lang1043\langfe2052\langnp1043\insrsid16086011\charrsid6624093 \par }{\*\themedata 504b030414000600080000002100e9de0fbfff0000001c020000130000005b436f6e74656e745f54797065735d2e786d6cac91cb4ec3301045f748fc83e52d4a 9cb2400825e982c78ec7a27cc0c8992416c9d8b2a755fbf74cd25442a820166c2cd933f79e3be372bd1f07b5c3989ca74aaff2422b24eb1b475da5df374fd9ad @@ -428,8 +427,8 @@ ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -ffffffffffffffffffffffffffffffff52006f006f007400200045006e00740072007900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000016000500ffffffffffffffffffffffff0c6ad98892f1d411a65f0040963251e50000000000000000000000009005 -9bf01d6bd101feffffff00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff00000000000000000000000000000000000000000000000000000000 +ffffffffffffffffffffffffffffffff52006f006f007400200045006e00740072007900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000016000500ffffffffffffffffffffffff0c6ad98892f1d411a65f0040963251e50000000000000000000000007088 +725fcf6fd101feffffff00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff00000000000000000000000000000000000000000000000000000000 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff0000000000000000000000000000000000000000000000000000 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000105000000000000}} \ No newline at end of file Index: Demo/Ringtoets/src/Demo.Ringtoets/Commands/AddNewDemoDikeAssessmentSectionCommand.cs =================================================================== diff -u -r7d124cef8960a865cc8d7db24b3359f7ff9958be -rd971fe1df4d36020e33ad952830f71a9a605d860 --- Demo/Ringtoets/src/Demo.Ringtoets/Commands/AddNewDemoDikeAssessmentSectionCommand.cs (.../AddNewDemoDikeAssessmentSectionCommand.cs) (revision 7d124cef8960a865cc8d7db24b3359f7ff9958be) +++ Demo/Ringtoets/src/Demo.Ringtoets/Commands/AddNewDemoDikeAssessmentSectionCommand.cs (.../AddNewDemoDikeAssessmentSectionCommand.cs) (revision d971fe1df4d36020e33ad952830f71a9a605d860) @@ -2,7 +2,6 @@ using Core.Common.Controls.Commands; using Core.Common.Gui; using Ringtoets.HydraRing.Forms.PresentationObjects; -using Ringtoets.HydraRing.Plugin; using Ringtoets.Integration.Data; using Ringtoets.Integration.Forms.PresentationObjects; using Ringtoets.Integration.Plugin.FileImporters; Index: Demo/Ringtoets/src/Demo.Ringtoets/Commands/AddNewDemoDuneAssessmentSectionCommand.cs =================================================================== diff -u -r7d124cef8960a865cc8d7db24b3359f7ff9958be -rd971fe1df4d36020e33ad952830f71a9a605d860 --- Demo/Ringtoets/src/Demo.Ringtoets/Commands/AddNewDemoDuneAssessmentSectionCommand.cs (.../AddNewDemoDuneAssessmentSectionCommand.cs) (revision 7d124cef8960a865cc8d7db24b3359f7ff9958be) +++ Demo/Ringtoets/src/Demo.Ringtoets/Commands/AddNewDemoDuneAssessmentSectionCommand.cs (.../AddNewDemoDuneAssessmentSectionCommand.cs) (revision d971fe1df4d36020e33ad952830f71a9a605d860) @@ -1,7 +1,6 @@ using Core.Common.Controls.Commands; using Core.Common.Gui; using Ringtoets.HydraRing.Forms.PresentationObjects; -using Ringtoets.HydraRing.Plugin; using Ringtoets.Integration.Data; using Ringtoets.Integration.Forms.PresentationObjects; using Ringtoets.Integration.Plugin.FileImporters; Index: Demo/Ringtoets/src/Demo.Ringtoets/Demo.Ringtoets.csproj =================================================================== diff -u -r06f9145d8180df7fd26eac086a3f431c181e4d64 -rd971fe1df4d36020e33ad952830f71a9a605d860 --- Demo/Ringtoets/src/Demo.Ringtoets/Demo.Ringtoets.csproj (.../Demo.Ringtoets.csproj) (revision 06f9145d8180df7fd26eac086a3f431c181e4d64) +++ Demo/Ringtoets/src/Demo.Ringtoets/Demo.Ringtoets.csproj (.../Demo.Ringtoets.csproj) (revision d971fe1df4d36020e33ad952830f71a9a605d860) @@ -114,10 +114,6 @@ {EFB9B7E0-82A8-40CA-95C8-B56B4AC02294} Ringtoets.HydraRing.Forms - - {0A0B4576-1FD4-4836-880C-A7829ACB944A} - Ringtoets.HydraRing.Plugin - {11f1f874-45af-43e4-8ae5-15a5c9593e28} Ringtoets.Integration.Data Index: Ringtoets.sln =================================================================== diff -u -r0969065c95bda996ec27e7b3929329088f15add3 -rd971fe1df4d36020e33ad952830f71a9a605d860 --- Ringtoets.sln (.../Ringtoets.sln) (revision 0969065c95bda996ec27e7b3929329088f15add3) +++ Ringtoets.sln (.../Ringtoets.sln) (revision d971fe1df4d36020e33ad952830f71a9a605d860) @@ -23,7 +23,6 @@ {B69D5B6C-6E14-4FA9-9EBC-8F97678CDB70} = {B69D5B6C-6E14-4FA9-9EBC-8F97678CDB70} {4D840673-3812-4338-A352-84854E32B8A0} = {4D840673-3812-4338-A352-84854E32B8A0} {11F1F874-45AF-43E4-8AE5-15A5C9593E28} = {11F1F874-45AF-43E4-8AE5-15A5C9593E28} - {0A0B4576-1FD4-4836-880C-A7829ACB944A} = {0A0B4576-1FD4-4836-880C-A7829ACB944A} {35B87B7A-7F50-4139-B563-589EE522B1ED} = {35B87B7A-7F50-4139-B563-589EE522B1ED} {E344867E-9AC9-44C8-88A5-8185681679A9} = {E344867E-9AC9-44C8-88A5-8185681679A9} {318BA582-88C9-4816-A54A-A7E431461DE3} = {318BA582-88C9-4816-A54A-A7E431461DE3} @@ -263,12 +262,8 @@ EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ringtoets.HydraRing.IO", "Ringtoets\HydraRing\src\Ringtoets.HydraRing.IO\Ringtoets.HydraRing.IO.csproj", "{B69D5B6C-6E14-4FA9-9EBC-8F97678CDB70}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ringtoets.HydraRing.Plugin", "Ringtoets\HydraRing\src\Ringtoets.HydraRing.Plugin\Ringtoets.HydraRing.Plugin.csproj", "{0A0B4576-1FD4-4836-880C-A7829ACB944A}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ringtoets.HydraRing.IO.Test", "Ringtoets\HydraRing\test\Ringtoets.HydraRing.IO.Test\Ringtoets.HydraRing.IO.Test.csproj", "{CA7B5888-2BC9-4FE2-9F58-FBC6D7ED8221}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ringtoets.HydraRing.Plugin.Test", "Ringtoets\HydraRing\test\Ringtoets.HydraRing.Plugin.Test\Ringtoets.HydraRing.Plugin.Test.csproj", "{B4C237B2-88B4-4A39-925A-BA0ED2F34D23}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution CreateInstaller|x86 = CreateInstaller|x86 @@ -1016,16 +1011,6 @@ {B69D5B6C-6E14-4FA9-9EBC-8F97678CDB70}.Release|x86.Build.0 = Release|x86 {B69D5B6C-6E14-4FA9-9EBC-8F97678CDB70}.ReleaseForCodeCoverage|x86.ActiveCfg = ReleaseForCodeCoverage|x86 {B69D5B6C-6E14-4FA9-9EBC-8F97678CDB70}.ReleaseForCodeCoverage|x86.Build.0 = ReleaseForCodeCoverage|x86 - {0A0B4576-1FD4-4836-880C-A7829ACB944A}.CreateInstaller|x86.ActiveCfg = Release|x86 - {0A0B4576-1FD4-4836-880C-A7829ACB944A}.CreateInstaller|x86.Build.0 = Release|x86 - {0A0B4576-1FD4-4836-880C-A7829ACB944A}.CreateInstallerWithDemoProject|x86.ActiveCfg = Release|x86 - {0A0B4576-1FD4-4836-880C-A7829ACB944A}.CreateInstallerWithDemoProject|x86.Build.0 = Release|x86 - {0A0B4576-1FD4-4836-880C-A7829ACB944A}.Debug|x86.ActiveCfg = Debug|x86 - {0A0B4576-1FD4-4836-880C-A7829ACB944A}.Debug|x86.Build.0 = Debug|x86 - {0A0B4576-1FD4-4836-880C-A7829ACB944A}.Release|x86.ActiveCfg = Release|x86 - {0A0B4576-1FD4-4836-880C-A7829ACB944A}.Release|x86.Build.0 = Release|x86 - {0A0B4576-1FD4-4836-880C-A7829ACB944A}.ReleaseForCodeCoverage|x86.ActiveCfg = ReleaseForCodeCoverage|x86 - {0A0B4576-1FD4-4836-880C-A7829ACB944A}.ReleaseForCodeCoverage|x86.Build.0 = ReleaseForCodeCoverage|x86 {CA7B5888-2BC9-4FE2-9F58-FBC6D7ED8221}.CreateInstaller|x86.ActiveCfg = Release|x86 {CA7B5888-2BC9-4FE2-9F58-FBC6D7ED8221}.CreateInstallerWithDemoProject|x86.ActiveCfg = Release|x86 {CA7B5888-2BC9-4FE2-9F58-FBC6D7ED8221}.Debug|x86.ActiveCfg = Debug|x86 @@ -1034,14 +1019,6 @@ {CA7B5888-2BC9-4FE2-9F58-FBC6D7ED8221}.Release|x86.Build.0 = Release|x86 {CA7B5888-2BC9-4FE2-9F58-FBC6D7ED8221}.ReleaseForCodeCoverage|x86.ActiveCfg = ReleaseForCodeCoverage|x86 {CA7B5888-2BC9-4FE2-9F58-FBC6D7ED8221}.ReleaseForCodeCoverage|x86.Build.0 = ReleaseForCodeCoverage|x86 - {B4C237B2-88B4-4A39-925A-BA0ED2F34D23}.CreateInstaller|x86.ActiveCfg = Release|x86 - {B4C237B2-88B4-4A39-925A-BA0ED2F34D23}.CreateInstallerWithDemoProject|x86.ActiveCfg = Release|x86 - {B4C237B2-88B4-4A39-925A-BA0ED2F34D23}.Debug|x86.ActiveCfg = Debug|x86 - {B4C237B2-88B4-4A39-925A-BA0ED2F34D23}.Debug|x86.Build.0 = Debug|x86 - {B4C237B2-88B4-4A39-925A-BA0ED2F34D23}.Release|x86.ActiveCfg = Release|x86 - {B4C237B2-88B4-4A39-925A-BA0ED2F34D23}.Release|x86.Build.0 = Release|x86 - {B4C237B2-88B4-4A39-925A-BA0ED2F34D23}.ReleaseForCodeCoverage|x86.ActiveCfg = ReleaseForCodeCoverage|x86 - {B4C237B2-88B4-4A39-925A-BA0ED2F34D23}.ReleaseForCodeCoverage|x86.Build.0 = ReleaseForCodeCoverage|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -1154,12 +1131,10 @@ {888D4097-8BC2-4703-9FB1-8744C94D525E} = {B31E1A9B-D13E-42CD-BEDD-9D4A709CE7BD} {EFB9B7E0-82A8-40CA-95C8-B56B4AC02294} = {B31E1A9B-D13E-42CD-BEDD-9D4A709CE7BD} {B69D5B6C-6E14-4FA9-9EBC-8F97678CDB70} = {B31E1A9B-D13E-42CD-BEDD-9D4A709CE7BD} - {0A0B4576-1FD4-4836-880C-A7829ACB944A} = {B31E1A9B-D13E-42CD-BEDD-9D4A709CE7BD} {175406DB-C0DA-42A7-968C-0C17CF2257B1} = {435F0AB1-1180-47D3-9BCB-3B5FF365236C} {BFD6A78A-237A-413F-8DC3-8EC6E8C5809C} = {435F0AB1-1180-47D3-9BCB-3B5FF365236C} {EC6B2FE8-C211-4C62-BEAC-AFD5B47197CA} = {435F0AB1-1180-47D3-9BCB-3B5FF365236C} {CA7B5888-2BC9-4FE2-9F58-FBC6D7ED8221} = {435F0AB1-1180-47D3-9BCB-3B5FF365236C} - {B4C237B2-88B4-4A39-925A-BA0ED2F34D23} = {435F0AB1-1180-47D3-9BCB-3B5FF365236C} EndGlobalSection GlobalSection(TextTemplating) = postSolution TextTemplating = 1 Index: Ringtoets/Common/src/Ringtoets.Common.Data/Ringtoets.Common.Data.csproj =================================================================== diff -u -rd1565906db90df7be4365d277d5ff22dc2d77a82 -rd971fe1df4d36020e33ad952830f71a9a605d860 --- Ringtoets/Common/src/Ringtoets.Common.Data/Ringtoets.Common.Data.csproj (.../Ringtoets.Common.Data.csproj) (revision d1565906db90df7be4365d277d5ff22dc2d77a82) +++ Ringtoets/Common/src/Ringtoets.Common.Data/Ringtoets.Common.Data.csproj (.../Ringtoets.Common.Data.csproj) (revision d971fe1df4d36020e33ad952830f71a9a605d860) @@ -76,6 +76,10 @@ Core.Common.Version False + + {70f8cc9c-5bc8-4fb2-b201-eae7fa8088c2} + Ringtoets.HydraRing.Data + Fisheye: Tag d971fe1df4d36020e33ad952830f71a9a605d860 refers to a dead (removed) revision in file `Ringtoets/HydraRing/src/Ringtoets.HydraRing.Plugin/HydraulicBoundaryDatabaseImporter.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag d971fe1df4d36020e33ad952830f71a9a605d860 refers to a dead (removed) revision in file `Ringtoets/HydraRing/src/Ringtoets.HydraRing.Plugin/Properties/AssemblyInfo.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag d971fe1df4d36020e33ad952830f71a9a605d860 refers to a dead (removed) revision in file `Ringtoets/HydraRing/src/Ringtoets.HydraRing.Plugin/Properties/Resources.Designer.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag d971fe1df4d36020e33ad952830f71a9a605d860 refers to a dead (removed) revision in file `Ringtoets/HydraRing/src/Ringtoets.HydraRing.Plugin/Properties/Resources.resx'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag d971fe1df4d36020e33ad952830f71a9a605d860 refers to a dead (removed) revision in file `Ringtoets/HydraRing/src/Ringtoets.HydraRing.Plugin/Ringtoets.HydraRing.Plugin.csproj'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag d971fe1df4d36020e33ad952830f71a9a605d860 refers to a dead (removed) revision in file `Ringtoets/HydraRing/src/Ringtoets.HydraRing.Plugin/packages.config'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag d971fe1df4d36020e33ad952830f71a9a605d860 refers to a dead (removed) revision in file `Ringtoets/HydraRing/test/Ringtoets.HydraRing.Plugin.Test/HydraulicBoundaryDatabaseImporterTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag d971fe1df4d36020e33ad952830f71a9a605d860 refers to a dead (removed) revision in file `Ringtoets/HydraRing/test/Ringtoets.HydraRing.Plugin.Test/Properties/AssemblyInfo.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag d971fe1df4d36020e33ad952830f71a9a605d860 refers to a dead (removed) revision in file `Ringtoets/HydraRing/test/Ringtoets.HydraRing.Plugin.Test/Ringtoets.HydraRing.Plugin.Test.csproj'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag d971fe1df4d36020e33ad952830f71a9a605d860 refers to a dead (removed) revision in file `Ringtoets/HydraRing/test/Ringtoets.HydraRing.Plugin.Test/packages.config'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/FileImporters/HydraulicBoundaryDatabaseImporter.cs =================================================================== diff -u --- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/FileImporters/HydraulicBoundaryDatabaseImporter.cs (revision 0) +++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/FileImporters/HydraulicBoundaryDatabaseImporter.cs (revision d971fe1df4d36020e33ad952830f71a9a605d860) @@ -0,0 +1,147 @@ +// Copyright (C) Stichting Deltares 2016. All rights reserved. +// +// This file is part of Ringtoets. +// +// Ringtoets is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// +// All names, logos, and references to "Deltares" are registered trademarks of +// Stichting Deltares and remain full property of Stichting Deltares at all times. +// All rights reserved. + +using System; + +using Core.Common.IO.Exceptions; + +using log4net; + +using Ringtoets.HydraRing.Data; +using Ringtoets.HydraRing.Forms.PresentationObjects; +using Ringtoets.HydraRing.IO; +using Ringtoets.Integration.Data; +using Ringtoets.Integration.Plugin.Properties; + +namespace Ringtoets.Integration.Plugin.FileImporters +{ + /// + /// Imports locations read from an Hydraulic boundary .sqlite file (SqlLite database file) to a + /// collection of in a . + /// + public class HydraulicBoundaryDatabaseImporter : IDisposable + { + private readonly ILog log = LogManager.GetLogger(typeof(HydraulicBoundaryDatabaseImporter)); + + private HydraulicBoundarySqLiteDatabaseReader hydraulicBoundaryDatabaseReader; + + /// + /// Validates the file and opens a connection. + /// + /// The path to the file to read. + /// Thrown when the given file at cannot be read. + public void ValidateAndConnectTo(string filePath) + { + hydraulicBoundaryDatabaseReader = new HydraulicBoundarySqLiteDatabaseReader(filePath); + } + + /// + /// Gets the version of the database. + /// + /// The database version. + public string GetHydraulicBoundaryDatabaseVersion() + { + return hydraulicBoundaryDatabaseReader.GetVersion(); + } + + /// + /// Based upon the data read from the hydraulic boundary database file located at + /// , a new instance of , + /// and saved into . + /// + /// to set the newly + /// created . + /// The path of the hydraulic boundary database file to open. + /// True if the import was successful, false otherwise. + public bool Import(HydraulicBoundaryDatabaseContext targetItem, string filePath) + { + if (hydraulicBoundaryDatabaseReader == null) + { + throw new InvalidOperationException(Resources.HydraulicBoundaryDatabaseImporter_File_not_opened); + } + + var importResult = GetHydraulicBoundaryDatabase(filePath); + + if (importResult == null) + { + return false; + } + + AddImportedDataToModel(targetItem.Parent, importResult); + log.Info(Resources.HydraulicBoundaryDatabaseImporter_Import_All_hydraulic_locations_read); + return true; + } + + public void Dispose() + { + if (hydraulicBoundaryDatabaseReader != null) + { + hydraulicBoundaryDatabaseReader.Dispose(); + hydraulicBoundaryDatabaseReader = null; + } + } + + private void HandleException(Exception e) + { + var message = string.Format(Resources.HydraulicBoundaryDatabaseImporter_ErrorMessage_0_file_skipped, e.Message); + log.Error(message); + } + + private HydraulicBoundaryDatabase GetHydraulicBoundaryDatabase(string path) + { + try + { + var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase + { + FilePath = path, + Version = hydraulicBoundaryDatabaseReader.GetVersion() + }; + + hydraulicBoundaryDatabaseReader.PrepareReadLocation(); + while (hydraulicBoundaryDatabaseReader.HasNext) + { + try + { + hydraulicBoundaryDatabase.Locations.Add(hydraulicBoundaryDatabaseReader.ReadLocation()); + } + catch (CriticalFileReadException e) + { + var message = string.Format(Resources.HydraulicBoundaryDatabaseImporter_ErrorMessage_0_file_skipped, path); + log.Error(message, e); + return null; + } + } + return hydraulicBoundaryDatabase; + } + catch (LineParseException e) + { + HandleException(e); + } + + return null; + } + + private static void AddImportedDataToModel(AssessmentSectionBase assessmentSection, HydraulicBoundaryDatabase importedData) + { + assessmentSection.HydraulicBoundaryDatabase = importedData; + } + } +} \ No newline at end of file Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.Designer.cs =================================================================== diff -u -r75b44201081b838c8909ef932da80de1ad082f09 -rd971fe1df4d36020e33ad952830f71a9a605d860 --- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 75b44201081b838c8909ef932da80de1ad082f09) +++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision d971fe1df4d36020e33ad952830f71a9a605d860) @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.42000 +// Runtime Version:4.0.30319.18444 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -61,6 +61,33 @@ } /// + /// Looks up a localized string similar to {0} Het bestand wordt overgeslagen.. + /// + internal static string HydraulicBoundaryDatabaseImporter_ErrorMessage_0_file_skipped { + get { + return ResourceManager.GetString("HydraulicBoundaryDatabaseImporter_ErrorMessage_0_file_skipped", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Er is nog geen bestand geopend.. + /// + internal static string HydraulicBoundaryDatabaseImporter_File_not_opened { + get { + return ResourceManager.GetString("HydraulicBoundaryDatabaseImporter_File_not_opened", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to De hydraulische randvoorwaarden locaties zijn ingelezen.. + /// + internal static string HydraulicBoundaryDatabaseImporter_Import_All_hydraulic_locations_read { + get { + return ResourceManager.GetString("HydraulicBoundaryDatabaseImporter_Import_All_hydraulic_locations_read", resourceCulture); + } + } + + /// /// Looks up a localized string similar to Als u de referentielijn vervangt zullen alle vakindelingen, berekende hydraulische randvoorwaarden en berekeningsresultaten worden verwijderd. /// ///Weet u zeker dat u wilt doorgaan?. Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.resx =================================================================== diff -u -r75b44201081b838c8909ef932da80de1ad082f09 -rd971fe1df4d36020e33ad952830f71a9a605d860 --- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.resx (.../Resources.resx) (revision 75b44201081b838c8909ef932da80de1ad082f09) +++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.resx (.../Resources.resx) (revision d971fe1df4d36020e33ad952830f71a9a605d860) @@ -141,4 +141,13 @@ Verwijderen uitvoer van hydraulische randvoorwaarden. + + Er is nog geen bestand geopend. + + + De hydraulische randvoorwaarden locaties zijn ingelezen. + + + {0} Het bestand wordt overgeslagen. + \ No newline at end of file Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Ringtoets.Integration.Plugin.csproj =================================================================== diff -u -r83379c80ce51791b09941604a562684e54dbf17d -rd971fe1df4d36020e33ad952830f71a9a605d860 --- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Ringtoets.Integration.Plugin.csproj (.../Ringtoets.Integration.Plugin.csproj) (revision 83379c80ce51791b09941604a562684e54dbf17d) +++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Ringtoets.Integration.Plugin.csproj (.../Ringtoets.Integration.Plugin.csproj) (revision d971fe1df4d36020e33ad952830f71a9a605d860) @@ -55,6 +55,7 @@ Properties\GlobalAssembly.cs + @@ -137,10 +138,9 @@ Ringtoets.HydraRing.Forms False - - {0a0b4576-1fd4-4836-880c-a7829acb944a} - Ringtoets.HydraRing.Plugin - False + + {b69d5b6c-6e14-4fa9-9ebc-8f97678cdb70} + Ringtoets.HydraRing.IO {11F1F874-45AF-43E4-8AE5-15A5C9593E28} Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsGuiPlugin.cs =================================================================== diff -u -rd1565906db90df7be4365d277d5ff22dc2d77a82 -rd971fe1df4d36020e33ad952830f71a9a605d860 --- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsGuiPlugin.cs (.../RingtoetsGuiPlugin.cs) (revision d1565906db90df7be4365d277d5ff22dc2d77a82) +++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsGuiPlugin.cs (.../RingtoetsGuiPlugin.cs) (revision d971fe1df4d36020e33ad952830f71a9a605d860) @@ -37,12 +37,13 @@ using Ringtoets.Common.Forms.PresentationObjects; using Ringtoets.Common.Placeholder; using Ringtoets.HydraRing.Forms.PresentationObjects; -using Ringtoets.HydraRing.Plugin; using Ringtoets.Integration.Data; using Ringtoets.Integration.Data.Placeholders; using Ringtoets.Integration.Forms.PresentationObjects; using Ringtoets.Integration.Forms.PropertyClasses; using Ringtoets.Integration.Forms.Views; +using Ringtoets.Integration.Plugin.FileImporters; + using RingtoetsDataResources = Ringtoets.Integration.Data.Properties.Resources; using RingtoetsFormsResources = Ringtoets.Integration.Forms.Properties.Resources; using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources; Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/FileImporters/HydraulicBoundaryDatabaseImporterTest.cs =================================================================== diff -u --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/FileImporters/HydraulicBoundaryDatabaseImporterTest.cs (revision 0) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/FileImporters/HydraulicBoundaryDatabaseImporterTest.cs (revision d971fe1df4d36020e33ad952830f71a9a605d860) @@ -0,0 +1,218 @@ +// Copyright (C) Stichting Deltares 2016. All rights reserved. +// +// This file is part of Ringtoets. +// +// Ringtoets is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// +// All names, logos, and references to "Deltares" are registered trademarks of +// Stichting Deltares and remain full property of Stichting Deltares at all times. +// All rights reserved. + +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; + +using Core.Common.Base; +using Core.Common.IO.Exceptions; +using Core.Common.TestUtil; + +using NUnit.Framework; + +using Rhino.Mocks; + +using Ringtoets.HydraRing.Data; +using Ringtoets.HydraRing.Forms.PresentationObjects; +using Ringtoets.Integration.Data; +using Ringtoets.Integration.Plugin.FileImporters; + +using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources; +using RingtoetsHydraRingFormsResources = Ringtoets.HydraRing.Forms.Properties.Resources; +using RingtoetsFormsResources = Ringtoets.Common.Forms.Properties.Resources; + +namespace Ringtoets.Integration.Plugin.Test.FileImporters +{ + [TestFixture] + public class HydraulicBoundaryDatabaseImporterTest + { + private readonly string testDataPath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.HydraRing.IO, "HydraulicBoundaryLocationReader"); + private HydraulicBoundaryDatabaseImporter importer; + + [SetUp] + public void SetUp() + { + importer = new HydraulicBoundaryDatabaseImporter(); + } + + [TearDown] + public void TearDown() + { + importer.Dispose(); + } + + [Test] + public void DefaultConstructor_ExpectedValues() + { + // Call is done in SetUp + + // Assert + Assert.IsInstanceOf(importer); + } + + [Test] + public void ValidateAndConnectTo_ExistingFile_DoesNotThrowException() + { + // Setup + string validFilePath = Path.Combine(testDataPath, "complete.sqlite"); + + // Call + TestDelegate test = () => importer.ValidateAndConnectTo(validFilePath); + + // Assert + Assert.DoesNotThrow(test); + } + + [Test] + public void ValidateAndConnectTo_NonExistingFile_ThrowsCriticalFileReadException() + { + // Setup + string filePath = Path.Combine(testDataPath, "nonexisting.sqlite"); + var expectedExceptionMessage = String.Format("Fout bij het lezen van bestand '{0}': Het bestand bestaat niet.", filePath); + + // Call + TestDelegate test = () => importer.ValidateAndConnectTo(filePath); + + // Assert + CriticalFileReadException exception = Assert.Throws(test); + Assert.AreEqual(expectedExceptionMessage, exception.Message); + } + + [Test] + public void ValidateAndConnectTo_InvalidFile_ThrowsCriticalFileReadException() + { + // Setup + string filePath = Path.Combine(testDataPath, "/"); + var expectedExceptionMessage = String.Format("Fout bij het lezen van bestand '{0}': Bestandspad mag niet naar een map verwijzen.", filePath); + + // Call + TestDelegate test = () => importer.ValidateAndConnectTo(filePath); + + // Assert + CriticalFileReadException exception = Assert.Throws(test); + Assert.AreEqual(expectedExceptionMessage, exception.Message); + Assert.IsInstanceOf(exception.InnerException); + } + + [Test] + public void GetHydraulicBoundaryDatabaseVersion_ValidFile_GetDatabaseVersion() + { + // Setup + string validFilePath = Path.Combine(testDataPath, "complete.sqlite"); + importer.ValidateAndConnectTo(validFilePath); + + // Call + string version = importer.GetHydraulicBoundaryDatabaseVersion(); + + // Assert + Assert.IsNotNullOrEmpty(version); + } + + [Test] + public void Import_ConnectionNotOpened_ThrowsInValidOperationException() + { + // Setup + string validFilePath = Path.Combine(testDataPath, "complete.sqlite"); + + var mocks = new MockRepository(); + var assessmentSection = mocks.StrictMock(); + mocks.ReplayAll(); + + var context = new HydraulicBoundaryDatabaseContext(assessmentSection); + + var expectedMessage = "Er is nog geen bestand geopend."; + + // Call + TestDelegate call = () => importer.Import(context, validFilePath); + + // Assert + var exception = Assert.Throws(call); + Assert.AreEqual(expectedMessage, exception.Message); + } + + [Test] + public void Import_ImportingToValidTargetWithValidFile_ImportHydraulicBoundaryLocationsToCollection() + { + // Setup + var mocks = new MockRepository(); + var assessmentSection = mocks.StrictMock(); + mocks.ReplayAll(); + + var importTarget = new HydraulicBoundaryDatabaseContext(assessmentSection); + + string validFilePath = Path.Combine(testDataPath, "complete.sqlite"); + + // Precondition + Assert.IsTrue(File.Exists(validFilePath), string.Format("Precodition failed. File does not exist: {0}", validFilePath)); + + importer.ValidateAndConnectTo(validFilePath); + + // Call + var importResult = false; + Action call = () => importResult = importer.Import(importTarget, validFilePath); + + // Assert + TestHelper.AssertLogMessages(call, messages => + { + string[] messageArray = messages.ToArray(); + StringAssert.EndsWith("De hydraulische randvoorwaarden locaties zijn ingelezen.", messageArray[0]); + }); + Assert.IsTrue(importResult); + ICollection importedLocations = importTarget.Parent.HydraulicBoundaryDatabase.Locations; + Assert.AreEqual(18, importedLocations.Count); + CollectionAssert.AllItemsAreNotNull(importedLocations); + CollectionAssert.AllItemsAreUnique(importedLocations); + } + + [Test] + public void Import_ImportingFileWithCorruptSchema_AbortAndLog() + { + // Setup + var mocks = new MockRepository(); + var observer = mocks.StrictMock(); + var assessmentSection = mocks.StrictMock(); + mocks.ReplayAll(); + + var importTarget = new HydraulicBoundaryDatabaseContext(assessmentSection); + + string corruptPath = Path.Combine(testDataPath, "corruptschema.sqlite"); + var expectedLogMessage = string.Format("Fout bij het lezen van bestand '{0}': Kritieke fout opgetreden bij het uitlezen van waardes uit kolommen in de database. Het bestand wordt overgeslagen.", corruptPath); + + importTarget.Attach(observer); + + var importResult = true; + + importer.ValidateAndConnectTo(corruptPath); + + // Call + Action call = () => importResult = importer.Import(importTarget, corruptPath); + + // Assert + TestHelper.AssertLogMessageIsGenerated(call, expectedLogMessage, 1); + Assert.IsFalse(importResult); + Assert.IsNull(importTarget.Parent.HydraulicBoundaryDatabase, "No HydraulicBoundaryDatabase object should be created when import from corrupt database."); + + mocks.VerifyAll(); // Expect no calls on 'observer' + } + } +} \ No newline at end of file Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Ringtoets.Integration.Plugin.Test.csproj =================================================================== diff -u -r83379c80ce51791b09941604a562684e54dbf17d -rd971fe1df4d36020e33ad952830f71a9a605d860 --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Ringtoets.Integration.Plugin.Test.csproj (.../Ringtoets.Integration.Plugin.Test.csproj) (revision 83379c80ce51791b09941604a562684e54dbf17d) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Ringtoets.Integration.Plugin.Test.csproj (.../Ringtoets.Integration.Plugin.Test.csproj) (revision d971fe1df4d36020e33ad952830f71a9a605d860) @@ -65,6 +65,7 @@ + @@ -88,6 +89,10 @@ {30e4c2ae-719e-4d70-9fa9-668a9767fbfa} Core.Common.Gui + + {e344867e-9ac9-44c8-88a5-8185681679a9} + Core.Common.IO + {d749ee4c-ce50-4c17-bf01-9a953028c126} Core.Common.TestUtil @@ -108,6 +113,10 @@ {E38C11E0-4384-44DD-9F5B-EE73D79FD7F5} Ringtoets.Common.Placeholder + + {70f8cc9c-5bc8-4fb2-b201-eae7fa8088c2} + Ringtoets.HydraRing.Data + {EFB9B7E0-82A8-40CA-95C8-B56B4AC02294} Ringtoets.HydraRing.Forms