Commit message (Collapse) | Author | Age | Lines | ||
---|---|---|---|---|---|
... | |||||
| * | Resolve merge conflict with master | Cameron Schermerhorn | 2015-10-09 | -1/+1 | |
| | | | | | | + added name back to contributor list | ||||
| * | Merge remote-tracking branch 'refs/remotes/adambard/master' | Cameron Schermerhorn | 2015-10-09 | -89/+142 | |
| |\ | | | | | | | | | | | | | Conflicts: java.html.markdown | ||||
| * | | Add space to comment prior to switch string | Cameron Schermerhorn | 2015-10-09 | -1/+1 | |
| | | | | | | | | | + Add space to comment (after //) prior to switch on string example | ||||
| * | | Edit string switch addition | Cameron Schermerhorn | 2015-10-07 | -2/+2 | |
| | | | | | | | | | | | | | | | + fix typos: line 284: fix prinln to println line 293: fix sustem to system | ||||
| * | | Add example for switching Strings | Cameron Schermerhorn | 2015-10-07 | -0/+18 | |
| | | | | | | | | | | | | + Added switch structure to demonstrate how to switch Strings + Added name to contributor list | ||||
* | | | Fix conflicts from merge with master | Todd M. Guerra | 2015-10-09 | -32/+13 | |
| | | | |||||
* | | | Merge remote-tracking branch 'adambard/master' | Todd M. Guerra | 2015-10-09 | -68/+141 | |
|\ \ \ | | |/ | |/| | | | | | | | Conflicts: java.html.markdown | ||||
| * | | [java/en] Fixed repitions | Zachary Ferguson | 2015-10-08 | -57/+2 | |
| | | | |||||
| * | | Merge remote-tracking branch 'adambard/master' | Zachary Ferguson | 2015-10-07 | -10/+67 | |
| |\ \ | | | | | | | | | | | | | | | | | Conflicts: java.html.markdown | ||||
| * | | | [java/en] Fixed Whitespace | Zachary Ferguson | 2015-10-06 | -63/+63 | |
| | | | | | | | | | | | | | | | | Converted tabs to 4 spaces for consistency. | ||||
| * | | | [java/en] Final Methods | Zachary Ferguson | 2015-10-06 | -1/+14 | |
| | | | | | | | | | | | | | | | | Explained Final Methods | ||||
| * | | | [java/en] removed excess abstract class | Zachary Ferguson | 2015-10-06 | -22/+0 | |
| | | | | | | | | | | | | | | | | removed excess abstract class | ||||
| * | | | [java/en] Merged definitions of abstract and added final | Zachary Ferguson | 2015-10-06 | -23/+31 | |
| | | | | | | | | | | | | | | | | Merged definitions of abstract and added a definition of final classes. | ||||
| * | | | Merge remote-tracking branch 'adambard/master' | Zachary Ferguson | 2015-10-06 | -2/+117 | |
| |\ \ \ | | | |/ | | |/| | | | | | | | | | Conflicts: java.html.markdown | ||||
| * | | | [java/en] Edits and additions | Zachary Ferguson | 2015-10-06 | -19/+71 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Included an example of printf Discussed final variable initialization Gave a floating point division example Discussed boolean operators Defined the abstract and final class and compared them. Added some clarifying remarks to comments. | ||||
* | | | | Fix some grammar, spelling and indentation | Todd M. Guerra | 2015-10-08 | -14/+16 | |
| |_|/ |/| | | | | | | | | | | | Just some quick cleanup to make the code correctly formatted in parts and fixed some typos. | ||||
* | | | removing whitespace all over | Gabriel Halley | 2015-10-07 | -15/+15 | |
| |/ |/| | |||||
* | | Update java en file to fix small typo `buy` to `by` | Levi Bostian | 2015-10-06 | -1/+1 | |
| | | |||||
* | | Added description for Double Brace Initialization | Per Lilja | 2015-10-05 | -0/+27 | |
| | | |||||
* | | Merge pull request #1300 from dhwanishah/javaPageChange | Levi Bostian | 2015-10-04 | -2/+22 | |
|\ \ | | | | | | | Added how to declare and initialize variables for single and multiple instances | ||||
| * | | Added section on how to declare and initialize both single varible and ↵ | Dhwani Shah | 2015-10-02 | -2/+22 | |
| | | | | | | | | | | | | multiple varibles with the same value. Important concept for large structured programs. Seperated this a little bit. | ||||
| * | | Update java.html.markdown | Dhwani Shah | 2015-10-02 | -12/+68 | |
| | | | |||||
| * | | Update java.html.markdown | Dhwani Shah | 2015-10-02 | -90/+14 | |
| | | | |||||
| * | | Added section on how to declare and initialize both single varible and ↵ | Dhwani Shah | 2015-10-02 | -2/+22 | |
| |/ | | | | | | | multiple varibles with the same value. Important concept for large structured programs. Seperated this a little bit. | ||||
* | | Modified as said to by a Collaborator | bk2dcradle | 2015-10-05 | -3/+3 | |
| | | |||||
* | | Added abstract classes | bk2dcradle | 2015-10-04 | -0/+68 | |
|/ | |||||
* | Further improve for loop description. | Simon Morgan | 2015-05-26 | -3/+3 | |
| | |||||
* | Improve description of the for loop. | Simon Morgan | 2015-05-23 | -4/+5 | |
| | |||||
* | Some more small changes that don't affect semantics. | Simon Morgan | 2015-05-23 | -17/+17 | |
| | |||||
* | A bunch of small changes to aid clarity, brevity and/or consistency, none of ↵ | Simon Morgan | 2015-05-23 | -91/+80 | |
| | | | | which should alter the semantics. | ||||
* | No-space array notation type[] | Antonio Lima | 2015-03-15 | -6/+6 | |
| | |||||
* | Update java.html.markdown | Tim Miller | 2015-02-23 | -0/+2 | |
| | | | Added "Thinking In Java" by Bruce Eckel to the book list. It's the best Java book I've ever read. | ||||
* | java: Add `@Override` for interfaces. | Jakukyo Friel | 2015-01-07 | -0/+5 | |
| | |||||
* | Merge pull request #893 from sam-m888/patch-2 | Adam Bard | 2014-12-22 | -3/+3 | |
|\ | | | | | Spelling corrrection | ||||
| * | Spelling corrrection | Sam | 2014-12-22 | -3/+3 | |
| | | |||||
* | | Remove spurious "[" | Sam | 2014-12-22 | -1/+1 | |
|/ | |||||
* | [Java] Maps description little fix. | Sergey | 2014-11-01 | -1/+1 | |
| | |||||
* | Added description of LinkedList, Map & HashMap. | Sergey | 2014-10-31 | -3/+9 | |
| | |||||
* | Fix arrow => array java typo. | Levi Bostian | 2014-09-01 | -1/+1 | |
| | |||||
* | Spelling error | Kado | 2014-08-07 | -1/+1 | |
| | | | From datetype to datatype | ||||
* | Added additional resources for learning Java | Ariel | 2014-02-12 | -3/+16 | |
| | |||||
* | Added section on interfaces. Added array info | U-Christopher-PC\Christopher | 2014-02-10 | -2/+45 | |
| | |||||
* | Issue#163 | Jake Prather | 2014-01-30 | -1/+1 | |
| | | | https://github.com/adambard/learnxinyminutes-docs/issues/163 | ||||
* | Fix errors specified in #410. | Adam Brenecki | 2013-11-16 | -15/+19 | |
| | |||||
* | [java] Missing semi-colon at code example | Christos Kontas | 2013-10-08 | -1/+1 | |
| | |||||
* | Added '?' conditional logic example | Madison Dickson | 2013-09-13 | -0/+8 | |
| | | | Also added myself as a contributor. | ||||
* | Including for each loop example | Madison Dickson | 2013-09-04 | -1/+13 | |
| | |||||
* | Update java.html.markdown | rduerig | 2013-08-16 | -0/+4 | |
| | | | added a reference to a book | ||||
* | Fixed stuff | Adam | 2013-07-21 | -1/+1 | |
| | |||||
* | Edited back java updates a bit | Adam | 2013-07-07 | -42/+25 | |
| |