Continued a bit:

- added copyAll() + used it to copy only values

diff --git a/src/org/mxchange/jphone/phonenumbers/fax/FaxNumber.java b/src/org/mxchange/jphone/phonenumbers/fax/FaxNumber.java
index e9774de0affcf6873601956088422f9f6dce9d17..0e2cf057d971286fbb82295615535c9ee460d1b0 100644 (file)
--- a/src/org/mxchange/jphone/phonenumbers/fax/FaxNumber.java
+++ b/src/org/mxchange/jphone/phonenumbers/fax/FaxNumber.java
@@ -127,9 +127,15 @@ public class FaxNumber implements DialableFaxNumber {
 
        @Override
        public void copyAll (final DialableFaxNumber sourceNumber) {
+               // Validate instance
+               if (null == sourceNumber) {
+                       // Throw NPE
+                       throw new NullPointerException("sourceNumber is null"); //NOI18N
+               }
+
                // Copy all
                this.setPhoneAreaCode(sourceNumber.getPhoneAreaCode());
-               this.setPhoneCountry(sourceNumber.getPhoneCountry());
+               this.getPhoneCountry().copyAll(sourceNumber.getPhoneCountry());
                this.setPhoneEntryCreated(sourceNumber.getPhoneEntryCreated());
                this.setPhoneId(sourceNumber.getPhoneId());
                this.setPhoneNumber(sourceNumber.getPhoneNumber());

diff --git a/src/org/mxchange/jphone/phonenumbers/landline/LandLineNumber.java b/src/org/mxchange/jphone/phonenumbers/landline/LandLineNumber.java
index 7411cf5894eceea4ecad2ac7bb721d787e1924b8..b9ca58cf35ba8fdd9fc9c118667f4fd596b0b8aa 100644 (file)
--- a/src/org/mxchange/jphone/phonenumbers/landline/LandLineNumber.java
+++ b/src/org/mxchange/jphone/phonenumbers/landline/LandLineNumber.java
@@ -127,9 +127,15 @@ public class LandLineNumber implements DialableLandLineNumber {
 
        @Override
        public void copyAll (final DialableLandLineNumber sourceNumber) {
+               // Validate instance
+               if (null == sourceNumber) {
+                       // Throw NPE
+                       throw new NullPointerException("sourceNumber is null"); //NOI18N
+               }
+
                // Copy all
                this.setPhoneAreaCode(sourceNumber.getPhoneAreaCode());
-               this.setPhoneCountry(sourceNumber.getPhoneCountry());
+               this.getPhoneCountry().copyAll(sourceNumber.getPhoneCountry());
                this.setPhoneEntryCreated(sourceNumber.getPhoneEntryCreated());
                this.setPhoneId(sourceNumber.getPhoneId());
                this.setPhoneNumber(sourceNumber.getPhoneNumber());

diff --git a/src/org/mxchange/jphone/phonenumbers/mobile/MobileNumber.java b/src/org/mxchange/jphone/phonenumbers/mobile/MobileNumber.java
index ac2a0c2b1c91f9e1603959f68c464655b6a19422..d553c9437634010bd53bf77932d756a1b18b848c 100644 (file)
--- a/src/org/mxchange/jphone/phonenumbers/mobile/MobileNumber.java
+++ b/src/org/mxchange/jphone/phonenumbers/mobile/MobileNumber.java
@@ -119,8 +119,14 @@ public class MobileNumber implements DialableMobileNumber {
 
        @Override
        public void copyAll (final DialableMobileNumber sourceNumber) {
+               // Validate instance
+               if (null == sourceNumber) {
+                       // Throw NPE
+                       throw new NullPointerException("sourceNumber is null"); //NOI18N
+               }
+
                // Copy all
-               this.setMobileProvider(sourceNumber.getMobileProvider());
+               this.getMobileProvider().copyAll(sourceNumber.getMobileProvider());
                this.setPhoneEntryCreated(sourceNumber.getPhoneEntryCreated());
                this.setPhoneId(sourceNumber.getPhoneId());
                this.setPhoneNumber(sourceNumber.getPhoneNumber());

diff --git a/src/org/mxchange/jphone/phonenumbers/mobileprovider/CellphoneProvider.java b/src/org/mxchange/jphone/phonenumbers/mobileprovider/CellphoneProvider.java
index dc20772cba5bcb3d6ffba5287c8740a405ee5141..b31ce492de5c458181341a46be71fd6e0e64e364 100644 (file)
--- a/src/org/mxchange/jphone/phonenumbers/mobileprovider/CellphoneProvider.java
+++ b/src/org/mxchange/jphone/phonenumbers/mobileprovider/CellphoneProvider.java
@@ -123,6 +123,23 @@ public class CellphoneProvider implements MobileProvider {
                this.providerMailPattern = providerMailPattern;
        }
 
+       @Override
+       public void copyAll (final MobileProvider sourceMobileProvider) {
+               // Parameter should not be null
+               if (null == sourceMobileProvider) {
+                       // Throw NPE
+                       throw new NullPointerException("sourceMobileProvider is null"); //NOI18N
+               }
+
+               // Copy all values
+               this.getProviderCountry().copyAll(sourceMobileProvider.getProviderCountry());
+               this.setProviderDialPrefix(sourceMobileProvider.getProviderDialPrefix());
+               this.setProviderEntryCreated(sourceMobileProvider.getProviderEntryCreated());
+               this.setProviderId(sourceMobileProvider.getProviderId());
+               this.setProviderMailPattern(sourceMobileProvider.getProviderMailPattern());
+               this.setProviderName(sourceMobileProvider.getProviderName());
+       }
+
        @Override
        public boolean equals (final Object object) {
                if (null == object) {

diff --git a/src/org/mxchange/jphone/phonenumbers/mobileprovider/MobileProvider.java b/src/org/mxchange/jphone/phonenumbers/mobileprovider/MobileProvider.java
index 77fe960193b88ae82d86709d3fdab02b44888511..687ddb7bf3a58c6f5370dcfc751eee8b63f220d8 100644 (file)
--- a/src/org/mxchange/jphone/phonenumbers/mobileprovider/MobileProvider.java
+++ b/src/org/mxchange/jphone/phonenumbers/mobileprovider/MobileProvider.java
@@ -27,6 +27,13 @@ import org.mxchange.jcountry.data.Country;
  */
 public interface MobileProvider extends Serializable {
 
+       /**
+        * Copies all values from source mobile provider to this
+        * <p>
+        * @param sourceMobileProvider Source mobile provider
+        */
+       void copyAll (final MobileProvider sourceMobileProvider);
+
        /**
         * Getter for id number
         * <p>