Skip to content

Commit

Permalink
Merge pull request #7 from FontysVenlo/assignable-form-corrected
Browse files Browse the repository at this point in the history
added legends, improved umlet figures, avoid horizontal scroll in code snippets
  • Loading branch information
homberghp authored Mar 22, 2024
2 parents 68b4b56 + 0a9c62b commit 788b271
Show file tree
Hide file tree
Showing 37 changed files with 3,619 additions and 562 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,5 @@ node_modules
**/target

**/.vscode
doit

2 changes: 1 addition & 1 deletion content/_index.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ draft: false
* Module description can be found on canvas

This site contains the up-to-date course material, exercises and announcements about PRC2
(Programming Concepts 2: the Test Driven Way), starting in February 2023.
(Programming Concepts 2: the Test Driven Way), starting in February 2024.

Responsible Teachers for 2024 PRC2:

Expand Down
2 changes: 1 addition & 1 deletion content/docs/week02.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
title: "02 Parameterized tests"
description: ""
date: 2022-02-01T14:17:33+01:00
draft: true
draft: false
images: []
slug: "parameterized-tests"
menu:
Expand Down
2 changes: 1 addition & 1 deletion content/docs/week03.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
title: "03 Design for testability"
description: ""
date: 2022-02-02T11:28:06+01:00
draft: true
draft: false
images: []
slug: "design-for-testability"
menu:
Expand Down
2 changes: 1 addition & 1 deletion content/docs/week04.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
title: "04 Generics"
description: ""
date: 2022-03-09T13:53:06+01:00
draft: true
draft: false
images: []
slug: "generics"
menu:
Expand Down
4 changes: 2 additions & 2 deletions content/docs/week05.adoc
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
---
title: "05 JPMS, Lambda and Streams"
description: ""
date: 2022-03-16T13:53:06+01:00
draft: true
date: 2024-03-19T14:43:06+01:00
draft: false
images: []
slug: "jpms-lambda-streams"
menu:
Expand Down
18 changes: 18 additions & 0 deletions content/docs/week98.adoc
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
---
title: "98 Thinking harder"
description: "Reflection and Code Generation"
date: 2024-01-22T10:31:29+02:00
draft: true
images: []
slug: "reflection-and-code-generation"
menu:
docs:
parent: ""
weight: 110
toc: true
:stem: latexmath

---

include::{topics}/reflectorgenerate.adoc[]

