From a1ba5f31930b328590281346a9dce41cf9d26407 Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Wed, 13 Apr 2016 14:10:40 +0200 Subject: [PATCH] renamed field as it is no regular expression, but a pattern --- .../mobileprovider/CellphoneProvider.java | 36 ++++++++++--------- .../mobileprovider/MobileProvider.java | 12 +++---- 2 files changed, 25 insertions(+), 23 deletions(-) diff --git a/src/org/mxchange/jphone/phonenumbers/mobileprovider/CellphoneProvider.java b/src/org/mxchange/jphone/phonenumbers/mobileprovider/CellphoneProvider.java index 6f469d3..6c63806 100644 --- a/src/org/mxchange/jphone/phonenumbers/mobileprovider/CellphoneProvider.java +++ b/src/org/mxchange/jphone/phonenumbers/mobileprovider/CellphoneProvider.java @@ -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 *

- * @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; } } diff --git a/src/org/mxchange/jphone/phonenumbers/mobileprovider/MobileProvider.java b/src/org/mxchange/jphone/phonenumbers/mobileprovider/MobileProvider.java index 2594c3a..77fe960 100644 --- a/src/org/mxchange/jphone/phonenumbers/mobileprovider/MobileProvider.java +++ b/src/org/mxchange/jphone/phonenumbers/mobileprovider/MobileProvider.java @@ -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 *

- * @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 *

- * @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); -- 2.39.5