From 02627267d8d12b75b8df1ef0e744b47889b38c93 Mon Sep 17 00:00:00 2001 From: Simon Brandhof Date: Tue, 27 Mar 2012 14:54:50 +0200 Subject: SONAR-3323 rename @RequiredMeasures attributes to allOf and anyOf --- .../org/sonar/plugins/design/ui/dependencies/GwtDependenciesTab.java | 5 +++-- .../java/org/sonar/plugins/design/ui/libraries/GwtLibrariesPage.java | 3 ++- .../main/java/org/sonar/plugins/design/ui/page/GwtDesignPage.java | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) (limited to 'plugins/sonar-design-plugin') diff --git a/plugins/sonar-design-plugin/src/main/java/org/sonar/plugins/design/ui/dependencies/GwtDependenciesTab.java b/plugins/sonar-design-plugin/src/main/java/org/sonar/plugins/design/ui/dependencies/GwtDependenciesTab.java index a4a20028ba4..3c479bebca6 100644 --- a/plugins/sonar-design-plugin/src/main/java/org/sonar/plugins/design/ui/dependencies/GwtDependenciesTab.java +++ b/plugins/sonar-design-plugin/src/main/java/org/sonar/plugins/design/ui/dependencies/GwtDependenciesTab.java @@ -20,6 +20,7 @@ package org.sonar.plugins.design.ui.dependencies; import org.sonar.api.measures.CoreMetrics; +import org.sonar.api.resources.Qualifiers; import org.sonar.api.resources.Resource; import org.sonar.api.web.DefaultTab; import org.sonar.api.web.GwtPage; @@ -29,8 +30,8 @@ import org.sonar.api.web.ResourceQualifier; import org.sonar.api.web.UserRole; import org.sonar.plugins.design.ui.dependencies.client.DependenciesTab; -@RequiredMeasures(mandatory = {CoreMetrics.AFFERENT_COUPLINGS_KEY, CoreMetrics.EFFERENT_COUPLINGS_KEY}) -@ResourceQualifier({Resource.QUALIFIER_FILE, Resource.QUALIFIER_CLASS, Resource.QUALIFIER_PACKAGE, Resource.QUALIFIER_PROJECT, Resource.QUALIFIER_MODULE}) +@RequiredMeasures(allOf = {CoreMetrics.AFFERENT_COUPLINGS_KEY, CoreMetrics.EFFERENT_COUPLINGS_KEY}) +@ResourceQualifier({Qualifiers.FILE, Qualifiers.CLASS, Qualifiers.PACKAGE, Qualifiers.PROJECT, Qualifiers.MODULE}) @DefaultTab(metrics = {CoreMetrics.AFFERENT_COUPLINGS_KEY, CoreMetrics.EFFERENT_COUPLINGS_KEY}) @NavigationSection({NavigationSection.RESOURCE_TAB}) @UserRole(UserRole.USER) diff --git a/plugins/sonar-design-plugin/src/main/java/org/sonar/plugins/design/ui/libraries/GwtLibrariesPage.java b/plugins/sonar-design-plugin/src/main/java/org/sonar/plugins/design/ui/libraries/GwtLibrariesPage.java index b117dad6858..827160a3cb4 100644 --- a/plugins/sonar-design-plugin/src/main/java/org/sonar/plugins/design/ui/libraries/GwtLibrariesPage.java +++ b/plugins/sonar-design-plugin/src/main/java/org/sonar/plugins/design/ui/libraries/GwtLibrariesPage.java @@ -19,6 +19,7 @@ */ package org.sonar.plugins.design.ui.libraries; +import org.sonar.api.resources.Qualifiers; import org.sonar.api.resources.Resource; import org.sonar.api.web.GwtPage; import org.sonar.api.web.NavigationSection; @@ -26,7 +27,7 @@ import org.sonar.api.web.ResourceQualifier; import org.sonar.api.web.UserRole; import org.sonar.plugins.design.ui.libraries.client.LibrariesPage; -@ResourceQualifier({Resource.QUALIFIER_PROJECT, Resource.QUALIFIER_MODULE}) +@ResourceQualifier({Qualifiers.PROJECT, Qualifiers.MODULE}) @NavigationSection(NavigationSection.RESOURCE) @UserRole(UserRole.USER) public class GwtLibrariesPage extends GwtPage { diff --git a/plugins/sonar-design-plugin/src/main/java/org/sonar/plugins/design/ui/page/GwtDesignPage.java b/plugins/sonar-design-plugin/src/main/java/org/sonar/plugins/design/ui/page/GwtDesignPage.java index 602dd93720b..f1c4188110a 100644 --- a/plugins/sonar-design-plugin/src/main/java/org/sonar/plugins/design/ui/page/GwtDesignPage.java +++ b/plugins/sonar-design-plugin/src/main/java/org/sonar/plugins/design/ui/page/GwtDesignPage.java @@ -29,7 +29,7 @@ import org.sonar.api.web.ResourceQualifier; import org.sonar.api.web.UserRole; import org.sonar.plugins.design.ui.page.client.DesignPage; -@RequiredMeasures(mandatory = {CoreMetrics.DEPENDENCY_MATRIX_KEY}) +@RequiredMeasures(allOf = {CoreMetrics.DEPENDENCY_MATRIX_KEY}) @ResourceQualifier({Qualifiers.PROJECT, Qualifiers.MODULE, Qualifiers.PACKAGE, Qualifiers.DIRECTORY}) @DefaultTab(metrics = { CoreMetrics.DEPENDENCY_MATRIX_KEY, CoreMetrics.PACKAGE_FEEDBACK_EDGES_KEY, CoreMetrics.PACKAGE_CYCLES_KEY, -- cgit v1.2.3