Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

added legends, improved umlet figures, avoid horizontal scroll in code snippets #7

Merged
merged 29 commits into from
Mar 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
11d01c8
docs: change a date in prc2 pgae
ibrahimko Feb 20, 2024
5d3fd59
Update pom.xml
homberghp Feb 20, 2024
306cb5f
recovered?
homberghp Feb 20, 2024
ec3e2a0
Merge branch 'add-legends' into assignable-form-corrected
homberghp Feb 20, 2024
5b8a977
cleanup pictures
homberghp Feb 21, 2024
9107081
updated jdbc driver version to 42.7.2, dropped lombok
homberghp Feb 21, 2024
9320562
Merge branch 'main' of github.com:FontysVenlo/prc2
ibrahimko Feb 22, 2024
640f447
docs: modify index page
ibrahimko Feb 22, 2024
c7bd138
Merge branch 'main' of github.com:FontysVenlo/prc2
ibrahimko Feb 22, 2024
9740b40
jdbc code
homberghp Feb 22, 2024
edfa0ef
ground work for simple reflection and generation exercise
homberghp Feb 22, 2024
898f922
ground work for simple reflection and generation exercise
homberghp Feb 22, 2024
7d28016
chore(deps): bump org.postgresql:postgresql in /topics/code/simplejdbc
dependabot[bot] Feb 22, 2024
fa16458
Merge pull request #13 from FontysVenlo/dependabot/maven/topics/code/…
Bonajo Feb 23, 2024
1d86db2
chore: enable week 2
Bonajo Feb 27, 2024
ffcd67b
chore: website week 3 published
RvandenHam Mar 5, 2024
f74af62
chore: enabled page week 4 generics
RvandenHam Mar 12, 2024
8622100
docs: made week-05 available
ibrahimko Mar 19, 2024
9b5159b
docs: made week 5 available
ibrahimko Mar 19, 2024
840bc67
docs: made week 3-4 available
ibrahimko Mar 19, 2024
a3aaa78
added comment about comment
homberghp Mar 19, 2024
eb2ba59
added some text to instance of and logging
homberghp Mar 19, 2024
dc126c3
ignore my doit
homberghp Mar 20, 2024
4a1a033
Update collectionenhancements.adoc
homberghp Mar 22, 2024
d4a86d9
Merge branch 'reflectorgenerate'
homberghp Mar 22, 2024
e13b57c
merged with main
homberghp Mar 22, 2024
56b85fa
merged with main
homberghp Mar 22, 2024
ce5f225
Update assignablefrom.uxf
homberghp Mar 22, 2024
0a9c62b
box fit
homberghp Mar 22, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
Loading