]> git.mxchange.org Git - jphone-core.git/commitdiff
renamed field as it is no regular expression, but a pattern
authorRoland Haeder <roland@mxchange.org>
Wed, 13 Apr 2016 12:10:40 +0000 (14:10 +0200)
committerRoland Haeder <roland@mxchange.org>
Wed, 13 Apr 2016 12:10:40 +0000 (14:10 +0200)
src/org/mxchange/jphone/phonenumbers/mobileprovider/CellphoneProvider.java
src/org/mxchange/jphone/phonenumbers/mobileprovider/MobileProvider.java

index 6f469d3c0345b76f471dcac094243acae93a1c7d..6c638061a75e23cc3050543e47f37f74e4150b6e 100644 (file)
@@ -83,10 +83,10 @@ public class CellphoneProvider implements MobileProvider {
        private Long providerId;
 
        /**
-        * Regular expression for mail gateway
+        * Pattern for mail gateway
         */
-       @Column (name = "provider_mail_regex", length = 30)
-       private String providerMailRegex;
+       @Column (name = "provider_mail_pattern", length = 30)
+       private String providerMailPattern;
 
        /**
         * Name of the provider
@@ -95,14 +95,21 @@ public class CellphoneProvider implements MobileProvider {
        @Column (name = "provider_name", length = 30, nullable = false)
        private String providerName;
 
+       /**
+        * Default constructor
+        */
+       public CellphoneProvider () {
+       }
+
        /**
         * Constructor with all required data
         * <p>
-        * @param providerDialPrefix Dial prefix
-        * @param providerName       Name
-        * @param providerCountry    Country
+        * @param providerDialPrefix  Dial prefix
+        * @param providerName        Name
+        * @param providerCountry     Country
+        * @param providerMailPattern Pattern for email
         */
-       public CellphoneProvider (final Long providerDialPrefix, final String providerName, final Country providerCountry) {
+       public CellphoneProvider (final Long providerDialPrefix, final String providerName, final Country providerCountry, final String providerMailPattern) {
                // Call default constructor
                this();
 
@@ -110,12 +117,7 @@ public class CellphoneProvider implements MobileProvider {
                this.providerDialPrefix = providerDialPrefix;
                this.providerName = providerName;
                this.providerCountry = providerCountry;
-       }
-
-       /**
-        * Default constructor
-        */
-       public CellphoneProvider () {
+               this.providerMailPattern = providerMailPattern;
        }
 
        @Override
@@ -199,13 +201,13 @@ public class CellphoneProvider implements MobileProvider {
        }
 
        @Override
-       public String getProviderMailRegex () {
-               return this.providerMailRegex;
+       public String getProviderMailPattern () {
+               return this.providerMailPattern;
        }
 
        @Override
-       public void setProviderMailRegex (final String providerMailRegex) {
-               this.providerMailRegex = providerMailRegex;
+       public void setProviderMailPattern (final String providerMailPattern) {
+               this.providerMailPattern = providerMailPattern;
        }
 
 }
index 2594c3ac0de69ade11c012d42e8991bd609ec510..77fe960193b88ae82d86709d3fdab02b44888511 100644 (file)
@@ -98,18 +98,18 @@ public interface MobileProvider extends Serializable {
        void setProviderEntryCreated (final Calendar providerEntryCreated);
 
        /**
-        * Getter for regular expression for mail gateway
+        * Getter for pattern for mail gateway
         * <p>
-        * @return Regular expression for mail gateway
+        * @return Pattern for mail gateway
         */
-       String getProviderMailRegex ();
+       String getProviderMailPattern ();
 
        /**
-        * Setter for regular expression for mail gateway
+        * Setter for pattern for mail gateway
         * <p>
-        * @param providerMailRegex Regular expression for mail gateway
+        * @param providerMailRegex Pattern for mail gateway
         */
-       void setProviderMailRegex (final String providerMailRegex);
+       void setProviderMailPattern (final String providerMailRegex);
 
        @Override
        boolean equals (final Object object);