diff --git a/LICENSE.md b/LICENSE.md
index 2149189e..fed464b1 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -200,9 +200,9 @@
See the License for the specific language governing permissions and
limitations under the License.
-##Contributors:
-- Lynn Langit
-- Samantha Langit
+## Contributors:
+* Lynn Langit
+* Samantha Langit
* James Counts
* Genevieve L'Esperance
* Jessica Ellis
@@ -210,6 +210,7 @@
* Llewellyn Falco
* Katrina Owen
* June Clarke
+* Brick Ellis
* David Coopersmith
* Edgar Melendrez
* Alex Puente
diff --git a/README.md b/README.md
index 46d6903f..73a47af1 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,10 @@
-#Get Started With TKP
+# Get Started With TKP
-Setup your computer
+Setup your computer for TKP based on its operating system:
* [Windows](#windows)
* [Mac](#mac)
+* [Linux](#linux)
### Windows
@@ -11,15 +12,15 @@ Setup your computer
-1. **Download** the TKP zip file from this site by clicking the `Download ZIP` button on the middle right side of this page (or use the link directly below this line). Wait for the download to complete.
+1. **Download** the TKP zip file from this site by clicking the green `Clone or Download` button on the middle right side of this page, and then click the blue download zip button (or use the link directly below this line). Wait for the download to complete.
- [![download zip button][2]][1]
+ [](https://github.com/TeachingKidsProgramming/TeachingKidsProgramming.Java/archive/master.zip)
1. **Move** the zip file from your **Downloads** folder to the **C:\TKPSource** folder. The name of the downloaded file is `TeachingkidsProgramming.Java-master.zip`
-1. **Unzip** the downloaded file. Right click on the zip file, and choose `Extract All...`. Next click `Extract` to create the TKP folder.
+1. **Unzip** the downloaded file. Right-click on the zip file, and choose `Extract All...`. Next click `Extract` to create the TKP folder.
@@ -27,7 +28,7 @@ Setup your computer
-1. **Run** the `TKP_Launcher.jar` file by double-clicking it. Wait for it to run. *Tip* if the jar wont run, double check that you are double-clicking it from the extracted **folder** and not inside the **zip**.
+1. **Run** the `TKP_Launcher.jar` file by double-clicking it. Wait for it to run. *Tip* if the jar won't run, double-check that you are double-clicking it from the extracted **folder** and not inside the **zip**.
If the jar file runs ok, then Eclipse will launch with the TKP workspace open. A successful install should look like the screenshot below: (you can test with two lines of code below)
@@ -71,7 +72,7 @@ Setup your computer
-1. **Unzip** the downloaded file. Right click on the zip file, and choose `Open` to create the TKP folder.
+1. **Unzip** the downloaded file. Right-click on the zip file, and choose `Open` to create the TKP folder.
@@ -79,7 +80,7 @@ Setup your computer
-1. **Run** the `TKP_Launcher.jar` file by double-clicking it. Wait for it to run. *Tip* if the jar wont run, double check that you are double-clicking it from the extracted **folder** and not inside the **zip**.
+1. **Run** the `TKP_Launcher.jar` file by double-clicking it. Wait for it to run. *Tip* if the jar won't run, double-check that you are double-clicking it from the extracted **folder** and not inside the **zip**.
If the jar file runs ok, then Eclipse will launch with the TKP workspace open. A successful install should look like the screenshot below: (you can test with two lines of code below)
@@ -110,7 +111,7 @@ Setup your computer
- On the next page there is a table of files you can download. First, accept the Java license by choosing `Accept License Agreement`. Now, find `Mac OS X x64` in the table and download the `dmg` file from the same row.
+ On the next page, there is a table of files you can download. First, accept the Java license by choosing `Accept License Agreement`. Now, find `Mac OS X x64` in the table and download the `dmg` file from the same row.
@@ -126,11 +127,35 @@ Setup your computer
When you have put `eclipse` into `Applications` try launching TKP again by double-clicking `TKP_Launcher.jar`. If it works, great! Otherwise, visit the [Fixing Installation Errors](#troubleshooting) section below for more tips.
+### Linux
+
+1. **Ubuntu**
+
+ To install on Ubuntu, open a terminal window and run the following command:
+
+ ```bash
+ source <(curl -L -s http://tinyurl.com/hzvqvck)
+ ```
+
+ This command will download everything needed for TKP and create a shortcut on your desktop.
+
+Eclipse should run automatically and the first lesson from TKP will open.
+
+If you are having trouble reading the text inside the "JavaDoc" panel, you might need to change your system colors. This can be done by using the "color chooser" app. Just type:
+
+```bash
+sudo apt install gnome-color-chooser
+gnome-color-chooser
+```
+
+You will need to go to the "Specific" tab and change your tooltip colors.
+
+
## Fixing Installation Errors
We're sorry that you are having trouble getting started with TKP. Below you will find a few more troubleshooting tips that we have used to resolve issues in the past.
-###Correct version of Java (7 or higher) not installed
+### Correct version of Java (7 or higher) not installed
We test the standard installation steps using "clean" computers with no software installed except what comes with Windows or OSX. However, your computer might have an older version of Java on it that we don't support.
@@ -138,7 +163,7 @@ To validate the version of Java that is installed, go to [this website](http://j
If the reported version of your Java installation is less than 7, then update Java to the version that Oracle recommends.
-###Correct version of Eclipse (Luna) not installed
+### Correct version of Eclipse (Luna) not installed
We test the standard installation steps using "clean" computers with no software installed except what comes with Windows or OSX. However, your computer might have an older version of eclipse on it that we don't support.
@@ -150,25 +175,25 @@ We test TKP with `Luna`. The friendly names are in alphabetical order, so if yo
We recommend that you delete your current version of eclipse. (Advanced users can rename it, but we won't cover that here). On **Windows**, delete `C:\eclipse`. On **Mac** delete `eclipse` from `Applications`. Next, go back to the installation instructions for [Windows](#wineclipse) or [Mac](#maceclipse) to setup Luna.
-###Customized TKP workspace did not open in Eclipse.
+### Customized TKP workspace did not open in Eclipse.
Open Eclipse and change the default workspace directory, by clicking on `File` then choosing `Switch Workspace` and then `Open...`. Navigate to the `\TeachingKidsProgramming.Java\TeachingKidsProgramming` folder (under `C:\TKPSource` on **Windows**, or `Documents\TKPSource` on **Mac**). After you do this, then your `TeachingKidsProgramming.Java` should include the following folders:
* `\.metadata`
* `\TeachingKidsProgramming`
-###Unable to write to file system location(s)
+### Unable to write to file system location(s)
This general installation failure can occur if your school has "locked down" permissions to student lab computers.
Try to `run as administrator` for **Windows**, or `run as root` for **Mac** and this may allow the downloaded TKP files to unzip.
Some schools create a virtual (sometimes shared) `C:\` drive. If the drive is shared, eclipse should still be installed to `C:\`, but `TKPSource` should be created in each student's `C:\temp` directory.
-###Still Stuck?
+### Still Stuck?
-Please consider writing a description of the errors/problems you are seeing and sharing it with us by opening a GitHub issue. You can be a detailed as you like, and your story will help us make TKP better.
+Please consider writing a description of the errors/problems you are seeing and sharing it with us by opening a GitHub issue. You can be as detailed as you like, and your story will help us make TKP better.
-You can create a issue by following this link (GitHub account required): [Create An Issue][4]
+You can create an issue by following this link (GitHub account required): [Create An Issue][4]
Or you can [email us from this page](http://teachingkidsprogramming.org/contact/) and we will create the issue for you (no account required).
diff --git a/TeachingKidsProgramming/LICENSE.md b/TeachingKidsProgramming/LICENSE.md
index 2149189e..fed464b1 100644
--- a/TeachingKidsProgramming/LICENSE.md
+++ b/TeachingKidsProgramming/LICENSE.md
@@ -200,9 +200,9 @@
See the License for the specific language governing permissions and
limitations under the License.
-##Contributors:
-- Lynn Langit
-- Samantha Langit
+## Contributors:
+* Lynn Langit
+* Samantha Langit
* James Counts
* Genevieve L'Esperance
* Jessica Ellis
@@ -210,6 +210,7 @@
* Llewellyn Falco
* Katrina Owen
* June Clarke
+* Brick Ellis
* David Coopersmith
* Edgar Melendrez
* Alex Puente
diff --git a/TeachingKidsProgramming/src/jars/TeachingKidsProgramming.jar b/TeachingKidsProgramming/src/jars/TeachingKidsProgramming.jar
index 36992c56..8b593772 100644
Binary files a/TeachingKidsProgramming/src/jars/TeachingKidsProgramming.jar and b/TeachingKidsProgramming/src/jars/TeachingKidsProgramming.jar differ
diff --git a/TeachingKidsProgramming/src/org/teachingkidsprogramming/recipes/inDevelopment/firstKata.java b/TeachingKidsProgramming/src/org/teachingkidsprogramming/recipes/inDevelopment/firstKata.java
deleted file mode 100644
index 2679c3bb..00000000
--- a/TeachingKidsProgramming/src/org/teachingkidsprogramming/recipes/inDevelopment/firstKata.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.teachingkidsprogramming.recipes.inDevelopment;
-
-public class firstKata
-{
- public static void main(String[] args) throws Exception
- {
- //Requirement: Write the USER STORIES to draw 3 pyramids
- // Draw a sketch
- // Decompose the sketch into one or more user stories
- // Write out each step in English
- // for example (create one pyramid, create one side)
- // optionally write each user story on a post it
- // use a Kanban board with 'ToDo', 'Doing', 'Done'
- // Select the simplest user story than can be verified
- // Write the English, write the code and run the code
- // Does your code do what you expected?
- // Continue
- // Write the code one line at a time
- // Run your program to verify that your code works
- // Part Two - when you are 'done' look at your code - are there duplicate lines
- // Remove duplicate code by using the 'extract method' re-factoring
- // Understand how to pass multiple arguments to a method
- }
-}
diff --git a/TeachingKidsProgramming/src/org/teachingkidsprogramming/recipes/inDevelopment/forLoopUpdate.java b/TeachingKidsProgramming/src/org/teachingkidsprogramming/recipes/inDevelopment/forLoopUpdate.java
index cdfa7b1e..4a48795a 100644
--- a/TeachingKidsProgramming/src/org/teachingkidsprogramming/recipes/inDevelopment/forLoopUpdate.java
+++ b/TeachingKidsProgramming/src/org/teachingkidsprogramming/recipes/inDevelopment/forLoopUpdate.java
@@ -6,7 +6,7 @@ public static void main(String[] args) throws Exception
{
// Input from Brick Ellis
// Update 'for loop English syntax'
- // End of loop s/b 'end repeat'
+ // End of loop s/b 'end repeat' -- DONE
// Refer to 'for loop ' as 'this - ' with a noun
}
}
diff --git a/TeachingKidsProgramming/src/org/teachingkidsprogramming/section01forloops/DoubleLoop.java b/TeachingKidsProgramming/src/org/teachingkidsprogramming/section01forloops/DoubleLoop.java
index 274c6bd8..df4701bb 100644
--- a/TeachingKidsProgramming/src/org/teachingkidsprogramming/section01forloops/DoubleLoop.java
+++ b/TeachingKidsProgramming/src/org/teachingkidsprogramming/section01forloops/DoubleLoop.java
@@ -26,18 +26,18 @@ public static void main(String[] args)
// Set the pen width of the line the tortoise draws to 17 --#9
// Move the tortoise 8 times the current line number you are drawing --#8.1
// Turn the tortoise 1/5 of 360 degrees to the right --#6
- // Repeat --#7.2
+ // End Repeat --#7.2
//
// Hide the Tortoise --#10
Tortoise.getBackgroundWindow().setBackground(PenColors.Yellows.PeachPuff);
- // Repeat --#3.2
+ // End Repeat --#3.2
// Set the tortoise x position to 300 --#15.1
// Set the tortoise y position to 200 --#15.2
// Do the following 5 times --#12.1
// Change the pen color of the line the tortoise draws to black --#14
// Move the Tortoise 25 pixels --#11
// Turn the tortoise 1/5 of 360 degrees to the right --#13
- // Repeat --#12.2
+ // End Repeat --#12.2
//
}
}
diff --git a/TeachingKidsProgramming/src/org/teachingkidsprogramming/section01forloops/SimpleSquare.java b/TeachingKidsProgramming/src/org/teachingkidsprogramming/section01forloops/SimpleSquare.java
index 18c7a261..91e458d9 100644
--- a/TeachingKidsProgramming/src/org/teachingkidsprogramming/section01forloops/SimpleSquare.java
+++ b/TeachingKidsProgramming/src/org/teachingkidsprogramming/section01forloops/SimpleSquare.java
@@ -10,7 +10,7 @@ public static void main(String[] args) throws Exception
// Change the pen color of the line the tortoise draws to blue --#4
// Move the tortoise 50 pixels --#2
// Turn the tortoise to the right (90 degrees) --#3
- // Repeat --#5.2
+ // End Repeat --#5.2
//
// (Optional): Sign your work using the Virtual Proctor
// See your work at http://virtualproctor.tkpjava.org
diff --git a/TeachingKidsProgramming/src/org/teachingkidsprogramming/section01forloops/Spiral.java b/TeachingKidsProgramming/src/org/teachingkidsprogramming/section01forloops/Spiral.java
index 2a93dd85..482d9ae2 100644
--- a/TeachingKidsProgramming/src/org/teachingkidsprogramming/section01forloops/Spiral.java
+++ b/TeachingKidsProgramming/src/org/teachingkidsprogramming/section01forloops/Spiral.java
@@ -22,6 +22,6 @@ public static void main(String[] args)
{
MessageBox.showMessage("Hold up: " + re);
}
- // Repeat --#3.2
+ // End Repeat --#3.2
}
}
diff --git a/TeachingKidsProgramming/src/org/teachingkidsprogramming/section02methods/FourSquare.java b/TeachingKidsProgramming/src/org/teachingkidsprogramming/section02methods/FourSquare.java
index 347ea188..65d1eb3a 100644
--- a/TeachingKidsProgramming/src/org/teachingkidsprogramming/section02methods/FourSquare.java
+++ b/TeachingKidsProgramming/src/org/teachingkidsprogramming/section02methods/FourSquare.java
@@ -13,9 +13,9 @@ public static void main(String[] args)
// Change the pen color of the line the tortoise draws to a random color --#3
// Move the tortoise 50 pixels --#2
// Turn the tortoise 90 degrees to the right --#4
- // Repeat --#5.2
+ // End Repeat --#5.2
// ------------- End of drawSquare recipe --#6.3
// Turn the tortoise 90 degrees to the right --#9
- // Repeat --#8.2
+ // End Repeat --#8.2
}
}
diff --git a/TeachingKidsProgramming/src/org/teachingkidsprogramming/section02methods/TriangleShell.java b/TeachingKidsProgramming/src/org/teachingkidsprogramming/section02methods/TriangleShell.java
index c9fda2ac..f910d751 100644
--- a/TeachingKidsProgramming/src/org/teachingkidsprogramming/section02methods/TriangleShell.java
+++ b/TeachingKidsProgramming/src/org/teachingkidsprogramming/section02methods/TriangleShell.java
@@ -1,6 +1,5 @@
package org.teachingkidsprogramming.section02methods;
-
@SuppressWarnings("unused")
public class TriangleShell
{
@@ -18,10 +17,10 @@ public static void main(String[] args)
// Do the following 3 times --#3.1
// Move the tortoise using the current length --#4
// Turn the tortoise 1/3rd of 360 degrees --#2
- // Repeat --#3.2
+ // End Repeat --#3.2
// ------------- End of drawTriangle recipe --#5.3
//
// Turn the tortoise 1/60th of 360 degrees to the right --#10
- // Repeat --#7.2
+ // End Repeat --#7.2
}
}
diff --git a/TeachingKidsProgramming/src/org/teachingkidsprogramming/section03ifs/ConcentricLoop.java b/TeachingKidsProgramming/src/org/teachingkidsprogramming/section03ifs/ConcentricLoop.java
index 58036abe..9bcd67a2 100644
--- a/TeachingKidsProgramming/src/org/teachingkidsprogramming/section03ifs/ConcentricLoop.java
+++ b/TeachingKidsProgramming/src/org/teachingkidsprogramming/section03ifs/ConcentricLoop.java
@@ -18,7 +18,7 @@ public static void main(String[] args)
// Move the tortoise 1 pixel --#5
// Turn the tortoise 1 degree --#6
// Change the width of the line that the tortoise draws to 1/100th of the current line --#9
- // Repeat --#8.2
- // Repeat --#3.2
+ // End Repeat --#8.2
+ // End Repeat --#3.2
}
}
\ No newline at end of file
diff --git a/TeachingKidsProgramming/src/org/teachingkidsprogramming/section03ifs/HiLow.java b/TeachingKidsProgramming/src/org/teachingkidsprogramming/section03ifs/HiLow.java
index b9367286..ce7a6b71 100644
--- a/TeachingKidsProgramming/src/org/teachingkidsprogramming/section03ifs/HiLow.java
+++ b/TeachingKidsProgramming/src/org/teachingkidsprogramming/section03ifs/HiLow.java
@@ -15,7 +15,7 @@ public static void main(String[] args)
// Tell the end user that it is too high --#5
// Otherwise, if the guess is too low --#8
// Tell the end user that it is too low --#7
- // Repeat --#9.2
+ // End Repeat --#9.2
// After 8 incorrect guesses tell the user they've lost --#11
}
}
diff --git a/TeachingKidsProgramming/src/org/teachingkidsprogramming/section04mastery/BackgroundPhoto.java b/TeachingKidsProgramming/src/org/teachingkidsprogramming/section04mastery/BackgroundPhoto.java
index 084d1d11..5105801b 100644
--- a/TeachingKidsProgramming/src/org/teachingkidsprogramming/section04mastery/BackgroundPhoto.java
+++ b/TeachingKidsProgramming/src/org/teachingkidsprogramming/section04mastery/BackgroundPhoto.java
@@ -7,13 +7,13 @@ public class BackgroundPhoto
@SuppressWarnings("unused")
public static void main(String[] args)
{
- // Set the current picture to this url "http://img2.timeinc.net/ew/dynamic/imgs/101110/sonny-cher_240.jpg" --#1.0
+ // Set the current picture to this url "https://usatftw.files.wordpress.com/2017/05/spongebob.jpg?w=1000&h=600&crop=1" --#1.0
// Set the background image to the current picture--#1.1
Tortoise.show();
Tortoise.setSpeed(10);
int side = 2;
// Do the following 75 times --#7.1
- // Set the current pen color to crimson --#6.1
+ // Set the current pen color to yellow --#6.1
// Use the current pen color for the line the tortoise draws --#6.2
// Increase the length of a side by 1 pixel --#3.0
// Move the tortoise the length of the current side --#3.1
@@ -21,6 +21,6 @@ public static void main(String[] args)
// Set the Y position of the tortoise to 65 pixels --#2.1
// Turn the tortoise 1/3rd of 360 degrees to the right --#4
// Turn the tortoise 1 more degree --#5
- // Repeat --#7.2
+ // End Repeat --#7.2
}
}
diff --git a/TeachingKidsProgramming/src/org/teachingkidsprogramming/section04mastery/DigiFlower.java b/TeachingKidsProgramming/src/org/teachingkidsprogramming/section04mastery/DigiFlower.java
index a8956927..f3fe9fb2 100644
--- a/TeachingKidsProgramming/src/org/teachingkidsprogramming/section04mastery/DigiFlower.java
+++ b/TeachingKidsProgramming/src/org/teachingkidsprogramming/section04mastery/DigiFlower.java
@@ -10,15 +10,15 @@ public class DigiFlower
public static void main(String[] args)
{
// Show the tortoise --#1
- // Make the tortoise move as fast as possible --#7
- // Make the background silver --#8
- // Make the line the tortoise draws 3 pixels wide --#15
- // createColorPalette (recipe below) --#9.1
- // Do the following 15 times --#13.1
- // drawOctogon (recipe below) --#10.1
- // Turn the tortoise 1/15th of 360 degrees to the right --#12
- // Repeat --#14.2
- // ------------- Recipe for createColorPalette --#9.2
+ // Make the tortoise move as fast as possible --#6
+ // Make the background silver --#7
+ // Make the line the tortoise draws 3 pixels wide --#12
+ // createColorPalette (recipe below) --#8.1
+ // Do the following 15 times --#11.1
+ // drawOctogon (recipe below) --#9.1
+ // Turn the tortoise 1/15th of 360 degrees to the right --#10
+ // End Repeat --#11.2
+ // ------------- Recipe for createColorPalette --#8.2
Color color1 = PenColors.Reds.Red;
Color color2 = PenColors.Oranges.DarkOrange;
Color color3 = PenColors.Yellows.Gold;
@@ -31,14 +31,14 @@ public static void main(String[] args)
ColorWheel.addColor(color3);
ColorWheel.addColor(color2);
ColorWheel.addColor(color1);
- // ------------- End of createColorPalette recipe --#9.3
+ // ------------- End of createColorPalette recipe --#8.3
//
- // ------------- Recipe for drawOctogon --#10.2
- // Do the following 8 times --#6.1
- // Change the pen color of the line the tortoise draws to the next color on the color wheel --#4
+ // ------------- Recipe for drawOctogon --#9.2
+ // Do the following 8 times --#5.1
+ // Change the pen color of the line the tortoise draws to the next color on the color wheel --#3
// Move the tortoise 50 pixels --#2
- // Turn the tortoise 1/8th of 360 degrees to the right --#5
- // Repeat --#6.2
+ // Turn the tortoise 1/8th of 360 degrees to the right --#4
+ // End Repeat --#5.2
// ------------- End of drawOctogon recipe --#10.3
}
}
diff --git a/TeachingKidsProgramming/src/org/teachingkidsprogramming/section04mastery/KnottedRing.java b/TeachingKidsProgramming/src/org/teachingkidsprogramming/section04mastery/KnottedRing.java
index e154b723..59879d6a 100644
--- a/TeachingKidsProgramming/src/org/teachingkidsprogramming/section04mastery/KnottedRing.java
+++ b/TeachingKidsProgramming/src/org/teachingkidsprogramming/section04mastery/KnottedRing.java
@@ -11,18 +11,18 @@ public static void main(String[] args)
Tortoise.show();
// Make the tortoise move as fast as possible --#4
createColorPalette();
- // Do the following 30 times --#10.1
+ // Do the following 30 times --#9.1
// Change the pen color of the line the tortoise draws to the next color from the color wheel --#5
- // drawOctagonWithOverlap (recipe below) --#8.0
- // ------------- Recipe for drawOctagonWithOverlap --#7.1
+ // drawOctagonWithOverlap (recipe below) --#7.0
+ // ------------- Recipe for drawOctagonWithOverlap --#6.1
// Do the following 8 + 1 times --#3.1
// Move the tortoise 110 pixels --#1
// Turn the tortoise 1/8th of 360 degrees to the right --#2
- // Repeat --#3.2
- // ------------- End of drawOctagonWithOverlap recipe --#7.2
- // Turn the tortoise 1/30th of 360 degrees to the right --#9
- // Turn the tortoise 5 more degrees to the right --#11
- // Repeat --#10.2
+ // End Repeat --#3.2
+ // ------------- End of drawOctagonWithOverlap recipe --#6.2
+ // Turn the tortoise 1/30th of 360 degrees to the right --#8
+ // Turn the tortoise 5 more degrees to the right --#10
+ // End Repeat --#9.2
}
private static void createColorPalette()
{
diff --git a/TeachingKidsProgramming/src/org/teachingkidsprogramming/section04mastery/PentagonCrazy.java b/TeachingKidsProgramming/src/org/teachingkidsprogramming/section04mastery/PentagonCrazy.java
index 9d5b0ae3..09421e74 100644
--- a/TeachingKidsProgramming/src/org/teachingkidsprogramming/section04mastery/PentagonCrazy.java
+++ b/TeachingKidsProgramming/src/org/teachingkidsprogramming/section04mastery/PentagonCrazy.java
@@ -27,15 +27,15 @@ public static void main(String[] args)
// ------------- Recipe for adjustPen --#9.2
// Change the pen color of the line the tortoise draws to the next color on the color wheel --#6
// Increase the tortoises pen width by 1 --#15
- // If the tortoises pen width is greater than 4, then --#17
- // Reset it to 1 --#16
+ // If the tortoise's pen width is greater than 4, then --#17
+ // Reset the pen width to 1 --#16
// ------------- End of adjustPen recipe --#9.3
//
// The current length of a side is the same as the number of the side you are about to draw ( 1st side = 1 pixel, 2nd side = 2 pixels, etc) --#4.2
// Move the tortoise the length of a side --#4.1
// Turn the tortoise 1/5th of 360 degrees --#1
// Turn the tortoise 1 more degree --#5
- // Repeat --#2.2
+ // End Repeat --#2.2
// ------------- End of drawPentagon recipe --#10.3
}
}
diff --git a/TeachingKidsProgramming/src/org/teachingkidsprogramming/section05recursion/RecursiveSquare.java b/TeachingKidsProgramming/src/org/teachingkidsprogramming/section05recursion/RecursiveSquare.java
index 72fa3f8d..48c055e8 100644
--- a/TeachingKidsProgramming/src/org/teachingkidsprogramming/section05recursion/RecursiveSquare.java
+++ b/TeachingKidsProgramming/src/org/teachingkidsprogramming/section05recursion/RecursiveSquare.java
@@ -34,7 +34,7 @@ public static void main(String[] args) throws Exception
// MakeASquare with the current length divided by 1.7 (recipe below)--#11.3
// If the current process count is less than 3 (HINT: use 'i') --#9
// Turn the tortoise 90 degrees to the right --#6.1
- // Repeat --#7.2
+ // End Repeat --#7.2
//
// MoveBackToCenter with the current length (recipe below)--#5.3
// Create the moveBackToCenter recipe --#5.1
diff --git a/TeachingKidsProgramming/src/org/teachingkidsprogramming/section05recursion/SpiderWeb.java b/TeachingKidsProgramming/src/org/teachingkidsprogramming/section05recursion/SpiderWeb.java
index 769a1c09..3db366e2 100644
--- a/TeachingKidsProgramming/src/org/teachingkidsprogramming/section05recursion/SpiderWeb.java
+++ b/TeachingKidsProgramming/src/org/teachingkidsprogramming/section05recursion/SpiderWeb.java
@@ -25,15 +25,15 @@ public static void main(String[] args)
// Do the following 3 times --#3.1
// Move the tortoise the current length (of the line) --#1.1
// Turn the tortoise 1/3rd of 360 degrees --#2
- // Repeat --#3.2
+ // End Repeat --#3.2
// ------------- End of drawTriangle recipe --#4.3
//
// Turn the tortoise 1/6th of 360 degrees to the right --#7
// Increase the current length (of the line) by the current zoom --#8.1
- // Repeat --#5.2
+ // End Repeat --#5.2
// ------------- End of weaveOneLayer recipe --#9.3
//
// Change the current zoom so it is multiplied by 1.3 --#11
- // Repeat --#10.2
+ // End Repeat --#10.2
}
}
diff --git a/TeachingKidsProgramming/src/org/teachingkidsprogramming/section07objects/CloneTurtles.java b/TeachingKidsProgramming/src/org/teachingkidsprogramming/section07objects/CloneTurtles.java
index 257e667a..7c15f658 100644
--- a/TeachingKidsProgramming/src/org/teachingkidsprogramming/section07objects/CloneTurtles.java
+++ b/TeachingKidsProgramming/src/org/teachingkidsprogramming/section07objects/CloneTurtles.java
@@ -16,7 +16,7 @@ private void showSomeTurtles()
// Use a FOR loop to add your three turtles --#4.1
// Create a turtle instance --#2.1
// Add your turtles to your turtle container --#2.2
- // Repeat --#4.2
+ // End Repeat --#4.2
//
// Create a variable to count the number of turtles in the container --#3.1
// Uncomment to Show the number of turtles in the container on the window --#3.2
@@ -24,18 +24,18 @@ private void showSomeTurtles()
//
// Use a FOREACH loop to add your turtles to your window --#5.1
// Add and Show your turtles on your window --#5.3
- // Repeat --#5.2
+ // End Repeat --#5.2
//
// Use a FOR loop to teleport all of your turtles around your window --#6.1
// Get your turtle's current position and then set the X position to i*100 + 350 --#6.3
// Get your turtle's current position and then set the Y position to i*100 + 100 --#6.4
- // Repeat --#6.2
+ // End Repeat --#6.2
//
// Use a FOREACH loop to set values for all of your turtles --#7.1
// Set the pen width to 10 pixels -- #7.3
// Set the turtle speed to 9 --#7.4
// Have each turtle draw a star with a side that is 100 pixels --#7.5
- // Repeat --#7.2
+ // End Repeat --#7.2
}
//
public static void main(String[] args)
diff --git a/images/download zip.png b/images/download zip.png
new file mode 100644
index 00000000..6e4a3ffe
Binary files /dev/null and b/images/download zip.png differ
diff --git a/images/download_zip.png b/images/download_zip.png
new file mode 100644
index 00000000..6e4a3ffe
Binary files /dev/null and b/images/download_zip.png differ
diff --git a/install.sh b/install.sh
new file mode 100644
index 00000000..a7db2843
--- /dev/null
+++ b/install.sh
@@ -0,0 +1,17 @@
+mkdir ~/TKPSource
+cd ~/TKPSource
+wget https://github.com/clockwisemusic/TeachingKidsProgramming.Java/archive/master.zip
+unzip master.zip
+rm master.zip
+mv TeachingKidsProgramming.Java-master TeachingKidsProgramming.Java
+cd TeachingKidsProgramming.Java
+unzip eclipse_workspace.zip
+cp tkp.desktop ~/Desktop
+echo Exec=$HOME/eclipse/eclipse -data $HOME/TKPSource/TeachingKidsProgramming.Java >>~/Desktop/tkp.desktop
+chmod +x ~/Desktop/tkp.desktop
+cd ~/
+wget http://mirror.internode.on.net/pub/eclipse/technology/epp/downloads/release/luna/SR2/eclipse-java-luna-SR2-linux-gtk-x86_64.tar.gz
+tar xzf eclipse-java-luna-SR2-linux-gtk-x86_64.tar.gz
+rm eclipse-java-luna-SR2-linux-gtk-x86_64.tar.gz
+~/eclipse/eclipse -data ~/TKPSource/TeachingKidsProgramming.Java
+#sudo apt install gnome-color-chooser
diff --git a/tkp.desktop b/tkp.desktop
new file mode 100755
index 00000000..90f01d9b
--- /dev/null
+++ b/tkp.desktop
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Name=Teaching Kids Programming
+Comment=Teaching Kids Programming In Java
+Icon=eclipse
+StartupNotify=true
+Terminal=false
+Type=Application