Added Java support

michael-bateman · Sep 24, 2017 · ab7e2f2 · ab7e2f2
1 parent 5d213d7
commit ab7e2f2
Show file tree

Hide file tree

Showing 4 changed files with 60 additions and 2 deletions.
diff --git a/_data/projects.yml b/_data/projects.yml
@@ -12,13 +12,15 @@
 #   status: (If there is TravisCI or no)[bool]
 #   ruby: (If the project uses Ruby)[bool]
 #   python: (If the project uses Python)[bool]
+#   java: (If the project uses Java)[bool]
 #   languages: (All the other languages)[bool]
 #     html:
 #     css:
 #     javascript:
 #     python:
 #     applescript:
 #     apache:
+#     java: (Name of main file)[string]
 #   license: (The type of license)[string - gpl, apache, mit]
 
 michaelbateman.ca:
@@ -36,6 +38,16 @@ michaelbateman.ca:
     apache: True
   license: gpl
 
+Math-Calculator:
+  name: Math Calculator
+  description: My first java project which is a simple math calculator for some simple formulas.
+  github: Math-Calculator
+  link: math-calculator
+  status: False
+  java: True
+  languages:
+    java: Calculator
+
 
 beta.michaelbateman.ca:
   name: Beta personal website

diff --git a/_includes/cloning.html b/_includes/cloning.html
@@ -21,6 +21,11 @@ <h2 class="card-title">Development Guide</h2>
             Python
           </li>
         {% endif %}
+        {% if project.java %}
+          <li>
+            Java
+          </li>
+        {% endif %}
       	<br />
       	Most modern computers come with Git installed.  If you do not have it installed, you can download it at <a href="https://git-scm.com/downloads">https://git-scm.com/downloads</a>.
       	<br /><br />
@@ -32,7 +37,7 @@ <h2 class="card-title">Development Guide</h2>
           <b>Note</b> - To install Jekyll you must have already installed Ruby.  
         {% endif %}
         {% if project.python %}
-          Make sure you have Python downloaded on your machine.  Most modern Mac's come with Python pre-installed.  You can check to see if Python is installed by typing:
+          Make sure you have Python installed on your machine.  Most modern Mac's come with Python pre-installed.  You can check to see if Python is installed by typing:
           <br /><br />
           <code>
             $ python
@@ -49,6 +54,9 @@ <h2 class="card-title">Development Guide</h2>
           <br /><br />
           Press <kbd><kbd>control</kbd> + <kbd>z</kbd></kbd> to exit the Python interpreter.
         {% endif %}
+        {% if project.java %}
+          Make sure you have Java installed. Java does not usually come installed with your computer. To install it, head to <a href="http://www.oracle.com/technetwork/java/javase/downloads/index.html">http://www.oracle.com/technetwork/java/javase/downloads/index.html</a>. Now, click on the Java only download, not the Net Beans one. Follow the prompts, to ensure that Java is fully installed.
+        {% endif %}
         <br /><br />
     		<b>Note</b> - Do not type the <code>$</code> as it is a reminder that it is a command, to be entered on the command line.
     		<br /><br />
@@ -90,6 +98,33 @@ <h2 class="card-title">Development Guide</h2>
             $ python &lt;file_name&gt;
           </code>
         {% endif %}
+        {% if project.java %}
+          Navigate to the project directory by using the <code>cd</code> command. Type:
+          <br /><br />
+          <code>
+            $ cd {{ project.github }}
+          </code>
+          <br /><br />
+          Since this project was made with Eclipse, you will need to <code>cd</code> into the <code>src</code> direcory. Enter:
+          <br /><br />
+          <code>
+            $ cd src/
+          </code>
+          <br /><br />
+          Now, we type the following to compile the code:
+          <br /><br />
+          <code>
+            $ javac {{ project.languages.java }}.java
+          </code>
+          <br /><br />
+          Then run the code by typing:
+          <br /><br />
+          <code>
+            $ java {{ project.languages.java }}
+          </code>
+        {% endif %}
+        <br /><br />
+        Now, the program should work!
 	    </p>
     </div>
   </div>

diff --git a/_includes/project-header.html b/_includes/project-header.html
@@ -27,7 +27,7 @@ <h2 class="card-title">Project Links</h2>
 		</div>
 		<br />
 	{% endif %}
-	{% if project.languages.html or project.ruby or project.languages.css or project.languages.javascript or project.python or project.languages.applescript or project.languages.apache %}
+	{% if project.languages.html or project.java or project.ruby or project.languages.css or project.languages.javascript or project.python or project.languages.applescript or project.languages.apache %}
 		<div class="card">
 			<div class="card-block">
 				<h2 class="card-title">Badges</h2>
@@ -56,6 +56,9 @@ <h2 class="card-title">Badges</h2>
 					{% if project.languages.apache %}
 						<img src="https://img.shields.io/badge/Language-ApacheConf-lightgrey.svg">
 					{% endif %}
+					{% if project.java %}
+						<img src="https://img.shields.io/badge/Language-Java-b07219.svg">
+					{% endif %}
 					{% if project.license == "mit" %}
 						<img src="https://img.shields.io/badge/License-MIT-blue.svg">
 					{% endif %}

diff --git a/projects/math-calculator.md b/projects/math-calculator.md
@@ -0,0 +1,8 @@
+---
+layout: project
+title: Math Calculator
+permalink: /math-calculator/
+project: Math-Calculator
+---
+
+This was one of my first projects I made in Java. It contains 3 calculators, a Pythagorean Theorem calculator, Mod simplifier, and Volume of a Sphere calculator.