diff --git a/src/abstract-factory/perl/Factory/FactoryA.pm b/src/abstract-factory/perl/Factory/FactoryA.pm index 25f3618..b8469ad 100644 --- a/src/abstract-factory/perl/Factory/FactoryA.pm +++ b/src/abstract-factory/perl/Factory/FactoryA.pm @@ -4,8 +4,8 @@ use parent Factory; use strict; use warnings; -use Product::ProductA::ProductA1; -use Product::ProductB::ProductB1; +use ProductA::ProductA1; +use ProductB::ProductB1; sub new { my ($class, $args) = @_; @@ -13,11 +13,11 @@ sub new { } sub createProductA { - return Product::ProductA::ProductA1->new({name => "FA_A#1"}); + return ProductA::ProductA1->new({name => "FA_A#1"}); } sub createProductB { - return Product::ProductB::ProductB1->new({name => "FA_B#1"}); + return ProductB::ProductB1->new({name => "FA_B#1"}); } 1; diff --git a/src/abstract-factory/perl/Factory/FactoryB.pm b/src/abstract-factory/perl/Factory/FactoryB.pm index acd1898..c644e34 100644 --- a/src/abstract-factory/perl/Factory/FactoryB.pm +++ b/src/abstract-factory/perl/Factory/FactoryB.pm @@ -4,8 +4,8 @@ use parent Factory; use strict; use warnings; -use Product::ProductA; -use Product::ProductB; +use ProductA::ProductA2; +use ProductB::ProductB2; sub new { my ($class, $args) = @_; @@ -13,11 +13,11 @@ sub new { } sub createProductA { - return Product::ProductA->new({name => "FB_A#1"}); + return ProductA::ProductA2->new({name => "FB_A#1"}); } sub createProductB { - return Product::ProductB->new({name => "FB_B#1"}); + return ProductB::ProductB2->new({name => "FB_B#1"}); } 1; diff --git a/src/abstract-factory/perl/Product/ProductA.pm b/src/abstract-factory/perl/ProductA.pm similarity index 78% rename from src/abstract-factory/perl/Product/ProductA.pm rename to src/abstract-factory/perl/ProductA.pm index 935e6b5..710f8f1 100644 --- a/src/abstract-factory/perl/Product/ProductA.pm +++ b/src/abstract-factory/perl/ProductA.pm @@ -1,4 +1,4 @@ -package Product::ProductA; +package ProductA; use parent Product; sub new { diff --git a/src/abstract-factory/perl/Product/ProductA/ProductA1.pm b/src/abstract-factory/perl/ProductA/ProductA1.pm similarity index 61% rename from src/abstract-factory/perl/Product/ProductA/ProductA1.pm rename to src/abstract-factory/perl/ProductA/ProductA1.pm index 3438f65..4b1bd15 100644 --- a/src/abstract-factory/perl/Product/ProductA/ProductA1.pm +++ b/src/abstract-factory/perl/ProductA/ProductA1.pm @@ -1,5 +1,5 @@ -package Prodct::ProductA::ProductA1; -use parent Product::ProductA; +package ProductA::ProductA1; +use parent ProductA; use strict; use warnings; diff --git a/src/abstract-factory/perl/Product/ProductA/ProductA2.pm b/src/abstract-factory/perl/ProductA/ProductA2.pm similarity index 61% rename from src/abstract-factory/perl/Product/ProductA/ProductA2.pm rename to src/abstract-factory/perl/ProductA/ProductA2.pm index bccd50a..f6db770 100644 --- a/src/abstract-factory/perl/Product/ProductA/ProductA2.pm +++ b/src/abstract-factory/perl/ProductA/ProductA2.pm @@ -1,5 +1,5 @@ -package Prodct::ProductA::ProductA2; -use parent Product::ProductA; +package ProductA::ProductA2; +use parent ProductA; use strict; use warnings; diff --git a/src/abstract-factory/perl/Product/ProductB.pm b/src/abstract-factory/perl/ProductB.pm similarity index 78% rename from src/abstract-factory/perl/Product/ProductB.pm rename to src/abstract-factory/perl/ProductB.pm index 0228300..0e1c059 100644 --- a/src/abstract-factory/perl/Product/ProductB.pm +++ b/src/abstract-factory/perl/ProductB.pm @@ -1,4 +1,4 @@ -package Product::ProductB; +package ProductB; use parent Product; sub new { diff --git a/src/abstract-factory/perl/Product/ProductB/ProductB1.pm b/src/abstract-factory/perl/ProductB/ProductB1.pm similarity index 61% rename from src/abstract-factory/perl/Product/ProductB/ProductB1.pm rename to src/abstract-factory/perl/ProductB/ProductB1.pm index 3d91769..14839d8 100644 --- a/src/abstract-factory/perl/Product/ProductB/ProductB1.pm +++ b/src/abstract-factory/perl/ProductB/ProductB1.pm @@ -1,5 +1,5 @@ -package Prodct::ProductA::ProductB1; -use parent Product::ProductA; +package ProductA::ProductB1; +use parent ProductA; use strict; use warnings; diff --git a/src/abstract-factory/perl/Product/ProductB/ProductB2.pm b/src/abstract-factory/perl/ProductB/ProductB2.pm similarity index 61% rename from src/abstract-factory/perl/Product/ProductB/ProductB2.pm rename to src/abstract-factory/perl/ProductB/ProductB2.pm index ae4b4fc..704afba 100644 --- a/src/abstract-factory/perl/Product/ProductB/ProductB2.pm +++ b/src/abstract-factory/perl/ProductB/ProductB2.pm @@ -1,5 +1,5 @@ -package Prodct::ProductA::ProductB2; -use parent Product::ProductA; +package ProductA::ProductB2; +use parent ProductA; use strict; use warnings;