Commit Graph

76 Commits

Author SHA1 Message Date
Levi Bostian
5ae76f711e Merge pull request #1389 from cschermerhorn/master
[java/en] Add Switching on String Example to Java
2015-10-12 23:04:37 -05:00
Cameron Schermerhorn
35e89f86fe Resolve merge conflict with master
+ added name back to contributor list
2015-10-09 13:31:48 -04:00
Cameron Schermerhorn
d2010c0860 Merge remote-tracking branch 'refs/remotes/adambard/master'
Conflicts:
	java.html.markdown
2015-10-09 13:30:07 -04:00
Todd M. Guerra
1caa042526 Fix conflicts from merge with master 2015-10-09 11:19:17 -04:00
Todd M. Guerra
fc3c56ee93 Merge remote-tracking branch 'adambard/master'
Conflicts:
	java.html.markdown
2015-10-09 11:14:29 -04:00
Cameron Schermerhorn
bf7d33037f Add space to comment prior to switch string
+ Add space to comment (after //) prior to switch on string example
2015-10-09 08:14:11 -04:00
Todd M. Guerra
6d3f52b7f0 Fix some grammar, spelling and indentation
Just some quick cleanup to make the code correctly formatted in parts
and fixed some typos.
2015-10-08 11:53:19 -04:00
Zachary Ferguson
7aca9100a0 [java/en] Fixed repitions 2015-10-08 00:00:37 -04:00
Zachary Ferguson
bc21259249 Merge remote-tracking branch 'adambard/master'
Conflicts:
	java.html.markdown
2015-10-07 23:46:13 -04:00
Gabriel Halley
960ee4a185 removing whitespace all over 2015-10-07 23:11:24 -04:00
Cameron Schermerhorn
18b1c0c4d6 Edit string switch addition
+ fix typos:
     line 284: fix prinln to println
     line 293: fix sustem to system
2015-10-07 08:56:29 -04:00
Cameron Schermerhorn
ec125fb6e7 Add example for switching Strings
+ Added switch structure to demonstrate how to switch Strings
+ Added name to contributor list
2015-10-07 08:53:09 -04:00
Zachary Ferguson
cea7db46eb [java/en] Fixed Whitespace
Converted tabs to 4 spaces for consistency.
2015-10-06 19:09:13 -04:00
Zachary Ferguson
420e04a590 [java/en] Final Methods
Explained Final Methods
2015-10-06 19:07:24 -04:00
Zachary Ferguson
01685afb84 [java/en] removed excess abstract class
removed excess abstract class
2015-10-06 18:31:11 -04:00
Zachary Ferguson
93d7d801d8 [java/en] Merged definitions of abstract and added final
Merged definitions of abstract and added a definition of final classes.
2015-10-06 18:28:57 -04:00
Zachary Ferguson
c4f93c0b0e Merge remote-tracking branch 'adambard/master'
Conflicts:
	java.html.markdown
2015-10-06 18:19:20 -04:00
Zachary Ferguson
29cbff1768 [java/en] Edits and additions
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.
2015-10-06 18:16:33 -04:00
Levi Bostian
9b0877f7eb Update java en file to fix small typo buy to by 2015-10-06 09:36:03 -05:00
Per Lilja
8b45642640 Added description for Double Brace Initialization 2015-10-05 20:29:05 +02:00
Levi Bostian
84a2cd0748 Merge pull request #1300 from dhwanishah/javaPageChange
Added how to declare and initialize variables for single and multiple instances
2015-10-04 17:13:51 -05:00
bk2dcradle
d8efd3ba34 Modified as said to by a Collaborator 2015-10-05 01:38:02 +05:30
bk2dcradle
6b6f88c64d Added abstract classes 2015-10-04 18:30:19 +05:30
Dhwani Shah
63793af2e9 Added section on how to declare and initialize both single varible and multiple varibles with the same value. Important concept for large structured programs. Seperated this a little bit. 2015-10-02 14:54:09 -05:00
Dhwani Shah
c7240369b6 Update java.html.markdown 2015-10-02 14:47:17 -05:00
Dhwani Shah
231cd629ca Update java.html.markdown 2015-10-02 14:45:25 -05:00
Dhwani Shah
8e388cd334 Added section on how to declare and initialize both single varible and multiple varibles with the same value. Important concept for large structured programs. Seperated this a little bit. 2015-10-02 14:30:45 -05:00
Simon Morgan
8c3a0be856 Further improve for loop description. 2015-05-26 20:21:43 +01:00
Simon Morgan
7560b334db Improve description of the for loop. 2015-05-23 12:51:20 +01:00
Simon Morgan
b72c575c04 Some more small changes that don't affect semantics. 2015-05-23 12:37:04 +01:00
Simon Morgan
933f0a461d A bunch of small changes to aid clarity, brevity and/or consistency, none of which should alter the semantics. 2015-05-23 12:13:07 +01:00
Antonio Lima
6034688980 No-space array notation type[] 2015-03-15 21:17:52 -04:00
Tim Miller
82342bbe98 Update java.html.markdown
Added "Thinking In Java" by Bruce Eckel to the book list.  It's the best Java book I've ever read.
2015-02-23 10:37:56 -05:00
Jakukyo Friel
0512b3120a
java: Add @Override for interfaces. 2015-01-07 23:15:25 +08:00
Adam Bard
95de3c05a5 Merge pull request #893 from sam-m888/patch-2
Spelling corrrection
2014-12-22 12:48:36 +01:00
Sam
c9ae9ea396 Spelling corrrection 2014-12-22 13:37:03 +11:00
Sam
c4e1109e3a Remove spurious "[" 2014-12-22 13:35:46 +11:00
Sergey
494d97c4ee [Java] Maps description little fix. 2014-11-01 22:32:51 +03:00
Sergey
3a12532da9 Added description of LinkedList, Map & HashMap. 2014-10-31 17:29:06 +03:00
Levi Bostian
12c9653b03 Fix arrow => array java typo. 2014-09-01 11:01:30 -05:00
Kado
09b1930986 Spelling error
From datetype to datatype
2014-08-07 09:55:27 +03:00
Ariel
5746c14db7 Added additional resources for learning Java 2014-02-12 22:02:58 -05:00
U-Christopher-PC\Christopher
928e53a108 Added section on interfaces. Added array info 2014-02-10 14:28:54 -07:00
Jake Prather
1e0d5abeba Issue#163
https://github.com/adambard/learnxinyminutes-docs/issues/163
2014-01-30 12:36:19 -06:00
Adam Brenecki
8121793f32 Fix errors specified in #410. 2013-11-16 19:40:06 +10:30
Christos Kontas
925ded8780 [java] Missing semi-colon at code example 2013-10-08 19:09:12 +03:00
Madison Dickson
338862e732 Added '?' conditional logic example
Also added myself as a contributor.
2013-09-13 11:58:46 -04:00
Madison Dickson
995013c921 Including for each loop example 2013-09-04 11:30:44 -04:00
rduerig
43d602b0c0 Update java.html.markdown
added a reference to a book
2013-08-16 12:37:40 +02:00
Adam
1466127aa3 Fixed stuff 2013-07-21 16:47:55 -07:00