diff --git a/diagrams_source/lab02/merging_topic_branches.svg b/diagrams_source/lab02/merging_topic_branches.svg new file mode 100644 index 0000000..914587f --- /dev/null +++ b/diagrams_source/lab02/merging_topic_branches.svg @@ -0,0 +1,1594 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + Master + + + + + Topic + + + + + + + + Team + + + + + Master + + + + + Topic + Checkout master and pull to get team's recent changes + + Step 1 + + + + + + + + + + + + + + + Master + Delete merged topic + + Step 4 + + + Checkout topic and merge master + + Step 2 + + + + + Master + Merge + + + + + Team + + + + + Topic + + + + + + Master + + + + + Team + + + + + + + + + Topic + Result + + + + Step 3 + Checkout master and merge topic + + + + + Master + + + + + Team + + + + + + + + + Topic + Merge + + + + + + + + + + + + + + Master + + + + + + + + + Topic + Result + + + diff --git a/tiddlers/content/labs/lab02/_Labs_02_Merging Topic Branches.md b/tiddlers/content/labs/lab02/_Labs_02_Merging Topic Branches.md index c7b19ab..c5a180b 100644 --- a/tiddlers/content/labs/lab02/_Labs_02_Merging Topic Branches.md +++ b/tiddlers/content/labs/lab02/_Labs_02_Merging Topic Branches.md @@ -1,5 +1,9 @@ We are pretty much finished with the product editor dialog now and therefor we are also finished with the `product_editor` topic branch. Now we need to merge it back into the master branch. +The following diagram describes the process that we are about to perform: + +{{/Labs/02/images/Merging Topic Branches}} + 1. Triple check that everything is committed since you have to try really hard to accidentally lose work that it is committed. Right click the root of the project and commit from there. There should be no files that need to be committed. 1. Before merging the topic branch, we need to sync it with the remote master so that it includes any changes made by other team members. diff --git a/tiddlers/content/labs/lab02/_Labs_02_images_Merging Topic Branches.svg b/tiddlers/content/labs/lab02/_Labs_02_images_Merging Topic Branches.svg new file mode 100644 index 0000000..914587f --- /dev/null +++ b/tiddlers/content/labs/lab02/_Labs_02_images_Merging Topic Branches.svg @@ -0,0 +1,1594 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + Master + + + + + Topic + + + + + + + + Team + + + + + Master + + + + + Topic + Checkout master and pull to get team's recent changes + + Step 1 + + + + + + + + + + + + + + + Master + Delete merged topic + + Step 4 + + + Checkout topic and merge master + + Step 2 + + + + + Master + Merge + + + + + Team + + + + + Topic + + + + + + Master + + + + + Team + + + + + + + + + Topic + Result + + + + Step 3 + Checkout master and merge topic + + + + + Master + + + + + Team + + + + + + + + + Topic + Merge + + + + + + + + + + + + + + Master + + + + + + + + + Topic + Result + + + diff --git a/tiddlers/content/labs/lab02/_Labs_02_images_Merging Topic Branches.svg.meta b/tiddlers/content/labs/lab02/_Labs_02_images_Merging Topic Branches.svg.meta new file mode 100644 index 0000000..27730c9 --- /dev/null +++ b/tiddlers/content/labs/lab02/_Labs_02_images_Merging Topic Branches.svg.meta @@ -0,0 +1,5 @@ +created: 20200702091026430 +modified: 20200707005526287 +tags: image lab lab02 +title: /Labs/02/images/Merging Topic Branches +type: image/svg+xml \ No newline at end of file diff --git a/tiddlers/content/labs/lab03/_Labs_03_Check Your Branches.md b/tiddlers/content/labs/lab03/_Labs_03_Check Your Branches.md new file mode 100644 index 0000000..5fa12f8 --- /dev/null +++ b/tiddlers/content/labs/lab03/_Labs_03_Check Your Branches.md @@ -0,0 +1,14 @@ +A quick survey of the Git repositories on GitBucket shows that several of you have not merged your `topic/product_editor` branch into `master` yet. This is going to cause problems, so you should check and fix this. + +1. Open NetBeans and look at the root of the project in the projects pane. You will see the current branch to the right of the project name. If you have properly merged the branch then: + + * The current branch should be `[master]`. + * You should be able to see your `ProductEditor` class in the `gui` package. It should be the latest version with the completed <> button click handler. + + If this is true then you are all good and can move on with the rest of the lab. + +2. If your project is currently on the `[topic/product_editor]` branch then work through steps 1 --- 10 of section [4.2.2](#/Labs/02/Merging%20Topic%20Branches) of last week's lab again since you might have missed one of those steps. Repeating steps that you have already performed will not cause any trouble. + +We found ourselves drawing a diagram for several students in last week's lab while explaining the merge process --- we probably should have included a diagram in last week's lab (we have now retroactively added it to lab 2). Here it is now: + +{{/Labs/02/images/Merging Topic Branches}} \ No newline at end of file diff --git a/tiddlers/content/labs/lab03/_Labs_03_Check Your Branches.md.meta b/tiddlers/content/labs/lab03/_Labs_03_Check Your Branches.md.meta new file mode 100644 index 0000000..2841022 --- /dev/null +++ b/tiddlers/content/labs/lab03/_Labs_03_Check Your Branches.md.meta @@ -0,0 +1,4 @@ +section: 3 +tags: lab03 +title: /Labs/03/Check Your Branches +type: text/x-markdown \ No newline at end of file diff --git a/tiddlers/content/labs/lab03/_Labs_03_Milestone 1 is Due on Monday Next Week.md b/tiddlers/content/labs/lab03/_Labs_03_Milestone 1 is Due on Monday Next Week.md index bf99085..0b15cc4 100644 --- a/tiddlers/content/labs/lab03/_Labs_03_Milestone 1 is Due on Monday Next Week.md +++ b/tiddlers/content/labs/lab03/_Labs_03_Milestone 1 is Due on Monday Next Week.md @@ -1,4 +1,4 @@ -Milestone 1 is due next Monday (27th July) at 9:00am +Milestone 1 is due next Monday (2nd August) at 9:00am By the time you have completed this lab and the additional project tasks described in the [Project Tasks](#/Labs/03/Project%20Tasks) section you will have completed the requirements for milestone 1. diff --git a/tiddlers/content/labs/lab03/_Labs_03_Testing the Product Data Access Class.md b/tiddlers/content/labs/lab03/_Labs_03_Testing the Product Data Access Class.md index ada0553..5871862 100644 --- a/tiddlers/content/labs/lab03/_Labs_03_Testing the Product Data Access Class.md +++ b/tiddlers/content/labs/lab03/_Labs_03_Testing the Product Data Access Class.md @@ -45,6 +45,7 @@ build *.zip *.tgz + .DS_Store """ task createGitIgnore { @@ -91,7 +92,7 @@ All of your tests should pass when you are finished. -1. Test your tests. Intentionally break your DAO methods --- for the `saveProduct` and `removeProduct` methods you can comment out the line that adds/removes the product. For the get method you can return an empty `ArrayList`. +1. Test your tests. Intentionally break your DAO methods --- for the `saveProduct` and `removeProduct` methods you can comment out the line that adds/removes the product. For the `getProducts` method you can return an empty `ArrayList`. Your tests should fail --- if not then your tests are not sufficient. The `removeProduct` test might trick you here. If you don't first check that the product you are about to delete exists in the DAO, then you can't actually be sure that the `removeProduct` method removed anything. diff --git a/tiddlers/content/labs/lab03/_Labs_03_The Product Data Access Class.md b/tiddlers/content/labs/lab03/_Labs_03_The Product Data Access Class.md index 51fc47c..56a44ec 100644 --- a/tiddlers/content/labs/lab03/_Labs_03_The Product Data Access Class.md +++ b/tiddlers/content/labs/lab03/_Labs_03_The Product Data Access Class.md @@ -32,12 +32,18 @@ You should be using `Collection` on the left hand side of the field/method declarations instead of `ArrayList`. - If not, fix it now. + If not, fix it now. It should look like: + + ```java + private static Collection products = new ArrayList<>(); + ``` + + The `getProducts` method should also be using `Collection` as the return type. 1. Did you remember to specify the 'type' of the collections? - You should be using the angle bracket notation to specify what type of objects your collections are expecting to hold. + You should be using the angle bracket notation (as shown in the examples in the previous step) to specify what type of objects your collections are expecting to hold. If not, fix it now. -1. Commit. This class is now complete, so you can use the `Closes #4` command in your commit message to close the issue (assuming the issue #4 --- adapt to suit). \ No newline at end of file +1. Commit. This class is now complete, so you can use the `Closes #4` command in your commit message to close the issue (assuming the relevant issue is #4 --- adapt to suit). \ No newline at end of file diff --git a/tiddlers/system/styles/$__ou_styles_Fonts.css b/tiddlers/system/styles/$__ou_styles_Fonts.css index 124b77d..d2db355 100644 --- a/tiddlers/system/styles/$__ou_styles_Fonts.css +++ b/tiddlers/system/styles/$__ou_styles_Fonts.css @@ -1,6 +1,13 @@ @import url('https://fonts.googleapis.com/css?family=Roboto+Condensed&display=swap'); +@import url('https://fonts.googleapis.com/css2?family=Inconsolata&display=swap'); kbd { font-family: sans; font-family: 'Roboto Condensed', sans-serif; +} + +code { + font-family: 'Inconsolata', monospace; + font-size: 1.15em; + font-stretch: semi-condensed; } \ No newline at end of file diff --git a/tiddlers/system/styles/$__ou_styles_Print.css b/tiddlers/system/styles/$__ou_styles_Print.css index 9d2d164..381f1dd 100644 --- a/tiddlers/system/styles/$__ou_styles_Print.css +++ b/tiddlers/system/styles/$__ou_styles_Print.css @@ -4,7 +4,7 @@ } .tc-title { - font-size: 0.8em !important;*/ + font-size: 0.8em !important; } a {