summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorAdam Bard <github@adambard.com>2013-06-30 09:20:07 -0700
committerAdam Bard <github@adambard.com>2013-06-30 09:20:07 -0700
commit35a27a333712987e1b613cb5bac8c1275876efaf (patch)
treef606fdc3dfd379fff36bcfea5776d243d10617e9
parente80e36e14202c4db9602ddf0b6639ff02e821cb9 (diff)
parent2008bcc258b899aae6d11033c1f28ef79db7ba42 (diff)
Merge pull request #61 from Jakehp/patch-1
Fixed url links. Now use markdown.
-rw-r--r--java.html.markdown17
1 files changed, 9 insertions, 8 deletions
diff --git a/java.html.markdown b/java.html.markdown
index 8d882234..648b98bc 100644
--- a/java.html.markdown
+++ b/java.html.markdown
@@ -9,7 +9,7 @@ author_url: http://github.com/JakeHP
---
Java is a general-purpose, concurrent, class-based, object-oriented computer programming language.
-Read more here: https://en.wikipedia.org/wiki/Java_(programming_language)
+[Read more here.](http://docs.oracle.com/javase/tutorial/java/index.html)
```java
// Single-line comments start with //
@@ -236,8 +236,7 @@ Integer.toString(123);//returns a string version of 123
// You can also cast java objects, there's a lot of details and
// deals with some more intermediate concepts.
-// Feel free to check it out here:
-// http://docs.oracle.com/javase/tutorial/java/IandI/subclasses.html
+// Feel free to check it out here: http://docs.oracle.com/javase/tutorial/java/IandI/subclasses.html
///////////////////////////////////////
@@ -312,14 +311,16 @@ public class Main
Other Topics To Research:
-* Inheritance (http://en.wikipedia.org/wiki/Inheritance_(object-oriented_programming))
+* [Inheritance](http://docs.oracle.com/javase/tutorial/java/IandI/subclasses.html)
-* Abstraction (http://en.wikipedia.org/wiki/Abstraction_(computer_science))
+* [Polymorphism](http://docs.oracle.com/javase/tutorial/java/IandI/polymorphism.html)
-* Exceptions (http://en.wikipedia.org/wiki/Exception_handling)
+* [Abstraction](http://docs.oracle.com/javase/tutorial/java/IandI/abstract.html)
-* Interfaces (http://en.wikipedia.org/wiki/Interfaces_(computer_science))
+* [Exceptions](http://docs.oracle.com/javase/tutorial/essential/exceptions/index.html)
-* Generics (http://en.wikipedia.org/wiki/Generics_in_Java)
+* [Interfaces](http://docs.oracle.com/javase/tutorial/java/IandI/createinterface.html)
+
+* [Generics](http://docs.oracle.com/javase/tutorial/java/generics/index.html)
* The links provided are just to get an understanding of the topic, feel free to google and find specific examples