--- a/parsers/java/PPJavaLexicon.st	Tue Apr 21 14:57:16 2015 +0100
+++ b/parsers/java/PPJavaLexicon.st	Tue Apr 21 17:06:24 2015 +0100
@@ -28,6 +28,7 @@
 PPJavaLexicon comment:'A parser with a definitions for some basic Java gramar parts

Grammar rules follow as closely as possible the specification found in "The Java Language Specification Third Edition"

URL = '
 !
 
+
 !PPJavaLexicon class methodsFor:'accessing'!
 
 ignoredNames
@@ -159,11 +160,12 @@
 
 keyword
 
-	| keywordParsers |
-	
-	keywordParsers := keywords keysSortedSafely 
-								collect: [:eachKey | keywords at: eachKey ].
-	^ self asToken: ( (keywordParsers reduce: [ :a :b | a / b ]) )
+        | keywordParsers |
+        
+        keywordParsers := keywords keys asSortedCollection collect: [:eachKey | keywords at: eachKey ].
+        ^ self asToken: ( (keywordParsers reduce: [ :a :b | a / b ]) )
+
+    "Modified (format): / 21-04-2015 / 15:27:29 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
 !PPJavaLexicon methodsFor:'grammar-lineTerminators'!
@@ -175,7 +177,9 @@
 
 lineTerminator
 
-	^ (Character lf asParser) / (Character cr asParser , (Character lf asParser ) optional )
+        ^ ((Character codePoint: 10)   asParser) / ((Character codePoint: 13) asParser , ((Character codePoint: 10) asParser ) optional )
+
+    "Modified: / 21-04-2015 / 16:55:52 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
 !PPJavaLexicon methodsFor:'grammar-literals'!
@@ -401,12 +405,12 @@
 !PPJavaLexicon methodsFor:'grammar-operators'!
 
 operator
-	| operatorParsers |
-	
-	operatorParsers := operators keysSortedSafely 
-								collect: [:eachKey | operators at: eachKey ].
-						
-	^self asToken:  (operatorParsers reduce: [ :a :b | a / b ]) 
+        | operatorParsers |
+        
+        operatorParsers := operators keys asSortedCollection collect: [:eachKey | operators at: eachKey ].                                                
+        ^self asToken:  (operatorParsers reduce: [ :a :b | a / b ])
+
+    "Modified: / 21-04-2015 / 15:26:21 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
 !PPJavaLexicon methodsFor:'grammar-separators'!
@@ -531,3 +535,10 @@
 							ifAbsent: [operators at: aString] ])
 ! !
 
+!PPJavaLexicon class methodsFor:'documentation'!
+
+version_HG
+
+    ^ '$Changeset: <not expanded> $'
+! !
+