package com.gitrekt.resort.model.entities;

public enum USState {
    ALABAMA("Alabama", "AL"),
    ALASKA("Alaska", "AK"),
    ARIZONA("Arizona", "AZ"),
    ARKANSAS("Arkansas", "AR"),
    CALIFORNIA("California", "CA"),
    COLORADO("Colorado", "CO"),
    CONNECTICUT("Connecticut", "CT"),
    DELAWARE("Delaware", "DE"),
    DISTRICT_OF_COLUMBIA("District of Columbia", "DC"),
    FLORIDA("Florida", "FL"),
    GEORGIA("Georgia", "GA"),
    HAWAII("Hawaii", "HI"),
    IDAHO("Idaho", "ID"),
    ILLINOIS("Illinois", "IL"),
    INDIANA("Indiana", "IN"),
    IOWA("Iowa", "IA"),
    KANSAS("Kansas", "KS"),
    KENTUCKY("Kentucky", "KY"),
    LOUISIANA("Louisiana", "LA"),
    MAINE("Maine", "ME"),
    MARYLAND("Maryland", "MD"),
    MASSACHUSETTS("Massachusetts", "MA"),
    MICHIGAN("Michigan", "MI"),
    MINNESOTA("Minnesota", "MN"),
    MISSISSIPPI("Mississippi", "MS"),
    MISSOURI("Missouri", "MO"),
    MONTANA("Montana", "MT"),
    NEBRASKA("Nebraska", "NE"),
    NEVADA("Nevada", "NV"),
    NEW_HAMPSHIRE("New Hampshire", "NH"),
    NEW_JERSEY("New Jersey", "NJ"),
    NEW_MEXICO("New Mexico", "NM"),
    NEW_YORK("New York", "NY"),
    NORTH_CAROLINA("North Carolina", "NC"),
    NORTH_DAKOTA("North Dakota", "ND"),
    OHIO("Ohio", "OH"),
    OKLAHOMA("Oklahoma", "OK"),
    OREGON("Oregon", "OR"),
    PENNSYLVANIA("Pennsylvania", "PA"),
    RHODE_ISLAND("Rhode Island", "RI"),
    SOUTH_CAROLINA("South Carolina", "SC"),
    SOUTH_DAKOTA("South Dakota", "SD"),
    TENNESSEE("Tennessee", "TN"),
    TEXAS("Texas", "TX"),
    UTAH("Utah", "UT"),
    VERMONT("Vermont", "VT"),
    VIRGINIA("Virginia", "VA"),
    WASHINGTON("Washington", "WA"),
    WEST_VIRGINIA("West Virginia", "WV"),
    WISCONSIN("Wisconsin", "WI"),
    WYOMING("Wyoming", "WY"),
    PUERTO_RICO("Puerto Rico", "PR");

    String unabbreviated;

    String ANSIabbreviation;

    USState(String unabbreviated, String ANSIabbreviation) {

        this.unabbreviated = unabbreviated;

        this.ANSIabbreviation = ANSIabbreviation;

    }

    public String getUnabbreviated() {
        return this.unabbreviated;
    }

    /**

     */
    public String getANSIAbbreviation() {

        return this.ANSIabbreviation;

    }

    /**
     *
     * Parse string input to enum. Accepts unabbreviated and abbreviated forms.
     *
     * Case insensitive.
     *
     * @param input String to parse
     *
     * @return The parsed US state, or null on failure.
     *
     */
    public static USState parse(String input) {
    /*
     * The abbreviated name of this state, e.g. "NY", or "WY".
     */
    public String getAbbreviation() {
        return this.abbreviation;
    }

    /**
     * Parse string input to enum. Accepts unabbreviated and abbreviated forms.
     * Case insensitive.
     * 
     * @param input String to parse
     * 
     * @return The parsed US state, or null on failure.
     */

    public static UsState parse(String input) {
        if (null == input) {
            return null;
        }

        input = input.trim();


        for (USState state : values()) {

            if (state.unabbreviated.equalsIgnoreCase(input)
                    || state.ANSIabbreviation.equalsIgnoreCase(input)) {

        for (UsState state : values()) {
            if (state.unabbreviated.equalsIgnoreCase(input)  ||
                state.abbreviation.equalsIgnoreCase(input))
                 {
                return state;
            }
        }
        return null;
    }
}

@@ -54,17 +54,17 @@
 um U
-S
+s
 State %7B%0A
     
@@ -59,16 +59,21 @@
 State %7B%0A
+    %0A
     ALAB
@@ -1803,24 +1803,32 @@
 %22PR%22);%0A%0A    
+private 
 String unabb
@@ -1842,27 +1842,31 @@
 d;%0A%0A    
+private 
 String 
-ANSI
 abbrevia
@@ -1877,17 +1877,17 @@
 ;%0A%0A    U
-S
+s
 State(St
@@ -1913,20 +1913,16 @@
  String 
-ANSI
 abbrevia
@@ -1925,25 +1925,24 @@
 eviation) %7B%0A
-%0A
         this
@@ -1969,25 +1969,24 @@
 bbreviated;%0A
-%0A
         this
@@ -1982,28 +1982,24 @@
        this.
-ANSI
 abbreviation
@@ -2001,20 +2001,16 @@
 ation = 
-ANSI
 abbrevia
@@ -2007,33 +2007,32 @@
 = abbreviation;%0A
-%0A
     %7D%0A%0A    publi
@@ -2106,416 +2106,23 @@
   %7D%0A
-%0A
     
-/**%0A%0A     */%0A    public String getANSIAbbreviation() %7B%0A%0A        return this.ANSIabbreviation;%0A%0A    %7D%0A%0A    /**%0A     *%0A     * Parse string input to enum. Accepts unabbreviated and abbreviated forms.%0A     *%0A     * Case insensitive.%0A     *%0A     * @param input String to parse%0A     *%0A     * @return The parsed US state, or null on failure.%0A     *%0A     */%0A    public static USState parse(String input) %7B%0A    /
+    %0A    /*
 *%0A  
@@ -2607,24 +2607,32 @@
 ;%0A        %7D%0A
+        
 %0A        inp
@@ -2655,185 +2655,8 @@
 );%0A%0A
-%0A        for (USState state : values()) %7B%0A%0A            if (state.unabbreviated.equalsIgnoreCase(input)%0A                    %7C%7C state.ANSIabbreviation.equalsIgnoreCase(input)) %7B%0A%0A
     

Fix merge conflicts