From 807bdce30eba44babd5c4a47e959c1ddeabdbc12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?= Date: Thu, 25 Jun 2009 12:49:10 +0200 Subject: [PATCH] ItEr14S08ModeladoTempoItEr13S09: Partial Date and related classes moved to a more suitable package. --- .../partialtime/IntervalOfPartialDates.java | 2 +- .../business/{ => common}/partialtime/PartialDate.java | 2 +- .../{ => common}/partialtime/TimeQuantity.java | 4 ++-- .../test/partialtime/IntervalOfPartialDatesTest.java | 10 +++++----- .../{ => common}/test/partialtime/PartialDateTest.java | 10 +++++----- .../test/partialtime/TimeQuantityTest.java | 6 +++--- 6 files changed, 17 insertions(+), 17 deletions(-) rename navalplanner-business/src/main/java/org/navalplanner/business/{ => common}/partialtime/IntervalOfPartialDates.java (96%) rename navalplanner-business/src/main/java/org/navalplanner/business/{ => common}/partialtime/PartialDate.java (99%) rename navalplanner-business/src/main/java/org/navalplanner/business/{ => common}/partialtime/TimeQuantity.java (95%) rename navalplanner-business/src/test/java/org/navalplanner/business/{ => common}/test/partialtime/IntervalOfPartialDatesTest.java (92%) rename navalplanner-business/src/test/java/org/navalplanner/business/{ => common}/test/partialtime/PartialDateTest.java (97%) rename navalplanner-business/src/test/java/org/navalplanner/business/{ => common}/test/partialtime/TimeQuantityTest.java (95%) diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/partialtime/IntervalOfPartialDates.java b/navalplanner-business/src/main/java/org/navalplanner/business/common/partialtime/IntervalOfPartialDates.java similarity index 96% rename from navalplanner-business/src/main/java/org/navalplanner/business/partialtime/IntervalOfPartialDates.java rename to navalplanner-business/src/main/java/org/navalplanner/business/common/partialtime/IntervalOfPartialDates.java index 44086ea82..beadaddb8 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/partialtime/IntervalOfPartialDates.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/common/partialtime/IntervalOfPartialDates.java @@ -1,4 +1,4 @@ -package org.navalplanner.business.partialtime; +package org.navalplanner.business.common.partialtime; import org.apache.commons.lang.builder.EqualsBuilder; import org.apache.commons.lang.builder.HashCodeBuilder; diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/partialtime/PartialDate.java b/navalplanner-business/src/main/java/org/navalplanner/business/common/partialtime/PartialDate.java similarity index 99% rename from navalplanner-business/src/main/java/org/navalplanner/business/partialtime/PartialDate.java rename to navalplanner-business/src/main/java/org/navalplanner/business/common/partialtime/PartialDate.java index f6b4099ab..4163952c1 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/partialtime/PartialDate.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/common/partialtime/PartialDate.java @@ -1,4 +1,4 @@ -package org.navalplanner.business.partialtime; +package org.navalplanner.business.common.partialtime; import java.util.ArrayList; import java.util.Collections; diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/partialtime/TimeQuantity.java b/navalplanner-business/src/main/java/org/navalplanner/business/common/partialtime/TimeQuantity.java similarity index 95% rename from navalplanner-business/src/main/java/org/navalplanner/business/partialtime/TimeQuantity.java rename to navalplanner-business/src/main/java/org/navalplanner/business/common/partialtime/TimeQuantity.java index adf948b77..2e4c0bd89 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/partialtime/TimeQuantity.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/common/partialtime/TimeQuantity.java @@ -1,9 +1,9 @@ -package org.navalplanner.business.partialtime; +package org.navalplanner.business.common.partialtime; import java.util.EnumMap; import org.apache.commons.lang.Validate; -import org.navalplanner.business.partialtime.PartialDate.Granularity; +import org.navalplanner.business.common.partialtime.PartialDate.Granularity; /** * Represents a quantity of time. It's composed from granularities and integers
diff --git a/navalplanner-business/src/test/java/org/navalplanner/business/test/partialtime/IntervalOfPartialDatesTest.java b/navalplanner-business/src/test/java/org/navalplanner/business/common/test/partialtime/IntervalOfPartialDatesTest.java similarity index 92% rename from navalplanner-business/src/test/java/org/navalplanner/business/test/partialtime/IntervalOfPartialDatesTest.java rename to navalplanner-business/src/test/java/org/navalplanner/business/common/test/partialtime/IntervalOfPartialDatesTest.java index 73d03ad3e..61adc3ab6 100644 --- a/navalplanner-business/src/test/java/org/navalplanner/business/test/partialtime/IntervalOfPartialDatesTest.java +++ b/navalplanner-business/src/test/java/org/navalplanner/business/common/test/partialtime/IntervalOfPartialDatesTest.java @@ -1,4 +1,4 @@ -package org.navalplanner.business.test.partialtime; +package org.navalplanner.business.common.test.partialtime; import static org.hamcrest.CoreMatchers.equalTo; import static org.junit.Assert.assertEquals; @@ -8,10 +8,10 @@ import static org.junit.Assert.assertThat; import org.joda.time.DateTime; import org.joda.time.LocalDate; import org.junit.Test; -import org.navalplanner.business.partialtime.IntervalOfPartialDates; -import org.navalplanner.business.partialtime.PartialDate; -import org.navalplanner.business.partialtime.TimeQuantity; -import org.navalplanner.business.partialtime.PartialDate.Granularity; +import org.navalplanner.business.common.partialtime.IntervalOfPartialDates; +import org.navalplanner.business.common.partialtime.PartialDate; +import org.navalplanner.business.common.partialtime.TimeQuantity; +import org.navalplanner.business.common.partialtime.PartialDate.Granularity; public class IntervalOfPartialDatesTest { diff --git a/navalplanner-business/src/test/java/org/navalplanner/business/test/partialtime/PartialDateTest.java b/navalplanner-business/src/test/java/org/navalplanner/business/common/test/partialtime/PartialDateTest.java similarity index 97% rename from navalplanner-business/src/test/java/org/navalplanner/business/test/partialtime/PartialDateTest.java rename to navalplanner-business/src/test/java/org/navalplanner/business/common/test/partialtime/PartialDateTest.java index 46cc7b784..6d280f9e3 100644 --- a/navalplanner-business/src/test/java/org/navalplanner/business/test/partialtime/PartialDateTest.java +++ b/navalplanner-business/src/test/java/org/navalplanner/business/common/test/partialtime/PartialDateTest.java @@ -1,4 +1,4 @@ -package org.navalplanner.business.test.partialtime; +package org.navalplanner.business.common.test.partialtime; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.not; @@ -16,10 +16,10 @@ import org.joda.time.Instant; import org.joda.time.LocalDate; import org.joda.time.ReadablePartial; import org.junit.Test; -import org.navalplanner.business.partialtime.IntervalOfPartialDates; -import org.navalplanner.business.partialtime.PartialDate; -import org.navalplanner.business.partialtime.TimeQuantity; -import org.navalplanner.business.partialtime.PartialDate.Granularity; +import org.navalplanner.business.common.partialtime.IntervalOfPartialDates; +import org.navalplanner.business.common.partialtime.PartialDate; +import org.navalplanner.business.common.partialtime.TimeQuantity; +import org.navalplanner.business.common.partialtime.PartialDate.Granularity; public class PartialDateTest { diff --git a/navalplanner-business/src/test/java/org/navalplanner/business/test/partialtime/TimeQuantityTest.java b/navalplanner-business/src/test/java/org/navalplanner/business/common/test/partialtime/TimeQuantityTest.java similarity index 95% rename from navalplanner-business/src/test/java/org/navalplanner/business/test/partialtime/TimeQuantityTest.java rename to navalplanner-business/src/test/java/org/navalplanner/business/common/test/partialtime/TimeQuantityTest.java index 500660bff..af25e2766 100644 --- a/navalplanner-business/src/test/java/org/navalplanner/business/test/partialtime/TimeQuantityTest.java +++ b/navalplanner-business/src/test/java/org/navalplanner/business/common/test/partialtime/TimeQuantityTest.java @@ -1,12 +1,12 @@ -package org.navalplanner.business.test.partialtime; +package org.navalplanner.business.common.test.partialtime; import static org.hamcrest.CoreMatchers.equalTo; import static org.junit.Assert.assertNotSame; import static org.junit.Assert.assertThat; import org.junit.Test; -import org.navalplanner.business.partialtime.TimeQuantity; -import org.navalplanner.business.partialtime.PartialDate.Granularity; +import org.navalplanner.business.common.partialtime.TimeQuantity; +import org.navalplanner.business.common.partialtime.PartialDate.Granularity; public class TimeQuantityTest {