From 610fa9790673efac003b22b3f0e0b7e22fd733c1 Mon Sep 17 00:00:00 2001 From: Simon Brandhof Date: Fri, 16 Dec 2011 09:01:02 +0100 Subject: [PATCH] SONAR-1929 move the package org.sonar.api.web.dashboard to org.sonar.api.web No need anymore of a dedicated package --- .../sonar/plugins/core/dashboards/DefaultDashboard.java | 6 +++--- .../sonar/plugins/core/dashboards/HotspotsDashboard.java | 6 +++--- .../plugins/core/dashboards/DefaultDashboardTest.java | 4 ++-- .../plugins/core/dashboards/HotspotsDashboardTest.java | 4 ++-- .../java/org/sonar/api/web/{dashboard => }/Dashboard.java | 2 +- .../org/sonar/api/web/{dashboard => }/DashboardLayout.java | 4 ++-- .../sonar/api/web/{dashboard => }/DashboardTemplate.java | 7 +++---- .../org/sonar/api/web/{dashboard => }/DashboardTest.java | 2 +- .../org/sonar/server/startup/RegisterNewDashboards.java | 4 ++-- .../sonar/server/startup/RegisterNewDashboardsTest.java | 6 +++--- 10 files changed, 22 insertions(+), 23 deletions(-) rename sonar-plugin-api/src/main/java/org/sonar/api/web/{dashboard => }/Dashboard.java (99%) rename sonar-plugin-api/src/main/java/org/sonar/api/web/{dashboard => }/DashboardLayout.java (97%) rename sonar-plugin-api/src/main/java/org/sonar/api/web/{dashboard => }/DashboardTemplate.java (96%) rename sonar-plugin-api/src/test/java/org/sonar/api/web/{dashboard => }/DashboardTest.java (99%) diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/dashboards/DefaultDashboard.java b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/dashboards/DefaultDashboard.java index 85f331b914a..7b935de8a70 100644 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/dashboards/DefaultDashboard.java +++ b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/dashboards/DefaultDashboard.java @@ -19,9 +19,9 @@ */ package org.sonar.plugins.core.dashboards; -import org.sonar.api.web.dashboard.Dashboard; -import org.sonar.api.web.dashboard.DashboardLayout; -import org.sonar.api.web.dashboard.DashboardTemplate; +import org.sonar.api.web.Dashboard; +import org.sonar.api.web.DashboardLayout; +import org.sonar.api.web.DashboardTemplate; /** * Default dashboard diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/dashboards/HotspotsDashboard.java b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/dashboards/HotspotsDashboard.java index c8b9a4fb648..0def3bd740b 100644 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/dashboards/HotspotsDashboard.java +++ b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/dashboards/HotspotsDashboard.java @@ -19,9 +19,9 @@ */ package org.sonar.plugins.core.dashboards; -import org.sonar.api.web.dashboard.Dashboard; -import org.sonar.api.web.dashboard.DashboardLayout; -import org.sonar.api.web.dashboard.DashboardTemplate; +import org.sonar.api.web.Dashboard; +import org.sonar.api.web.DashboardLayout; +import org.sonar.api.web.DashboardTemplate; /** * Hotspot dashboard for Sonar diff --git a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/dashboards/DefaultDashboardTest.java b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/dashboards/DefaultDashboardTest.java index d5148fa1767..bd4c5bd895b 100644 --- a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/dashboards/DefaultDashboardTest.java +++ b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/dashboards/DefaultDashboardTest.java @@ -21,8 +21,8 @@ package org.sonar.plugins.core.dashboards; import org.hamcrest.core.Is; import org.junit.Test; -import org.sonar.api.web.dashboard.Dashboard; -import org.sonar.api.web.dashboard.DashboardLayout; +import org.sonar.api.web.Dashboard; +import org.sonar.api.web.DashboardLayout; import static org.junit.Assert.assertThat; diff --git a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/dashboards/HotspotsDashboardTest.java b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/dashboards/HotspotsDashboardTest.java index 1057e9a5c96..83042ef59fc 100644 --- a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/dashboards/HotspotsDashboardTest.java +++ b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/dashboards/HotspotsDashboardTest.java @@ -21,8 +21,8 @@ package org.sonar.plugins.core.dashboards; import org.hamcrest.core.Is; import org.junit.Test; -import org.sonar.api.web.dashboard.Dashboard; -import org.sonar.api.web.dashboard.DashboardLayout; +import org.sonar.api.web.Dashboard; +import org.sonar.api.web.DashboardLayout; import static org.junit.Assert.assertThat; diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/web/dashboard/Dashboard.java b/sonar-plugin-api/src/main/java/org/sonar/api/web/Dashboard.java similarity index 99% rename from sonar-plugin-api/src/main/java/org/sonar/api/web/dashboard/Dashboard.java rename to sonar-plugin-api/src/main/java/org/sonar/api/web/Dashboard.java index e1fa4b1df3b..8e709bd8e4b 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/web/dashboard/Dashboard.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/web/Dashboard.java @@ -17,7 +17,7 @@ * License along with Sonar; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02 */ -package org.sonar.api.web.dashboard; +package org.sonar.api.web; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.ListMultimap; diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/web/dashboard/DashboardLayout.java b/sonar-plugin-api/src/main/java/org/sonar/api/web/DashboardLayout.java similarity index 97% rename from sonar-plugin-api/src/main/java/org/sonar/api/web/dashboard/DashboardLayout.java rename to sonar-plugin-api/src/main/java/org/sonar/api/web/DashboardLayout.java index 3b698476dc7..daa0ded2bb4 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/web/dashboard/DashboardLayout.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/web/DashboardLayout.java @@ -17,11 +17,11 @@ * License along with Sonar; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02 */ -package org.sonar.api.web.dashboard; +package org.sonar.api.web; /** * Possible layouts for a dashboard. - * + * * @since 2.13 */ public enum DashboardLayout { diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/web/dashboard/DashboardTemplate.java b/sonar-plugin-api/src/main/java/org/sonar/api/web/DashboardTemplate.java similarity index 96% rename from sonar-plugin-api/src/main/java/org/sonar/api/web/dashboard/DashboardTemplate.java rename to sonar-plugin-api/src/main/java/org/sonar/api/web/DashboardTemplate.java index 17412997c68..ead4a5223df 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/web/dashboard/DashboardTemplate.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/web/DashboardTemplate.java @@ -17,21 +17,20 @@ * License along with Sonar; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02 */ -package org.sonar.api.web.dashboard; +package org.sonar.api.web; import org.sonar.api.ServerExtension; /** - * * This extension point must be implemented to define a new dashboard. - * + * * @since 2.13 */ public abstract class DashboardTemplate implements ServerExtension { /** * Returns the {@link Dashboard} object that represents the dashboard to use. - * + * * @return the dashboard */ public abstract Dashboard createDashboard(); diff --git a/sonar-plugin-api/src/test/java/org/sonar/api/web/dashboard/DashboardTest.java b/sonar-plugin-api/src/test/java/org/sonar/api/web/DashboardTest.java similarity index 99% rename from sonar-plugin-api/src/test/java/org/sonar/api/web/dashboard/DashboardTest.java rename to sonar-plugin-api/src/test/java/org/sonar/api/web/DashboardTest.java index 08c1b535cae..ecc09898b8c 100644 --- a/sonar-plugin-api/src/test/java/org/sonar/api/web/dashboard/DashboardTest.java +++ b/sonar-plugin-api/src/test/java/org/sonar/api/web/DashboardTest.java @@ -17,7 +17,7 @@ * License along with Sonar; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02 */ -package org.sonar.api.web.dashboard; +package org.sonar.api.web; import org.hamcrest.core.Is; import org.junit.Test; diff --git a/sonar-server/src/main/java/org/sonar/server/startup/RegisterNewDashboards.java b/sonar-server/src/main/java/org/sonar/server/startup/RegisterNewDashboards.java index 7add3b89c7d..c8cc09c9a03 100644 --- a/sonar-server/src/main/java/org/sonar/server/startup/RegisterNewDashboards.java +++ b/sonar-server/src/main/java/org/sonar/server/startup/RegisterNewDashboards.java @@ -23,8 +23,8 @@ import com.google.common.collect.Lists; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.sonar.api.utils.TimeProfiler; -import org.sonar.api.web.dashboard.Dashboard; -import org.sonar.api.web.dashboard.DashboardTemplate; +import org.sonar.api.web.Dashboard; +import org.sonar.api.web.DashboardTemplate; import org.sonar.persistence.dashboard.*; import org.sonar.persistence.template.LoadedTemplateDao; import org.sonar.persistence.template.LoadedTemplateDto; diff --git a/sonar-server/src/test/java/org/sonar/server/startup/RegisterNewDashboardsTest.java b/sonar-server/src/test/java/org/sonar/server/startup/RegisterNewDashboardsTest.java index d41719808d3..ae51e4b9701 100644 --- a/sonar-server/src/test/java/org/sonar/server/startup/RegisterNewDashboardsTest.java +++ b/sonar-server/src/test/java/org/sonar/server/startup/RegisterNewDashboardsTest.java @@ -22,9 +22,9 @@ package org.sonar.server.startup; import com.google.common.collect.Lists; import org.junit.Before; import org.junit.Test; -import org.sonar.api.web.dashboard.Dashboard; -import org.sonar.api.web.dashboard.DashboardLayout; -import org.sonar.api.web.dashboard.DashboardTemplate; +import org.sonar.api.web.Dashboard; +import org.sonar.api.web.DashboardLayout; +import org.sonar.api.web.DashboardTemplate; import org.sonar.persistence.dashboard.*; import org.sonar.persistence.template.LoadedTemplateDao; import org.sonar.persistence.template.LoadedTemplateDto; -- 2.39.5