Binary file added static/images/alarmclock.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
90 changes: 45 additions & 45 deletions static/images/assignablefrom.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
144 changes: 72 additions & 72 deletions static/images/assignablefrom.uxf
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<diagram program="umlet" version="15.1">
<zoom_level>10</zoom_level>
<zoom_level>12</zoom_level>
<element>
<id>UMLClass</id>
<coordinates>
<x>110</x>
<y>60</y>
<w>100</w>
<h>50</h>
<x>96</x>
<y>72</y>
<w>120</w>
<h>60</h>
</coordinates>
<panel_attributes>&lt;&lt;interface&gt;&gt;
*/A/*
Expand All @@ -17,10 +17,10 @@ bg=#aaffaa</panel_attributes>
<element>
<id>UMLClass</id>
<coordinates>
<x>270</x>
<y>60</y>
<w>100</w>
<h>50</h>
<x>288</x>
<y>72</y>
<w>120</w>
<h>60</h>
</coordinates>
<panel_attributes>B
bg=#aaffaa</panel_attributes>
Expand All @@ -29,10 +29,10 @@ bg=#aaffaa</panel_attributes>
<element>
<id>UMLClass</id>
<coordinates>
<x>170</x>
<y>200</y>
<w>100</w>
<h>50</h>
<x>168</x>
<y>240</y>
<w>120</w>
<h>60</h>
</coordinates>
<panel_attributes>*C*
bg=#aaffaa
Expand All @@ -42,13 +42,13 @@ bg=#aaffaa
<element>
<id>UMLClass</id>
<coordinates>
<x>460</x>
<y>40</y>
<w>200</w>
<h>70</h>
<x>516</x>
<y>48</y>
<w>240</w>
<h>84</h>
</coordinates>
<panel_attributes>{class or interface}
AlienTpe
*AlienTpe*
bg=#ffaaaa
--
*/not assignable/*
Expand All @@ -58,10 +58,10 @@ bg=#ffaaaa
<element>
<id>Relation</id>
<coordinates>
<x>260</x>
<y>60</y>
<w>220</w>
<h>190</h>
<x>276</x>
<y>72</y>
<w>264</w>
<h>228</h>
</coordinates>
<panel_attributes>lt=&lt;.
fg=#cc0000
Expand All @@ -72,10 +72,10 @@ lw=3
<element>
<id>Relation</id>
<coordinates>
<x>70</x>
<y>80</y>
<w>120</w>
<h>150</h>
<x>48</x>
<y>96</y>
<w>144</w>
<h>180</h>
</coordinates>
<panel_attributes>lt=&lt;.
fg=#008800
Expand All @@ -86,10 +86,10 @@ true &gt;</panel_attributes>
<element>
<id>Relation</id>
<coordinates>
<x>260</x>
<y>90</y>
<w>150</w>
<h>140</h>
<x>276</x>
<y>108</y>
<w>180</w>
<h>168</h>
</coordinates>
<panel_attributes>lt=&lt;.
fg=#008800
Expand All @@ -100,10 +100,10 @@ lw=3
<element>
<id>Relation</id>
<coordinates>
<x>160</x>
<y>100</y>
<w>60</w>
<h>120</h>
<x>156</x>
<y>120</y>
<w>72</w>
<h>144</h>
</coordinates>
<panel_attributes>lt=&lt;&lt;.
lw=3</panel_attributes>
Expand All @@ -112,37 +112,37 @@ lw=3</panel_attributes>
<element>
<id>Relation</id>
<coordinates>
<x>240</x>
<y>100</y>
<w>90</w>
<h>120</h>
<x>252</x>
<y>120</y>
<w>108</w>
<h>144</h>
</coordinates>
<panel_attributes>lt=&lt;&lt;-
lw=3</panel_attributes>
<additional_attributes>70.0;10.0;60.0;50.0;10.0;50.0;10.0;100.0</additional_attributes>
<additional_attributes>70.0;10.0;70.0;50.0;10.0;50.0;10.0;100.0</additional_attributes>
</element>
<element>
<id>UMLNote</id>
<coordinates>
<x>100</x>
<y>340</y>
<w>250</w>
<h>80</h>
<x>84</x>
<y>408</y>
<w>420</w>
<h>96</h>
</coordinates>
<panel_attributes>*Not allowed*
H h= new C();
D d = new C();
/(you cannot really play mam or dad.)/

bg=#ffaaaa</panel_attributes>
<additional_attributes/>
</element>
<element>
<id>UMLClass</id>
<coordinates>
<x>160</x>
<y>290</y>
<w>130</w>
<h>30</h>
<x>156</x>
<y>348</y>
<w>156</w>
<h>36</h>
</coordinates>
<panel_attributes>*H*
bg=#ffaaaa</panel_attributes>
Expand All @@ -151,10 +151,10 @@ bg=#ffaaaa</panel_attributes>
<element>
<id>Relation</id>
<coordinates>
<x>260</x>
<y>230</y>
<w>160</w>
<h>100</h>
<x>276</x>
<y>276</y>
<w>192</w>
<h>120</h>
</coordinates>
<panel_attributes>lt=&lt;.
fg=#cc0000
Expand All @@ -165,10 +165,10 @@ lw=3
<element>
<id>Relation</id>
<coordinates>
<x>220</x>
<y>240</y>
<w>30</w>
<h>70</h>
<x>228</x>
<y>288</y>
<w>36</w>
<h>84</h>
</coordinates>
<panel_attributes>lt=&lt;&lt;-
lw=3</panel_attributes>
Expand All @@ -177,10 +177,10 @@ lw=3</panel_attributes>
<element>
<id>UMLNote</id>
<coordinates>
<x>450</x>
<y>130</y>
<w>250</w>
<h>200</h>
<x>504</x>
<y>156</y>
<w>300</w>
<h>240</h>
</coordinates>
<panel_attributes>*isAssignableFrom()*
A a = new H();
Expand All @@ -199,10 +199,10 @@ bg=#aaffaa</panel_attributes>
<element>
<id>Relation</id>
<coordinates>
<x>200</x>
<y>60</y>
<w>90</w>
<h>40</h>
<x>204</x>
<y>72</y>
<w>108</w>
<h>48</h>
</coordinates>
<panel_attributes>lt=&lt;.
fg=#cc0000
Expand All @@ -213,10 +213,10 @@ lw=3
<element>
<id>Relation</id>
<coordinates>
<x>200</x>
<y>80</y>
<w>90</w>
<h>40</h>
<x>204</x>
<y>96</y>
<w>108</w>
<h>48</h>
</coordinates>
<panel_attributes>lt=&lt;.
fg=#cc0000
Expand All @@ -227,10 +227,10 @@ f &gt;</panel_attributes>
<element>
<id>UMLClass</id>
<coordinates>
<x>150</x>
<y>20</y>
<w>220</w>
<h>30</h>
<x>144</x>
<y>24</y>
<w>264</w>
<h>36</h>
</coordinates>
<panel_attributes>*Always point down*
fg=#008800
Expand Down
Loading

0 comments on commit 788b271

Please sign in to comment.