diff --git a/README.md b/README.md index 8bb897c5..1858d9a9 100644 --- a/README.md +++ b/README.md @@ -11,20 +11,18 @@ https://github.com/HaraldWalker/user-agent-utils/tree/master Support me and buy me a beer: Flattr this -If you are looking for a more complete user-agent detection, have a look at the libraries that use the user-agent-string.info database. -http://user-agent-string.info/download - -New in Version 1.14 +New in Version 1.15 ------------------- -- IOS8 support added -- added Opera Coast as new mobile browser -- more Chrome and Firefox versions added, including future releases (up to Firefox 40 and Chrome 40) -- added 3 Opera versions -- performance improvements +- Safari 7 and 8 added +- iOS 8.1 added +- Wearable device category added with detection of Google Glass +- Chrome OS added +- Windows 10 added +- Android 5 added Javadoc ------- -http://bitwalker.eu/user-agent-utils/javadoc/index.html +http://bitwalker.eu/user-agent-utils-snapshot/javadoc/index.html Maven ----- @@ -34,7 +32,16 @@ Add dependency: eu.bitwalker UserAgentUtils - 1.14 + 1.15 + +``` + +Add dependency for snapshot releases: +```xml + + eu.bitwalker + UserAgentUtils + 1.16-SNAPSHOT ``` @@ -45,6 +52,14 @@ Contributors Changelog --------- +1.14 +---- +- IOS8 support added +- added Opera Coast as new mobile browser +- more Chrome and Firefox versions added, including future releases (up to Firefox 40 and Chrome 40) +- added 3 Opera versions +- performance improvements + 1.13 ---- * Added additional Chrome and Opera browser versions diff --git a/javadoc/allclasses-frame.html b/javadoc/allclasses-frame.html index 6132e201..6a8140de 100644 --- a/javadoc/allclasses-frame.html +++ b/javadoc/allclasses-frame.html @@ -2,9 +2,10 @@ - -All Classes - + + +All Classes (User-Agent-Utils 1.15 API) + diff --git a/javadoc/allclasses-noframe.html b/javadoc/allclasses-noframe.html index ab8cfad1..7063bf04 100644 --- a/javadoc/allclasses-noframe.html +++ b/javadoc/allclasses-noframe.html @@ -2,9 +2,10 @@ - -All Classes - + + +All Classes (User-Agent-Utils 1.15 API) + diff --git a/javadoc/constant-values.html b/javadoc/constant-values.html index 6c0eec7d..ca6f441a 100644 --- a/javadoc/constant-values.html +++ b/javadoc/constant-values.html @@ -2,15 +2,16 @@ - -Constant Field Values - + + +Constant Field Values (User-Agent-Utils 1.15 API) + @@ -27,9 +28,9 @@
  • Package
  • Class
  • Use
  • -
  • Tree
  • +
  • Tree
  • Deprecated
  • -
  • Index
  • +
  • Index
  • Help
  • @@ -75,9 +76,9 @@

    Contents

  • Package
  • Class
  • Use
  • -
  • Tree
  • +
  • Tree
  • Deprecated
  • -
  • Index
  • +
  • Index
  • Help
  • @@ -109,5 +110,6 @@

    Contents

    +

    Copyright © 2014. All rights reserved.

    diff --git a/javadoc/deprecated-list.html b/javadoc/deprecated-list.html index 295ac70b..082ae081 100644 --- a/javadoc/deprecated-list.html +++ b/javadoc/deprecated-list.html @@ -2,15 +2,16 @@ - -Deprecated List - + + +Deprecated List (User-Agent-Utils 1.15 API) + @@ -27,9 +28,9 @@
  • Package
  • Class
  • Use
  • -
  • Tree
  • +
  • Tree
  • -
  • Index
  • +
  • Index
  • Help
  • @@ -65,10 +66,29 @@

    Deprecated API

    Contents

    -
    +
    + + + +
    @@ -131,5 +151,6 @@

    Contents

    +

    Copyright © 2014. All rights reserved.

    diff --git a/javadoc/eu/bitwalker/useragentutils/Application.html b/javadoc/eu/bitwalker/useragentutils/Application.html index 26891f6e..57a8ac5c 100644 --- a/javadoc/eu/bitwalker/useragentutils/Application.html +++ b/javadoc/eu/bitwalker/useragentutils/Application.html @@ -2,15 +2,16 @@ - -Application - + + +Application (User-Agent-Utils 1.15 API) + @@ -29,7 +30,7 @@
  • Use
  • Tree
  • Deprecated
  • -
  • Index
  • +
  • Index
  • Help
  • @@ -83,10 +84,10 @@

    Enum Application

    @@ -523,5 +524,6 @@

    valueOf

    +

    Copyright © 2014. All rights reserved.

    diff --git a/javadoc/eu/bitwalker/useragentutils/ApplicationType.html b/javadoc/eu/bitwalker/useragentutils/ApplicationType.html index aef680a6..ac9c4ac2 100644 --- a/javadoc/eu/bitwalker/useragentutils/ApplicationType.html +++ b/javadoc/eu/bitwalker/useragentutils/ApplicationType.html @@ -2,15 +2,16 @@ - -ApplicationType - + + +ApplicationType (User-Agent-Utils 1.15 API) + @@ -29,7 +30,7 @@
  • Use
  • Tree
  • Deprecated
  • -
  • Index
  • +
  • Index
  • Help
  • @@ -83,10 +84,10 @@

    Enum ApplicationType

    @@ -332,5 +333,6 @@

    getName

    +

    Copyright © 2014. All rights reserved.

    diff --git a/javadoc/eu/bitwalker/useragentutils/Browser.html b/javadoc/eu/bitwalker/useragentutils/Browser.html index 6ba59c21..8cea99a2 100644 --- a/javadoc/eu/bitwalker/useragentutils/Browser.html +++ b/javadoc/eu/bitwalker/useragentutils/Browser.html @@ -2,15 +2,16 @@ - -Browser - + + +Browser (User-Agent-Utils 1.15 API) + @@ -29,7 +30,7 @@
  • Use
  • Tree
  • Deprecated
  • -
  • Index
  • +
  • Index
  • Help
  • @@ -83,10 +84,10 @@

    Enum Browser

    + + + + + + + + @@ -2136,7 +2161,7 @@

    UNKNOWN

    +

    Copyright © 2014. All rights reserved.

    diff --git a/javadoc/eu/bitwalker/useragentutils/BrowserType.html b/javadoc/eu/bitwalker/useragentutils/BrowserType.html index ac844c75..dbcc8444 100644 --- a/javadoc/eu/bitwalker/useragentutils/BrowserType.html +++ b/javadoc/eu/bitwalker/useragentutils/BrowserType.html @@ -2,15 +2,16 @@ - -BrowserType - + + +BrowserType (User-Agent-Utils 1.15 API) + @@ -29,7 +30,7 @@
  • Use
  • Tree
  • Deprecated
  • -
  • Index
  • +
  • Index
  • Help
  • @@ -83,10 +84,10 @@

    Enum BrowserType

    @@ -422,5 +423,6 @@

    getName

    +

    Copyright © 2014. All rights reserved.

    diff --git a/javadoc/eu/bitwalker/useragentutils/DeviceType.html b/javadoc/eu/bitwalker/useragentutils/DeviceType.html index f8480809..4becbc2c 100644 --- a/javadoc/eu/bitwalker/useragentutils/DeviceType.html +++ b/javadoc/eu/bitwalker/useragentutils/DeviceType.html @@ -2,15 +2,16 @@ - -DeviceType - + + +DeviceType (User-Agent-Utils 1.15 API) + @@ -29,7 +30,7 @@
  • Use
  • Tree
  • Deprecated
  • -
  • Index
  • +
  • Index
  • Help
  • @@ -83,10 +84,10 @@

    Enum DeviceType

    @@ -267,6 +273,16 @@

    DMR

    Digital media receiver like the Google TV.
    + + + + @@ -308,7 +324,7 @@

    values

    @@ -326,7 +342,7 @@

    valueOf

    @@ -348,7 +364,7 @@

    getName

  • Use
  • Tree
  • Deprecated
  • -
  • Index
  • +
  • Index
  • Help
  • @@ -395,5 +411,6 @@

    getName

    +

    Copyright © 2014. All rights reserved.

    diff --git a/javadoc/eu/bitwalker/useragentutils/Manufacturer.html b/javadoc/eu/bitwalker/useragentutils/Manufacturer.html index 4b423000..2bcf495b 100644 --- a/javadoc/eu/bitwalker/useragentutils/Manufacturer.html +++ b/javadoc/eu/bitwalker/useragentutils/Manufacturer.html @@ -2,15 +2,16 @@ - -Manufacturer - + + +Manufacturer (User-Agent-Utils 1.15 API) + @@ -29,7 +30,7 @@
  • Use
  • Tree
  • Deprecated
  • -
  • Index
  • +
  • Index
  • Help
  • @@ -83,10 +84,10 @@

    Enum Manufacturer

    @@ -651,5 +652,6 @@

    getName

    +

    Copyright © 2014. All rights reserved.

    diff --git a/javadoc/eu/bitwalker/useragentutils/OperatingSystem.html b/javadoc/eu/bitwalker/useragentutils/OperatingSystem.html index f799fa07..24851458 100644 --- a/javadoc/eu/bitwalker/useragentutils/OperatingSystem.html +++ b/javadoc/eu/bitwalker/useragentutils/OperatingSystem.html @@ -2,15 +2,16 @@ - -OperatingSystem - + + +OperatingSystem (User-Agent-Utils 1.15 API) + @@ -29,7 +30,7 @@
  • Use
  • Tree
  • Deprecated
  • -
  • Index
  • +
  • Index
  • Help
  • @@ -83,10 +84,10 @@

    Enum OperatingSystem

    + + + + @@ -584,6 +619,24 @@

    ANDROID

    public static final OperatingSystem ANDROID
    + + + + + + + + @@ -602,6 +655,15 @@

    ANDROID4_TABLET

    public static final OperatingSystem ANDROID4_TABLET
    + + + + @@ -658,6 +720,16 @@

    ANDROID_TABLET

    Generic Android tablet device without OS version number information
    + + + + @@ -696,6 +768,15 @@

    IOS

    iOS4, with the release of the iPhone 4, Apple renamed the OS to iOS.
    + + + + @@ -750,6 +831,15 @@

    MAC_OS_X_IPAD

    public static final OperatingSystem MAC_OS_X_IPAD
    + + + + @@ -1095,7 +1185,7 @@

    values

    @@ -1122,7 +1212,7 @@

    getId

    @@ -1131,7 +1221,9 @@

    getName

    @@ -1169,7 +1261,7 @@

    getManufacturer

    @@ -1283,5 +1375,6 @@

    valueOf

    +

    Copyright © 2014. All rights reserved.

    diff --git a/javadoc/eu/bitwalker/useragentutils/RenderingEngine.html b/javadoc/eu/bitwalker/useragentutils/RenderingEngine.html index cc17f84b..5617954c 100644 --- a/javadoc/eu/bitwalker/useragentutils/RenderingEngine.html +++ b/javadoc/eu/bitwalker/useragentutils/RenderingEngine.html @@ -2,15 +2,16 @@ - -RenderingEngine - + + +RenderingEngine (User-Agent-Utils 1.15 API) + @@ -29,7 +30,7 @@
  • Use
  • Tree
  • Deprecated
  • -
  • Index
  • +
  • Index
  • Help
  • @@ -83,10 +84,10 @@

    Enum RenderingEngine

    @@ -412,5 +413,6 @@

    valueOf

    +

    Copyright © 2014. All rights reserved.

    diff --git a/javadoc/eu/bitwalker/useragentutils/UserAgent.html b/javadoc/eu/bitwalker/useragentutils/UserAgent.html index 005b3b4f..33154028 100644 --- a/javadoc/eu/bitwalker/useragentutils/UserAgent.html +++ b/javadoc/eu/bitwalker/useragentutils/UserAgent.html @@ -2,15 +2,16 @@ - -UserAgent - + + +UserAgent (User-Agent-Utils 1.15 API) + @@ -29,7 +30,7 @@
  • Use
  • Tree
  • Deprecated
  • -
  • Index
  • +
  • Index
  • Help
  • @@ -83,7 +84,7 @@

    Class UserAgent

    @@ -232,7 +233,7 @@

    UserAgent

    @@ -249,7 +250,7 @@

    Method Detail

    @@ -428,5 +429,6 @@

    equals

    +

    Copyright © 2014. All rights reserved.

    diff --git a/javadoc/eu/bitwalker/useragentutils/Version.html b/javadoc/eu/bitwalker/useragentutils/Version.html index 5249c17b..2566faee 100644 --- a/javadoc/eu/bitwalker/useragentutils/Version.html +++ b/javadoc/eu/bitwalker/useragentutils/Version.html @@ -2,15 +2,16 @@ - -Version - + + +Version (User-Agent-Utils 1.15 API) + @@ -29,7 +30,7 @@
  • Use
  • Tree
  • Deprecated
  • -
  • Index
  • +
  • Index
  • Help
  • @@ -83,7 +84,7 @@

    Class Version

    @@ -199,9 +200,9 @@

    Constructor Detail

    @@ -218,7 +219,7 @@

    Method Detail

    @@ -227,7 +228,7 @@

    getVersion

    @@ -236,7 +237,7 @@

    getMajorVersion

    @@ -245,10 +246,10 @@

    getMinorVersion

    @@ -261,7 +262,7 @@

    hashCode

    public int hashCode()
    Overrides:
    -
    hashCode in class java.lang.Object
    +
    hashCode in class Object
    @@ -271,10 +272,10 @@

    hashCode

    @@ -287,7 +288,7 @@

    compareTo

    public int compareTo(Version other)
    Specified by:
    -
    compareTo in interface java.lang.Comparable<Version>
    +
    compareTo in interface Comparable<Version>
    @@ -310,7 +311,7 @@

    compareTo

  • Use
  • Tree
  • Deprecated
  • -
  • Index
  • +
  • Index
  • Help
  • @@ -357,5 +358,6 @@

    compareTo

    +

    Copyright © 2014. All rights reserved.

    diff --git a/javadoc/eu/bitwalker/useragentutils/class-use/Application.html b/javadoc/eu/bitwalker/useragentutils/class-use/Application.html index f0b7ae27..d9d7e6f7 100644 --- a/javadoc/eu/bitwalker/useragentutils/class-use/Application.html +++ b/javadoc/eu/bitwalker/useragentutils/class-use/Application.html @@ -2,15 +2,16 @@ - -Uses of Class eu.bitwalker.useragentutils.Application - + + +Uses of Class eu.bitwalker.useragentutils.Application (User-Agent-Utils 1.15 API) + @@ -27,9 +28,9 @@
  • Package
  • Class
  • -
  • Tree
  • +
  • Tree
  • Deprecated
  • -
  • Index
  • +
  • Index
  • Help
  • @@ -81,7 +82,7 @@

    Uses of static Application -Application.parseReferrerString(java.lang.String referrerString)  +Application.parseReferrerString(String referrerString)  static Application @@ -91,7 +92,7 @@

    Uses of static Application -Application.valueOf(java.lang.String name) +Application.valueOf(String name)
    Returns the enum constant of this type with the specified name.
    @@ -119,9 +120,9 @@

    Uses of Package
  • Class
  • -
  • Tree
  • +
  • Tree
  • Deprecated
  • -
  • Index
  • +
  • Index
  • Help
  • @@ -153,5 +154,6 @@

    Uses of +

    Copyright © 2014. All rights reserved.

    diff --git a/javadoc/eu/bitwalker/useragentutils/class-use/ApplicationType.html b/javadoc/eu/bitwalker/useragentutils/class-use/ApplicationType.html index 58c6c549..9c3a574b 100644 --- a/javadoc/eu/bitwalker/useragentutils/class-use/ApplicationType.html +++ b/javadoc/eu/bitwalker/useragentutils/class-use/ApplicationType.html @@ -2,15 +2,16 @@ - -Uses of Class eu.bitwalker.useragentutils.ApplicationType - + + +Uses of Class eu.bitwalker.useragentutils.ApplicationType (User-Agent-Utils 1.15 API) + @@ -27,9 +28,9 @@
  • Package
  • Class
  • -
  • Tree
  • +
  • Tree
  • Deprecated
  • -
  • Index
  • +
  • Index
  • Help
  • @@ -85,7 +86,7 @@

    Uses of static ApplicationType -ApplicationType.valueOf(java.lang.String name) +ApplicationType.valueOf(String name)
    Returns the enum constant of this type with the specified name.
    @@ -113,9 +114,9 @@

    Uses of Package
  • Class
  • -
  • Tree
  • +
  • Tree
  • Deprecated
  • -
  • Index
  • +
  • Index
  • Help
  • @@ -147,5 +148,6 @@

    Uses of Copyright © 2014. All rights reserved.

    diff --git a/javadoc/eu/bitwalker/useragentutils/class-use/Browser.html b/javadoc/eu/bitwalker/useragentutils/class-use/Browser.html index 1845eed4..8b44f9b3 100644 --- a/javadoc/eu/bitwalker/useragentutils/class-use/Browser.html +++ b/javadoc/eu/bitwalker/useragentutils/class-use/Browser.html @@ -2,15 +2,16 @@ - -Uses of Class eu.bitwalker.useragentutils.Browser - + + +Uses of Class eu.bitwalker.useragentutils.Browser (User-Agent-Utils 1.15 API) + @@ -27,9 +28,9 @@
  • Package
  • Class
  • -
  • Tree
  • +
  • Tree
  • Deprecated
  • -
  • Index
  • +
  • Index
  • Help
  • @@ -89,15 +90,15 @@

    Uses of static Browser -Browser.parseUserAgentString(java.lang.String agentString) +Browser.parseUserAgentString(String agentString)
    Iterates over all Browsers to compare the browser signature with the user agent string.
    static Browser -Browser.parseUserAgentString(java.lang.String agentString, - java.util.List<Browser> browsers) +Browser.parseUserAgentString(String agentString, + List<Browser> browsers)
    Iterates over the given Browsers (incl.
    @@ -109,7 +110,7 @@

    Uses of static Browser -Browser.valueOf(java.lang.String name) +Browser.valueOf(String name)
    Returns the enum constant of this type with the specified name.
    @@ -131,8 +132,8 @@

    Uses of static Browser -Browser.parseUserAgentString(java.lang.String agentString, - java.util.List<Browser> browsers) +Browser.parseUserAgentString(String agentString, + List<Browser> browsers)
    Iterates over the given Browsers (incl.
    @@ -165,9 +166,9 @@

    Uses of Package
  • Class
  • -
  • Tree
  • +
  • Tree
  • Deprecated
  • -
  • Index
  • +
  • Index
  • Help
  • @@ -199,5 +200,6 @@

    Uses of +

    Copyright © 2014. All rights reserved.

    diff --git a/javadoc/eu/bitwalker/useragentutils/class-use/BrowserType.html b/javadoc/eu/bitwalker/useragentutils/class-use/BrowserType.html index 961073a3..40fa3ca1 100644 --- a/javadoc/eu/bitwalker/useragentutils/class-use/BrowserType.html +++ b/javadoc/eu/bitwalker/useragentutils/class-use/BrowserType.html @@ -2,15 +2,16 @@ - -Uses of Class eu.bitwalker.useragentutils.BrowserType - + + +Uses of Class eu.bitwalker.useragentutils.BrowserType (User-Agent-Utils 1.15 API) + @@ -27,9 +28,9 @@
  • Package
  • Class
  • -
  • Tree
  • +
  • Tree
  • Deprecated
  • -
  • Index
  • +
  • Index
  • Help
  • @@ -85,7 +86,7 @@

    Uses of static BrowserType -BrowserType.valueOf(java.lang.String name) +BrowserType.valueOf(String name)
    Returns the enum constant of this type with the specified name.
    @@ -113,9 +114,9 @@

    Uses of Package
  • Class
  • -
  • Tree
  • +
  • Tree
  • Deprecated
  • -
  • Index
  • +
  • Index
  • Help
  • @@ -147,5 +148,6 @@

    Uses of +

    Copyright © 2014. All rights reserved.

    diff --git a/javadoc/eu/bitwalker/useragentutils/class-use/DeviceType.html b/javadoc/eu/bitwalker/useragentutils/class-use/DeviceType.html index 9758e55b..1552ca74 100644 --- a/javadoc/eu/bitwalker/useragentutils/class-use/DeviceType.html +++ b/javadoc/eu/bitwalker/useragentutils/class-use/DeviceType.html @@ -2,15 +2,16 @@ - -Uses of Class eu.bitwalker.useragentutils.DeviceType - + + +Uses of Class eu.bitwalker.useragentutils.DeviceType (User-Agent-Utils 1.15 API) + @@ -27,9 +28,9 @@
  • Package
  • Class
  • -
  • Tree
  • +
  • Tree
  • Deprecated
  • -
  • Index
  • +
  • Index
  • Help
  • @@ -85,7 +86,7 @@

    Uses of static DeviceType -DeviceType.valueOf(java.lang.String name) +DeviceType.valueOf(String name)
    Returns the enum constant of this type with the specified name.
    @@ -113,9 +114,9 @@

    Uses of Package
  • Class
  • -
  • Tree
  • +
  • Tree
  • Deprecated
  • -
  • Index
  • +
  • Index
  • Help
  • @@ -147,5 +148,6 @@

    Uses of +

    Copyright © 2014. All rights reserved.

    diff --git a/javadoc/eu/bitwalker/useragentutils/class-use/Manufacturer.html b/javadoc/eu/bitwalker/useragentutils/class-use/Manufacturer.html index 3372e2d2..e308ce0f 100644 --- a/javadoc/eu/bitwalker/useragentutils/class-use/Manufacturer.html +++ b/javadoc/eu/bitwalker/useragentutils/class-use/Manufacturer.html @@ -2,15 +2,16 @@ - -Uses of Class eu.bitwalker.useragentutils.Manufacturer - + + +Uses of Class eu.bitwalker.useragentutils.Manufacturer (User-Agent-Utils 1.15 API) + @@ -27,9 +28,9 @@
  • Package
  • Class
  • -
  • Tree
  • +
  • Tree
  • Deprecated
  • -
  • Index
  • +
  • Index
  • Help
  • @@ -81,21 +82,21 @@

    Uses of Manufacturer -Application.getManufacturer()  - - -Manufacturer OperatingSystem.getManufacturer()
    Returns the manufacturer of the operating system
    - + Manufacturer Browser.getManufacturer()  + +Manufacturer +Application.getManufacturer()  + static Manufacturer -Manufacturer.valueOf(java.lang.String name) +Manufacturer.valueOf(String name)
    Returns the enum constant of this type with the specified name.
    @@ -123,9 +124,9 @@

    Uses of Package
  • Class
  • -
  • Tree
  • +
  • Tree
  • Deprecated
  • -
  • Index
  • +
  • Index
  • Help
  • @@ -157,5 +158,6 @@

    Uses of +

    Copyright © 2014. All rights reserved.

    diff --git a/javadoc/eu/bitwalker/useragentutils/class-use/OperatingSystem.html b/javadoc/eu/bitwalker/useragentutils/class-use/OperatingSystem.html index 694e80cb..fe9014d2 100644 --- a/javadoc/eu/bitwalker/useragentutils/class-use/OperatingSystem.html +++ b/javadoc/eu/bitwalker/useragentutils/class-use/OperatingSystem.html @@ -2,15 +2,16 @@ - -Uses of Class eu.bitwalker.useragentutils.OperatingSystem - + + +Uses of Class eu.bitwalker.useragentutils.OperatingSystem (User-Agent-Utils 1.15 API) + @@ -27,9 +28,9 @@
  • Package
  • Class
  • -
  • Tree
  • +
  • Tree
  • Deprecated
  • -
  • Index
  • +
  • Index
  • Help
  • @@ -89,14 +90,14 @@

    Uses of static OperatingSystem -OperatingSystem.parseUserAgentString(java.lang.String agentString) +OperatingSystem.parseUserAgentString(String agentString)
    Parses user agent string and returns the best match.
    static OperatingSystem -OperatingSystem.parseUserAgentString(java.lang.String agentString, - java.util.List<OperatingSystem> operatingSystems) +OperatingSystem.parseUserAgentString(String agentString, + List<OperatingSystem> operatingSystems)
    Parses the user agent string and returns the best match for the given operating systems.
    @@ -108,7 +109,7 @@

    Uses of static OperatingSystem -OperatingSystem.valueOf(java.lang.String name) +OperatingSystem.valueOf(String name)
    Returns the enum constant of this type with the specified name.
    @@ -130,8 +131,8 @@

    Uses of static OperatingSystem -OperatingSystem.parseUserAgentString(java.lang.String agentString, - java.util.List<OperatingSystem> operatingSystems) +OperatingSystem.parseUserAgentString(String agentString, + List<OperatingSystem> operatingSystems)
    Parses the user agent string and returns the best match for the given operating systems.
    @@ -164,9 +165,9 @@

    Uses of Package
  • Class
  • -
  • Tree
  • +
  • Tree
  • Deprecated
  • -
  • Index
  • +
  • Index
  • Help
  • @@ -198,5 +199,6 @@

    Uses of Copyright © 2014. All rights reserved.

    diff --git a/javadoc/eu/bitwalker/useragentutils/class-use/RenderingEngine.html b/javadoc/eu/bitwalker/useragentutils/class-use/RenderingEngine.html index 39ad9005..674ef075 100644 --- a/javadoc/eu/bitwalker/useragentutils/class-use/RenderingEngine.html +++ b/javadoc/eu/bitwalker/useragentutils/class-use/RenderingEngine.html @@ -2,15 +2,16 @@ - -Uses of Class eu.bitwalker.useragentutils.RenderingEngine - + + +Uses of Class eu.bitwalker.useragentutils.RenderingEngine (User-Agent-Utils 1.15 API) + @@ -27,9 +28,9 @@
  • Package
  • Class
  • -
  • Tree
  • +
  • Tree
  • Deprecated
  • -
  • Index
  • +
  • Index
  • Help
  • @@ -85,7 +86,7 @@

    Uses of static RenderingEngine -RenderingEngine.valueOf(java.lang.String name) +RenderingEngine.valueOf(String name)
    Returns the enum constant of this type with the specified name.
    @@ -113,9 +114,9 @@

    Uses of Package
  • Class
  • -
  • Tree
  • +
  • Tree
  • Deprecated
  • -
  • Index
  • +
  • Index
  • Help
  • @@ -147,5 +148,6 @@

    Uses of Copyright © 2014. All rights reserved.

    diff --git a/javadoc/eu/bitwalker/useragentutils/class-use/UserAgent.html b/javadoc/eu/bitwalker/useragentutils/class-use/UserAgent.html index 93ad579f..e6b970a4 100644 --- a/javadoc/eu/bitwalker/useragentutils/class-use/UserAgent.html +++ b/javadoc/eu/bitwalker/useragentutils/class-use/UserAgent.html @@ -2,15 +2,16 @@ - -Uses of Class eu.bitwalker.useragentutils.UserAgent - + + +Uses of Class eu.bitwalker.useragentutils.UserAgent (User-Agent-Utils 1.15 API) + @@ -27,9 +28,9 @@
  • Package
  • Class
  • -
  • Tree
  • +
  • Tree
  • Deprecated
  • -
  • Index
  • +
  • Index
  • Help
  • @@ -81,7 +82,7 @@

    Uses of static UserAgent -UserAgent.parseUserAgentString(java.lang.String userAgentString)  +UserAgent.parseUserAgentString(String userAgentString)  static UserAgent @@ -91,7 +92,7 @@

    Uses of static UserAgent -UserAgent.valueOf(java.lang.String name) +UserAgent.valueOf(String name)
    Returns UserAgent based on combined string representation
    @@ -112,9 +113,9 @@

    Uses of Package
  • Class
  • -
  • Tree
  • +
  • Tree
  • Deprecated
  • -
  • Index
  • +
  • Index
  • Help
  • @@ -146,5 +147,6 @@

    Uses of +

    Copyright © 2014. All rights reserved.

    diff --git a/javadoc/eu/bitwalker/useragentutils/class-use/Version.html b/javadoc/eu/bitwalker/useragentutils/class-use/Version.html index f643710b..d14866d9 100644 --- a/javadoc/eu/bitwalker/useragentutils/class-use/Version.html +++ b/javadoc/eu/bitwalker/useragentutils/class-use/Version.html @@ -2,15 +2,16 @@ - -Uses of Class eu.bitwalker.useragentutils.Version - + + +Uses of Class eu.bitwalker.useragentutils.Version (User-Agent-Utils 1.15 API) + @@ -27,9 +28,9 @@
  • Package
  • Class
  • -
  • Tree
  • +
  • Tree
  • Deprecated
  • -
  • Index
  • +
  • Index
  • Help
  • @@ -87,7 +88,7 @@

    Uses of Version -Browser.getVersion(java.lang.String userAgentString) +Browser.getVersion(String userAgentString)
    Detects the detailed version information of the browser.
    @@ -121,9 +122,9 @@

    Uses of Package
  • Class
  • -
  • Tree
  • +
  • Tree
  • Deprecated
  • -
  • Index
  • +
  • Index
  • Help
  • @@ -155,5 +156,6 @@

    Uses of +

    Copyright © 2014. All rights reserved.

    diff --git a/javadoc/eu/bitwalker/useragentutils/package-frame.html b/javadoc/eu/bitwalker/useragentutils/package-frame.html index fd4193e4..a7d90476 100644 --- a/javadoc/eu/bitwalker/useragentutils/package-frame.html +++ b/javadoc/eu/bitwalker/useragentutils/package-frame.html @@ -2,9 +2,10 @@ - -eu.bitwalker.useragentutils - + + +eu.bitwalker.useragentutils (User-Agent-Utils 1.15 API) + diff --git a/javadoc/eu/bitwalker/useragentutils/package-summary.html b/javadoc/eu/bitwalker/useragentutils/package-summary.html index 26d03e2a..cdefad7f 100644 --- a/javadoc/eu/bitwalker/useragentutils/package-summary.html +++ b/javadoc/eu/bitwalker/useragentutils/package-summary.html @@ -2,15 +2,16 @@ - -eu.bitwalker.useragentutils - + + +eu.bitwalker.useragentutils (User-Agent-Utils 1.15 API) + @@ -29,7 +30,7 @@
  • Use
  • Tree
  • Deprecated
  • -
  • Index
  • +
  • Index
  • Help
  • @@ -161,7 +162,7 @@

    Package eu.bitwalker.useragentutils

  • Use
  • Tree
  • Deprecated
  • -
  • Index
  • +
  • Index
  • Help
  • @@ -193,5 +194,6 @@

    Package eu.bitwalker.useragentutils

    +

    Copyright © 2014. All rights reserved.

    diff --git a/javadoc/eu/bitwalker/useragentutils/package-tree.html b/javadoc/eu/bitwalker/useragentutils/package-tree.html index 5af975af..bc64dbb6 100644 --- a/javadoc/eu/bitwalker/useragentutils/package-tree.html +++ b/javadoc/eu/bitwalker/useragentutils/package-tree.html @@ -2,15 +2,16 @@ - -eu.bitwalker.useragentutils Class Hierarchy - + + +eu.bitwalker.useragentutils Class Hierarchy (User-Agent-Utils 1.15 API) + @@ -29,7 +30,7 @@
  • Use
  • Deprecated
  • -
  • Index
  • +
  • Index
  • Help
  • @@ -67,27 +68,27 @@

    Hierarchy For Package eu.bitwalker.useragentutils

    Class Hierarchy

    Enum Hierarchy

    @@ -138,5 +139,6 @@

    Enum Hierarchy

    +

    Copyright © 2014. All rights reserved.

    diff --git a/javadoc/eu/bitwalker/useragentutils/package-use.html b/javadoc/eu/bitwalker/useragentutils/package-use.html index f15d164a..cdc79fbd 100644 --- a/javadoc/eu/bitwalker/useragentutils/package-use.html +++ b/javadoc/eu/bitwalker/useragentutils/package-use.html @@ -2,15 +2,16 @@ - -Uses of Package eu.bitwalker.useragentutils - + + +Uses of Package eu.bitwalker.useragentutils (User-Agent-Utils 1.15 API) + @@ -29,7 +30,7 @@
  • Tree
  • Deprecated
  • -
  • Index
  • +
  • Index
  • Help
  • @@ -141,7 +142,7 @@

    Uses of Pa
  • Tree
  • Deprecated
  • -
  • Index
  • +
  • Index
  • Help
  • @@ -173,5 +174,6 @@

    Uses of Pa +

    Copyright © 2014. All rights reserved.

    diff --git a/javadoc/help-doc.html b/javadoc/help-doc.html index fb06fe4c..062f698f 100644 --- a/javadoc/help-doc.html +++ b/javadoc/help-doc.html @@ -2,15 +2,16 @@ - -API Help - + + +API Help (User-Agent-Utils 1.15 API) + @@ -27,9 +28,9 @@
  • Package
  • Class
  • Use
  • -
  • Tree
  • +
  • Tree
  • Deprecated
  • -
  • Index
  • +
  • Index
  • @@ -142,7 +143,7 @@

    Deprecated API

  • Index

    -

    The Index contains an alphabetic list of all classes, interfaces, constructors, methods, and fields.

    +

    The Index contains an alphabetic list of all classes, interfaces, constructors, methods, and fields.

  • Prev/Next

    @@ -176,9 +177,9 @@

    Constant Field Values

  • Package
  • Class
  • Use
  • -
  • Tree
  • +
  • Tree
  • Deprecated
  • -
  • Index
  • +
  • Index
  • @@ -210,5 +211,6 @@

    Constant Field Values

    +

    Copyright © 2014. All rights reserved.

    diff --git a/javadoc/index-all.html b/javadoc/index-all.html new file mode 100644 index 00000000..622aaf9d --- /dev/null +++ b/javadoc/index-all.html @@ -0,0 +1,454 @@ + + + + + + +Index (User-Agent-Utils 1.15 API) + + + + + + + +
    + + + + + +
    + + +
    A B C D E G H I M O P R T U V  + + +

    A

    +
    +
    Application - Enum in eu.bitwalker.useragentutils
    +
    +
    Enum constants for internet applications like web-application and rich + internet application.
    +
    +
    ApplicationType - Enum in eu.bitwalker.useragentutils
    +
    +
    Enum constants classifying the different types of applications which are common in referrer strings
    +
    +
    + + + +

    B

    +
    +
    Browser - Enum in eu.bitwalker.useragentutils
    +
    +
    Enum constants for most common browsers, including e-mail clients and bots.
    +
    +
    BrowserType - Enum in eu.bitwalker.useragentutils
    +
    +
    Enum constants classifying the different types of browsers which are common in user-agent strings
    +
    +
    + + + +

    C

    +
    +
    compareTo(Version) - Method in class eu.bitwalker.useragentutils.Version
    +
     
    +
    + + + +

    D

    +
    +
    DeviceType - Enum in eu.bitwalker.useragentutils
    +
    +
    Enum contact for the type of used device
    +
    +
    + + + +

    E

    +
    +
    equals(Object) - Method in class eu.bitwalker.useragentutils.UserAgent
    +
     
    +
    equals(Object) - Method in class eu.bitwalker.useragentutils.Version
    +
     
    +
    eu.bitwalker.useragentutils - package eu.bitwalker.useragentutils
    +
     
    +
    + + + +

    G

    +
    +
    getApplicationType() - Method in enum eu.bitwalker.useragentutils.Application
    +
     
    +
    getBrowser() - Method in class eu.bitwalker.useragentutils.UserAgent
    +
     
    +
    getBrowserType() - Method in enum eu.bitwalker.useragentutils.Browser
    +
     
    +
    getBrowserVersion() - Method in class eu.bitwalker.useragentutils.UserAgent
    +
    +
    Detects the detailed version information of the browser.
    +
    +
    getDeviceType() - Method in enum eu.bitwalker.useragentutils.OperatingSystem
    +
     
    +
    getGroup() - Method in enum eu.bitwalker.useragentutils.Browser
    +
     
    +
    getGroup() - Method in enum eu.bitwalker.useragentutils.OperatingSystem
    +
     
    +
    getId() - Method in enum eu.bitwalker.useragentutils.Application
    +
     
    +
    getId() - Method in enum eu.bitwalker.useragentutils.Browser
    +
     
    +
    getId() - Method in enum eu.bitwalker.useragentutils.Manufacturer
    +
     
    +
    getId() - Method in enum eu.bitwalker.useragentutils.OperatingSystem
    +
     
    +
    getId() - Method in class eu.bitwalker.useragentutils.UserAgent
    +
    +
    Returns an unique integer value of the operating system & browser combination
    +
    +
    getMajorVersion() - Method in class eu.bitwalker.useragentutils.Version
    +
     
    +
    getManufacturer() - Method in enum eu.bitwalker.useragentutils.Application
    +
     
    +
    getManufacturer() - Method in enum eu.bitwalker.useragentutils.Browser
    +
     
    +
    getManufacturer() - Method in enum eu.bitwalker.useragentutils.OperatingSystem
    +
    +
    Returns the manufacturer of the operating system
    +
    +
    getMinorVersion() - Method in class eu.bitwalker.useragentutils.Version
    +
     
    +
    getName() - Method in enum eu.bitwalker.useragentutils.Application
    +
     
    +
    getName() - Method in enum eu.bitwalker.useragentutils.ApplicationType
    +
     
    +
    getName() - Method in enum eu.bitwalker.useragentutils.Browser
    +
     
    +
    getName() - Method in enum eu.bitwalker.useragentutils.BrowserType
    +
     
    +
    getName() - Method in enum eu.bitwalker.useragentutils.DeviceType
    +
     
    +
    getName() - Method in enum eu.bitwalker.useragentutils.Manufacturer
    +
     
    +
    getName() - Method in enum eu.bitwalker.useragentutils.OperatingSystem
    +
     
    +
    getOperatingSystem() - Method in class eu.bitwalker.useragentutils.UserAgent
    +
     
    +
    getRenderingEngine() - Method in enum eu.bitwalker.useragentutils.Browser
    +
     
    +
    getVersion(String) - Method in enum eu.bitwalker.useragentutils.Browser
    +
    +
    Detects the detailed version information of the browser.
    +
    +
    getVersion() - Method in class eu.bitwalker.useragentutils.Version
    +
     
    +
    + + + +

    H

    +
    +
    hashCode() - Method in class eu.bitwalker.useragentutils.UserAgent
    +
     
    +
    hashCode() - Method in class eu.bitwalker.useragentutils.Version
    +
     
    +
    + + + +

    I

    +
    +
    isInReferrerString(String) - Method in enum eu.bitwalker.useragentutils.Application
    +
     
    +
    isInUserAgentString(String) - Method in enum eu.bitwalker.useragentutils.Browser
    +
     
    +
    isInUserAgentString(String) - Method in enum eu.bitwalker.useragentutils.OperatingSystem
    +
    +
    Checks if the given user-agent string matches to the operating system.
    +
    +
    isMobileDevice() - Method in enum eu.bitwalker.useragentutils.OperatingSystem
    +
    +
    Deprecated.
    +
    +
    + + + +

    M

    +
    +
    Manufacturer - Enum in eu.bitwalker.useragentutils
    +
    +
    Enum constants representing manufacturers of operating systems and client software.
    +
    +
    + + + +

    O

    +
    +
    OperatingSystem - Enum in eu.bitwalker.useragentutils
    +
    +
    Enum constants for most common operating systems.
    +
    +
    + + + +

    P

    +
    +
    parseReferrerString(String) - Static method in enum eu.bitwalker.useragentutils.Application
    +
     
    +
    parseUserAgentString(String) - Static method in enum eu.bitwalker.useragentutils.Browser
    +
    +
    Iterates over all Browsers to compare the browser signature with + the user agent string.
    +
    +
    parseUserAgentString(String, List<Browser>) - Static method in enum eu.bitwalker.useragentutils.Browser
    +
    +
    Iterates over the given Browsers (incl.
    +
    +
    parseUserAgentString(String) - Static method in enum eu.bitwalker.useragentutils.OperatingSystem
    +
    +
    Parses user agent string and returns the best match.
    +
    +
    parseUserAgentString(String, List<OperatingSystem>) - Static method in enum eu.bitwalker.useragentutils.OperatingSystem
    +
    +
    Parses the user agent string and returns the best match for the given operating systems.
    +
    +
    parseUserAgentString(String) - Static method in class eu.bitwalker.useragentutils.UserAgent
    +
     
    +
    + + + +

    R

    +
    +
    RenderingEngine - Enum in eu.bitwalker.useragentutils
    +
    +
    Enum constants classifying the different types of rendering engines which are being used by browsers.
    +
    +
    + + + +

    T

    +
    +
    toString() - Method in class eu.bitwalker.useragentutils.UserAgent
    +
    +
    Combined string representation of both enums
    +
    +
    toString() - Method in class eu.bitwalker.useragentutils.Version
    +
     
    +
    + + + +

    U

    +
    +
    UserAgent - Class in eu.bitwalker.useragentutils
    +
     
    +
    UserAgent(OperatingSystem, Browser) - Constructor for class eu.bitwalker.useragentutils.UserAgent
    +
     
    +
    UserAgent(String) - Constructor for class eu.bitwalker.useragentutils.UserAgent
    +
     
    +
    + + + +

    V

    +
    +
    valueOf(String) - Static method in enum eu.bitwalker.useragentutils.Application
    +
    +
    Returns the enum constant of this type with the specified name.
    +
    +
    valueOf(short) - Static method in enum eu.bitwalker.useragentutils.Application
    +
    +
    Returns the enum constant of this type with the specified id.
    +
    +
    valueOf(String) - Static method in enum eu.bitwalker.useragentutils.ApplicationType
    +
    +
    Returns the enum constant of this type with the specified name.
    +
    +
    valueOf(String) - Static method in enum eu.bitwalker.useragentutils.Browser
    +
    +
    Returns the enum constant of this type with the specified name.
    +
    +
    valueOf(short) - Static method in enum eu.bitwalker.useragentutils.Browser
    +
    +
    Returns the enum constant of this type with the specified id.
    +
    +
    valueOf(String) - Static method in enum eu.bitwalker.useragentutils.BrowserType
    +
    +
    Returns the enum constant of this type with the specified name.
    +
    +
    valueOf(String) - Static method in enum eu.bitwalker.useragentutils.DeviceType
    +
    +
    Returns the enum constant of this type with the specified name.
    +
    +
    valueOf(String) - Static method in enum eu.bitwalker.useragentutils.Manufacturer
    +
    +
    Returns the enum constant of this type with the specified name.
    +
    +
    valueOf(String) - Static method in enum eu.bitwalker.useragentutils.OperatingSystem
    +
    +
    Returns the enum constant of this type with the specified name.
    +
    +
    valueOf(short) - Static method in enum eu.bitwalker.useragentutils.OperatingSystem
    +
    +
    Returns the enum constant of this type with the specified id.
    +
    +
    valueOf(String) - Static method in enum eu.bitwalker.useragentutils.RenderingEngine
    +
    +
    Returns the enum constant of this type with the specified name.
    +
    +
    valueOf(int) - Static method in class eu.bitwalker.useragentutils.UserAgent
    +
    +
    Returns UserAgent based on specified unique id
    +
    +
    valueOf(String) - Static method in class eu.bitwalker.useragentutils.UserAgent
    +
    +
    Returns UserAgent based on combined string representation
    +
    +
    values() - Static method in enum eu.bitwalker.useragentutils.Application
    +
    +
    Returns an array containing the constants of this enum type, in +the order they are declared.
    +
    +
    values() - Static method in enum eu.bitwalker.useragentutils.ApplicationType
    +
    +
    Returns an array containing the constants of this enum type, in +the order they are declared.
    +
    +
    values() - Static method in enum eu.bitwalker.useragentutils.Browser
    +
    +
    Returns an array containing the constants of this enum type, in +the order they are declared.
    +
    +
    values() - Static method in enum eu.bitwalker.useragentutils.BrowserType
    +
    +
    Returns an array containing the constants of this enum type, in +the order they are declared.
    +
    +
    values() - Static method in enum eu.bitwalker.useragentutils.DeviceType
    +
    +
    Returns an array containing the constants of this enum type, in +the order they are declared.
    +
    +
    values() - Static method in enum eu.bitwalker.useragentutils.Manufacturer
    +
    +
    Returns an array containing the constants of this enum type, in +the order they are declared.
    +
    +
    values() - Static method in enum eu.bitwalker.useragentutils.OperatingSystem
    +
    +
    Returns an array containing the constants of this enum type, in +the order they are declared.
    +
    +
    values() - Static method in enum eu.bitwalker.useragentutils.RenderingEngine
    +
    +
    Returns an array containing the constants of this enum type, in +the order they are declared.
    +
    +
    Version - Class in eu.bitwalker.useragentutils
    +
    +
    Container for general version information.
    +
    +
    Version(String, String, String) - Constructor for class eu.bitwalker.useragentutils.Version
    +
     
    +
    +A B C D E G H I M O P R T U V 
    + +
    + + + + + +
    + + +

    Copyright © 2014. All rights reserved.

    + + diff --git a/javadoc/index.html b/javadoc/index.html index 5feaa862..483afe76 100644 --- a/javadoc/index.html +++ b/javadoc/index.html @@ -2,8 +2,9 @@ - -Generated Documentation (Untitled) + + +User-Agent-Utils 1.15 API @@ -29,7 +30,7 @@
  • Use
  • Deprecated
  • -
  • Index
  • +
  • Index
  • Help
  • @@ -71,27 +72,27 @@

    Hierarchy For All Packages

    Class Hierarchy

    Enum Hierarchy

    @@ -142,5 +143,6 @@

    Enum Hierarchy

    +

    Copyright © 2014. All rights reserved.

    diff --git a/javadoc/serialized-form.html b/javadoc/serialized-form.html index 45ec4199..a2af3f62 100644 --- a/javadoc/serialized-form.html +++ b/javadoc/serialized-form.html @@ -2,15 +2,16 @@ - -Serialized Form - + + +Serialized Form (User-Agent-Utils 1.15 API) + @@ -27,9 +28,9 @@
  • Package
  • Class
  • Use
  • -
  • Tree
  • +
  • Tree
  • Deprecated
  • -
  • Index
  • +
  • Index
  • Help
  • @@ -72,7 +73,7 @@

    Package eu.bitwalker.useragentutils

  • -

    Class eu.bitwalker.useragentutils.UserAgent extends java.lang.Object implements Serializable

    +

    Class eu.bitwalker.useragentutils.UserAgent extends Object implements Serializable

    serialVersionUID:
    7025462762784240212L
    @@ -97,7 +98,7 @@

    id

  • userAgentString

    -
    java.lang.String userAgentString
    +
    String userAgentString
  • @@ -117,9 +118,9 @@

    userAgentString

  • Package
  • Class
  • Use
  • -
  • Tree
  • +
  • Tree
  • Deprecated
  • -
  • Index
  • +
  • Index
  • Help
  • @@ -151,5 +152,6 @@

    userAgentString

    +

    Copyright © 2014. All rights reserved.

    diff --git a/pom.xml b/pom.xml index 62e72256..3dc5be52 100644 --- a/pom.xml +++ b/pom.xml @@ -1,17 +1,16 @@ - 4.0.0 - bitwalker + eu.bitwalker User-Agent-Utils - http://java.net/projects/user-agent-utils + http://www.bitwalker.eu/software/user-agent-utils UserAgentUtils - 1.14 + 1.15 Utility classes to handle user-agents. - github + github @@ -34,23 +33,27 @@ - - https://github.com/HaraldWalker/user-agent-utils/issues - GitHub - + + https://github.com/HaraldWalker/user-agent-utils/issues + GitHub + - https://github.com/HaraldWalker/user-agent-utils - scm:git:git://github.com:HaraldWalker/user-agent-utils.git - scm:git:git@github.com:HaraldWalker/user-agent-utils.git - + https://github.com/HaraldWalker/user-agent-utils + scm:git:git://github.com:HaraldWalker/user-agent-utils.git + scm:git:git@github.com:HaraldWalker/user-agent-utils.git + - - internal.repo - Temporary Staging Repository - file://${project.build.directory}/mvn-repo - + + ossrh + https://oss.sonatype.org/content/repositories/snapshots + + + ossrh + Maven Central Staging Repository + https://oss.sonatype.org/service/local/staging/deploy/maven2/ + @@ -65,31 +68,15 @@ - com.github.github - site-maven-plugin - 0.8 + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.3 + true - Maven artifacts for ${project.version} - true - ${project.build.directory}/mvn-repo - refs/heads/mvn-repo - - **/* - - true - user-agent-utils - haraldwalker + ossrh + https://oss.sonatype.org/ + true - - - - - site - - deploy - - maven-site-plugin @@ -101,17 +88,27 @@ + org.apache.maven.plugins maven-javadoc-plugin + 2.9.1 - javadoc1 + javadoc **/Test*.java + + + attach-javadocs + + jar + + + maven-surefire-plugin - 2.4 + 2.4 true -ea @@ -129,7 +126,7 @@ maven-resources-plugin 2.4 - + org.apache.maven.plugins maven-source-plugin @@ -137,7 +134,25 @@ attach-sources - jar + jar-no-fork + + + + + + + org.apache.maven.plugins + maven-gpg-plugin + 1.5 + + true + + + + sign-artifacts + verify + + sign @@ -155,9 +170,9 @@ **/Test*.java - src/main/java - eu.bitwalker.useragentutils - 1.6 + src/main/java + eu.bitwalker.useragentutils + 1.6 @@ -168,7 +183,7 @@ - + junit junit @@ -176,4 +191,4 @@ test - \ No newline at end of file + diff --git a/src/main/java/eu/bitwalker/useragentutils/Browser.java b/src/main/java/eu/bitwalker/useragentutils/Browser.java index 191456f4..4f968798 100644 --- a/src/main/java/eu/bitwalker/useragentutils/Browser.java +++ b/src/main/java/eu/bitwalker/useragentutils/Browser.java @@ -138,6 +138,8 @@ public enum Browser { BLACKBERRY10( Manufacturer.BLACKBERRY, Browser.SAFARI, 10, "BlackBerry", new String[] { "BB10" }, null, BrowserType.MOBILE_BROWSER, RenderingEngine.WEBKIT, null), MOBILE_SAFARI( Manufacturer.APPLE, Browser.SAFARI, 2, "Mobile Safari", new String[] { "Mobile Safari","Mobile/" }, new String[] { "Coast/", "Googlebot-Mobile" }, BrowserType.MOBILE_BROWSER, RenderingEngine.WEBKIT, null ), // before Safari SILK( Manufacturer.AMAZON, Browser.SAFARI, 15, "Silk", new String[] { "Silk/" }, null, BrowserType.WEB_BROWSER, RenderingEngine.WEBKIT, "Silk\\/(([0-9]+)\\.?([\\w]+)?(\\.[\\w]+)?(\\-[\\w]+)?)" ), // http://en.wikipedia.org/wiki/Amazon_Silk + SAFARI8( Manufacturer.APPLE, Browser.SAFARI, 8, "Safari 8", new String[] { "Version/8" }, null, BrowserType.WEB_BROWSER, RenderingEngine.WEBKIT, null ), // before AppleWebKit + SAFARI7( Manufacturer.APPLE, Browser.SAFARI, 7, "Safari 7", new String[] { "Version/7" }, null, BrowserType.WEB_BROWSER, RenderingEngine.WEBKIT, null ), // before AppleWebKit SAFARI6( Manufacturer.APPLE, Browser.SAFARI, 6, "Safari 6", new String[] { "Version/6" }, null, BrowserType.WEB_BROWSER, RenderingEngine.WEBKIT, null ), // before AppleWebKit SAFARI5( Manufacturer.APPLE, Browser.SAFARI, 3, "Safari 5", new String[] { "Version/5" }, null, BrowserType.WEB_BROWSER, RenderingEngine.WEBKIT, null ), // before AppleWebKit SAFARI4( Manufacturer.APPLE, Browser.SAFARI, 4, "Safari 4", new String[] { "Version/4" }, new String[] { "Googlebot-Mobile" }, BrowserType.WEB_BROWSER, RenderingEngine.WEBKIT, null ), // before AppleWebKit diff --git a/src/main/java/eu/bitwalker/useragentutils/DeviceType.java b/src/main/java/eu/bitwalker/useragentutils/DeviceType.java index e6c90b33..f8f87c94 100644 --- a/src/main/java/eu/bitwalker/useragentutils/DeviceType.java +++ b/src/main/java/eu/bitwalker/useragentutils/DeviceType.java @@ -64,6 +64,10 @@ public enum DeviceType { * Digital media receiver like the Google TV. */ DMR("Digital media receiver"), + /** + * Miniature device like a smart watch or interactive glasses + */ + WEARABLE("Wearable computer"), /** * Other or unknow type of device. */ diff --git a/src/main/java/eu/bitwalker/useragentutils/OperatingSystem.java b/src/main/java/eu/bitwalker/useragentutils/OperatingSystem.java index a6396d36..66001004 100644 --- a/src/main/java/eu/bitwalker/useragentutils/OperatingSystem.java +++ b/src/main/java/eu/bitwalker/useragentutils/OperatingSystem.java @@ -52,6 +52,7 @@ public enum OperatingSystem { * Windows Mobile / Windows CE. Exact version unknown. */ WINDOWS( Manufacturer.MICROSOFT,null,1, "Windows", new String[] { "Windows" }, new String[] { "Palm", "ggpht.com" }, DeviceType.COMPUTER, null ), // catch the rest of older Windows systems (95, NT,...) + WINDOWS_10( Manufacturer.MICROSOFT,OperatingSystem.WINDOWS,24, "Windows 10", new String[] { "Windows NT 6.4" }, null, DeviceType.COMPUTER, null ), // before Win, yes, Windows 10 is called 6.4 LOL WINDOWS_81( Manufacturer.MICROSOFT,OperatingSystem.WINDOWS,23, "Windows 8.1", new String[] { "Windows NT 6.3" }, null, DeviceType.COMPUTER, null ), // before Win, yes, Windows 8.1 is called 6.3 LOL WINDOWS_8( Manufacturer.MICROSOFT,OperatingSystem.WINDOWS,22, "Windows 8", new String[] { "Windows NT 6.2" }, null, DeviceType.COMPUTER, null ), // before Win, yes, Windows 8 is called 6.2 LOL WINDOWS_7( Manufacturer.MICROSOFT,OperatingSystem.WINDOWS,21, "Windows 7", new String[] { "Windows NT 6.1" }, null, DeviceType.COMPUTER, null ), // before Win, yes, Windows 7 is called 6.1 LOL @@ -65,8 +66,11 @@ public enum OperatingSystem { WINDOWS_98( Manufacturer.MICROSOFT,OperatingSystem.WINDOWS,5, "Windows 98", new String[] { "Windows 98","Win98" }, new String[] { "Palm" }, DeviceType.COMPUTER, null ), // before Win ANDROID( Manufacturer.GOOGLE,null, 0, "Android", new String[] { "Android" }, null, DeviceType.MOBILE, null ), - ANDROID4( Manufacturer.GOOGLE,OperatingSystem.ANDROID, 4, "Android 4.x", new String[] { "Android 4","Android-4" }, null, DeviceType.MOBILE, null ), - ANDROID4_TABLET(Manufacturer.GOOGLE,OperatingSystem.ANDROID4, 40, "Android 4.x Tablet", new String[] { "Android 4","Android-4" }, new String[] { "mobile" }, DeviceType.TABLET, null ), + ANDROID5( Manufacturer.GOOGLE,OperatingSystem.ANDROID, 5, "Android 5.x", new String[] { "Android 5", "Android-5" }, new String[] { "glass" }, DeviceType.MOBILE, null ), + ANDROID5_TABLET(Manufacturer.GOOGLE,OperatingSystem.ANDROID5, 50, "Android 5.x Tablet", new String[] { "Android 5", "Android-5"}, new String[] { "mobile", "glass" }, DeviceType.TABLET, null ), + ANDROID4( Manufacturer.GOOGLE,OperatingSystem.ANDROID, 4, "Android 4.x", new String[] { "Android 4", "Android-4" }, new String[] { "glass" }, DeviceType.MOBILE, null ), + ANDROID4_TABLET(Manufacturer.GOOGLE,OperatingSystem.ANDROID4, 40, "Android 4.x Tablet", new String[] { "Android 4", "Android-4"}, new String[] { "mobile", "glass" }, DeviceType.TABLET, null ), + ANDROID4_WEARABLE(Manufacturer.GOOGLE,OperatingSystem.ANDROID, 400, "Android 4.x", new String[] { "Android 4" }, null, DeviceType.WEARABLE, null ), ANDROID3_TABLET(Manufacturer.GOOGLE,OperatingSystem.ANDROID, 30, "Android 3.x Tablet", new String[] { "Android 3" }, null, DeviceType.TABLET, null ), // as long as there are not Android 3.x phones this should be enough ANDROID2( Manufacturer.GOOGLE,OperatingSystem.ANDROID, 2, "Android 2.x", new String[] { "Android 2" }, null, DeviceType.MOBILE, null ), ANDROID2_TABLET(Manufacturer.GOOGLE,OperatingSystem.ANDROID2, 20, "Android 2.x Tablet", new String[] { "Kindle Fire", "GT-P1000","SCH-I800" }, null, DeviceType.TABLET, null ), @@ -80,7 +84,10 @@ public enum OperatingSystem { */ ANDROID_TABLET( Manufacturer.GOOGLE,OperatingSystem.ANDROID, 12, "Android Tablet", new String[] { "Tablet" }, null, DeviceType.TABLET, null ), - + /** + * Chrome OS by Google, mostly used on Chromebooks and Chromeboxes + */ + CHROME_OS( Manufacturer.GOOGLE,null, 1000, "Chrome OS", new String[] { "CrOS" }, null, DeviceType.COMPUTER, null ), /** * PalmOS, exact version unkown */ @@ -92,13 +99,15 @@ public enum OperatingSystem { * iOS4, with the release of the iPhone 4, Apple renamed the OS to iOS. */ IOS( Manufacturer.APPLE,null, 2, "iOS", new String[] { "iPhone OS", "like Mac OS X" }, null, DeviceType.MOBILE, null ), // before MAC_OS_X_IPHONE for all older versions - iOS8_IPHONE( Manufacturer.APPLE,OperatingSystem.IOS, 45, "iOS 8 (iPhone)", new String[] { "iPhone OS 8" }, null, DeviceType.MOBILE, null ), // before MAC_OS_X_IPHONE for all older versions + iOS8_1_IPHONE( Manufacturer.APPLE,OperatingSystem.IOS, 46, "iOS 8.1 (iPhone)", new String[] { "iPhone OS 8_1" }, null, DeviceType.MOBILE, null ), // before MAC_OS_X_IPHONE for all older versions + iOS8_IPHONE( Manufacturer.APPLE,OperatingSystem.IOS, 45, "iOS 8 (iPhone)", new String[] { "iPhone OS 8_0" }, null, DeviceType.MOBILE, null ), // before MAC_OS_X_IPHONE for all older versions iOS7_IPHONE( Manufacturer.APPLE,OperatingSystem.IOS, 44, "iOS 7 (iPhone)", new String[] { "iPhone OS 7" }, null, DeviceType.MOBILE, null ), // before MAC_OS_X_IPHONE for all older versions iOS6_IPHONE( Manufacturer.APPLE,OperatingSystem.IOS, 43, "iOS 6 (iPhone)", new String[] { "iPhone OS 6" }, null, DeviceType.MOBILE, null ), // before MAC_OS_X_IPHONE for all older versions iOS5_IPHONE( Manufacturer.APPLE,OperatingSystem.IOS, 42, "iOS 5 (iPhone)", new String[] { "iPhone OS 5" }, null, DeviceType.MOBILE, null ), // before MAC_OS_X_IPHONE for all older versions iOS4_IPHONE( Manufacturer.APPLE,OperatingSystem.IOS, 41, "iOS 4 (iPhone)", new String[] { "iPhone OS 4" }, null, DeviceType.MOBILE, null ), // before MAC_OS_X_IPHONE for all older versions MAC_OS_X_IPAD( Manufacturer.APPLE, OperatingSystem.IOS, 50, "Mac OS X (iPad)", new String[] { "iPad" }, null, DeviceType.TABLET, null ), // before Mac OS X - iOS8_IPAD( Manufacturer.APPLE, OperatingSystem.MAC_OS_X_IPAD, 53, "iOS 8 (iPad)", new String[] { "OS 8" }, null, DeviceType.TABLET, null ), // before Mac OS X + iOS8_1_IPAD( Manufacturer.APPLE, OperatingSystem.MAC_OS_X_IPAD, 54, "iOS 8.1 (iPad)", new String[] { "OS 8_1" }, null, DeviceType.TABLET, null ), // before Mac OS X + iOS8_IPAD( Manufacturer.APPLE, OperatingSystem.MAC_OS_X_IPAD, 53, "iOS 8 (iPad)", new String[] { "OS 8_0" }, null, DeviceType.TABLET, null ), // before Mac OS X iOS7_IPAD( Manufacturer.APPLE, OperatingSystem.MAC_OS_X_IPAD, 52, "iOS 7 (iPad)", new String[] { "OS 7" }, null, DeviceType.TABLET, null ), // before Mac OS X iOS6_IPAD( Manufacturer.APPLE, OperatingSystem.MAC_OS_X_IPAD, 51, "iOS 6 (iPad)", new String[] { "OS 6" }, null, DeviceType.TABLET, null ), // before Mac OS X MAC_OS_X_IPHONE(Manufacturer.APPLE, OperatingSystem.IOS, 40, "Mac OS X (iPhone)", new String[] { "iPhone" }, null, DeviceType.MOBILE, null ), // before Mac OS X @@ -239,8 +248,9 @@ public String getName() { /* * Shortcut to check of an operating system is a mobile device. - * Left in here for backwards compatibility. + * Left in here for backwards compatibility. Use .getDeciceType() instead. */ + @Deprecated public boolean isMobileDevice() { return deviceType.equals(DeviceType.MOBILE); } diff --git a/src/test/java/eu/bitwalker/useragentutils/BrowserTest.java b/src/test/java/eu/bitwalker/useragentutils/BrowserTest.java index fff8b682..8166ce49 100644 --- a/src/test/java/eu/bitwalker/useragentutils/BrowserTest.java +++ b/src/test/java/eu/bitwalker/useragentutils/BrowserTest.java @@ -302,6 +302,14 @@ public class BrowserTest { "Mozilla/5.0 (Macintosh; U; Intel Mac OS X; en-gb) AppleWebKit/523.10.6 (KHTML, like Gecko) Version/3.0.4 Safari/523.10.6" }; + String[] safari8 = { + "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_10) AppleWebKit/600.1.25 (KHTML, like Gecko) Version/8.0 Safari/600.1.25" + }; + + String[] safari7 = { + "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_9) AppleWebKit/537.71 (KHTML, like Gecko) Version/7.0 Safari/537.71" + }; + String[] safari6 = { "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_3) AppleWebKit/536.28.10 (KHTML, like Gecko) Version/6.0.3 Safari/536.28.10" }; @@ -596,6 +604,8 @@ public void testParseUserAgentString() { testAgents(firefoxMobile23, Browser.FIREFOX_MOBILE23); testAgents(safari, Browser.SAFARI); testAgents(dolfin, Browser.DOLFIN2); + testAgents(safari8, Browser.SAFARI8); + testAgents(safari7, Browser.SAFARI7); testAgents(safari6, Browser.SAFARI6); testAgents(safari5, Browser.SAFARI5); testAgents(safari4, Browser.SAFARI4); diff --git a/src/test/java/eu/bitwalker/useragentutils/OperatingSystemTest.java b/src/test/java/eu/bitwalker/useragentutils/OperatingSystemTest.java index 68b5101b..dc370cf0 100644 --- a/src/test/java/eu/bitwalker/useragentutils/OperatingSystemTest.java +++ b/src/test/java/eu/bitwalker/useragentutils/OperatingSystemTest.java @@ -65,7 +65,8 @@ public class OperatingSystemTest { "Mozilla/5.0 (Linux; U; en-US) AppleWebKit/528.5+ (KHTML, like Gecko, Safari/528.5+) Version/4.0 Kindle/3.0 (screen 600x800; rotate)", "Mozilla/5.0 (Linux; U; Android 3.0; en-us; Xoom Build/HRI39) AppleWebKit/534.13 (KHTML, like Gecko) Version/4.0 Safari/534.13", // dropped the mobile part, so Android without mobile should be a tablet! "Mozilla/5.0 (PlayBook; U; RIM Tablet OS 1.0.0; en-US) AppleWebKit/534.8+ like Gecko) Version/0.0.1 Safari/534.8+", - "Mozilla/5.0 (Linux; U; Android 4.0.3; en-us; Transformer TF101 Build/IML74K) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Safari/534.30" + "Mozilla/5.0 (Linux; U; Android 4.0.3; en-us; Transformer TF101 Build/IML74K) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Safari/534.30", + "Mozilla/5.0 (Linux; Android 5.0; Nexus 9 Build/LRX21L) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/39.0.2171.59 Safari/537.36" }; String[] genericMobile = { @@ -182,6 +183,11 @@ public class OperatingSystemTest { "Mozilla/5.0 (iPhone; CPU iPhone OS 8_0 like Mac OS X) AppleWebKit/538.34.9 (KHTML, like Gecko) Mobile/12A4265u" }; + String[] iPhone8_1 = + { + "Mozilla/5.0 (iPhone; CPU iPhone OS 8_1 like Mac OS X) AppleWebKit/600.1.4 (KHTML, like Gecko) Version/8.0 Mobile/12B401 Safari/600.1.4" + }; + String[] iPods = { "Mozilla/5.0 (iPod; U; CPU like Mac OS X; nl-nl) AppleWebKit/420.1 (KHTML, like Gecko)", "Mozilla/5.0 (iPod; U; CPU like Mac OS X; en) AppleWebKit/420.1 (KHTML, like Gecko)", @@ -239,6 +245,10 @@ public class OperatingSystemTest { "Mozilla/5.0 (Linux; Android 4.4; Nexus 4 Build/KRT16E) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/30.0.1599.105 Mobile Safari" //"Dalvik/2.0.0 (Linux; U; Android 4.4.4; Nexus 5 Build/KTU84P) evme/2.0.2533" // disabled as it is not clear yet, which client sends this incomplete user-agent }; + + String[] android5g = { + "Mozilla/5.0 (Linux; Android 5.0; Nexus 4 Build/LRX21L) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/39.0.2171.59 Mobile Safari/537.36" + }; String[] android2_tablet= { "Mozilla/5.0 (Linux; U; Android 2.3.4; en-us; Kindle Fire Build/GINGERBREAD) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1" @@ -262,6 +272,11 @@ public class OperatingSystemTest { "Mozilla/5.0 (Linux; U; Android 4.1; xx-xx; ME301T Build/JRO03C) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Safari/534.30" // Asus ME301T (MeMO Pad Smart 10) }; + String[] android4_wearable = { + "Mozilla/5.0 (Linux; U; Android 4.0.4; en-us; Glass 1 Build/IMM76L; XE7) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30" + }; + + String[] androidMobile = { "Mozilla/5.0 (Android; Mobile; rv:23.0) Gecko/23.0 Firefox/23.0" // no OS version information in UA-string }; @@ -269,6 +284,11 @@ public class OperatingSystemTest { String[] androidTablet = { "Mozilla/5.0 (Android; Tablet; rv:23.0) Gecko/23.0 Firefox/23.0" // no OS version information in UA-string }; + + String[] chromeOS = { + "Mozilla/5.0 (X11; CrOS armv7l 5500.100.6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/34.0.1847.120 Safari/537.36", + "Mozilla/5.0 (X11; CrOS x86_64 5841.73.0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/36.0.1985.126 Safari/537.36" + }; String[] windows98 = { "Mozilla/4.0 (compatible; MSIE 6.0; Windows 98; Rogers Hi-Speed Internet; (R1 1.3))", @@ -297,6 +317,10 @@ public class OperatingSystemTest { "Mozilla/5.0 (Windows NT 6.3; WOW64; Trident/7.0; rv:11.0) like Gecko" }; + String[] windows10 = { + "Mozilla/5.0 (Windows NT 6.4; WOW64; rv:32.0) Gecko/20100101 Firefox/32.0 Build ID: 20141001101141" + }; + String[] windowsMobile7 = { "Mozilla/4.0 (compatible; MSIE 7.0; Windows Phone OS 7.0; Trident/3.1; IEMobile/7.0) Asus;Galaxy6", "Mozilla/5.0 (compatible; MSIE 9.0; Windows Phone OS 7.5; Trident/5.0; IEMobile/9.0)" @@ -384,6 +408,7 @@ public void testParseUserAgentString() { testAgents(iPhone6, OperatingSystem.iOS6_IPHONE); testAgents(iPhone7, OperatingSystem.iOS7_IPHONE); testAgents(iPhone8, OperatingSystem.iOS8_IPHONE); + testAgents(iPhone8_1, OperatingSystem.iOS8_1_IPHONE); testAgents(iPods, OperatingSystem.MAC_OS_X_IPOD); testAgents(iPadIos6, OperatingSystem.iOS6_IPAD); testAgents(iPadIos7, OperatingSystem.iOS7_IPAD); @@ -394,11 +419,14 @@ public void testParseUserAgentString() { testAgents(android1g, OperatingSystem.ANDROID1); testAgents(android2g, OperatingSystem.ANDROID2); testAgents(android4g, OperatingSystem.ANDROID4); + testAgents(android5g, OperatingSystem.ANDROID5); testAgents(android2_tablet, OperatingSystem.ANDROID2_TABLET); testAgents(android3_tablet, OperatingSystem.ANDROID3_TABLET); testAgents(android4_tablet, OperatingSystem.ANDROID4_TABLET); + testAgents(android4_wearable, OperatingSystem.ANDROID4_WEARABLE); testAgents(androidMobile, OperatingSystem.ANDROID_MOBILE); testAgents(androidTablet, OperatingSystem.ANDROID_TABLET); + testAgents(chromeOS, OperatingSystem.CHROME_OS); testAgents(maemo, OperatingSystem.MAEMO); testAgents(kindle2, OperatingSystem.KINDLE2); testAgents(kindle3, OperatingSystem.KINDLE3);