Merge remote-tracking branch 'flaminem/master'

mbarbon · mbarbon · commit 335bfe0f4210 · 2017-09-02T15:00:51.000+02:00
From ua-parser#9
diff --git a/src/main/java/ua_parser/Parser.java b/src/main/java/ua_parser/Parser.java
@@ -44,8 +44,8 @@ public Parser(InputStream regexYaml) {
   }
 
   public Client parse(String agentString) {
-    UserAgent ua = parseUserAgent(agentString);
-    OS os = parseOS(agentString);
+    UserAgent ua = uaParser.parse(agentString);
+    OS os = osParser.parse(agentString);
     Device device = deviceParser.parse(agentString);
     return new Client(ua, os, device);
   }

Original file line number	Diff line number	Diff line change
`@@ -44,8 +44,8 @@ public Parser(InputStream regexYaml) {`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`public Client parse(String agentString) {`
`47`		`- UserAgent ua = parseUserAgent(agentString);`
`48`		`- OS os = parseOS(agentString);`
	`47`	`+ UserAgent ua = uaParser.parse(agentString);`
	`48`	`+ OS os = osParser.parse(agentString);`
`49`	`49`	`Device device = deviceParser.parse(agentString);`
`50`	`50`	`return new Client(ua, os, device);`
`51`	`51`	`}`