Fix some quality flaws

diff --git a/server/sonar-server/src/main/java/org/sonar/server/ui/ws/ComponentNavigationAction.java b/server/sonar-server/src/main/java/org/sonar/server/ui/ws/ComponentNavigationAction.java
index 9847442329f0630bab8df7c2ebc0dd4969ae3897..a4f7debdffa250a321be3e5fb68d5d6b7b5904ea 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/ui/ws/ComponentNavigationAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/ui/ws/ComponentNavigationAction.java
@@ -49,7 +49,6 @@ import org.sonar.db.dashboard.ActiveDashboardDao;
 import org.sonar.db.dashboard.DashboardDto;
 import org.sonar.db.property.PropertyDto;
 import org.sonar.db.property.PropertyQuery;
-import org.sonar.server.activity.ws.ActivitiesWs;
 import org.sonar.server.component.ComponentFinder;
 import org.sonar.server.computation.ws.ActivityWsAction;
 import org.sonar.server.ui.ViewProxy;
@@ -178,7 +177,7 @@ public class ComponentNavigationAction implements NavigationWsAction {
     json.endArray();
   }
 
-  private String getPageUrl(ViewProxy<Page> page, ComponentDto component) {
+  private static String getPageUrl(ViewProxy<Page> page, ComponentDto component) {
     String result;
     String componentKey = encodeComponentKey(component);
     if (page.isController()) {

diff --git a/server/sonar-server/src/main/java/org/sonar/server/ui/ws/GlobalNavigationAction.java b/server/sonar-server/src/main/java/org/sonar/server/ui/ws/GlobalNavigationAction.java
index 748d4bd18d8962d119ad30b70fca8694b0d01d9c..5e50dd7ef8d31bcf09e78a513b44639ae51b1049 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/ui/ws/GlobalNavigationAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/ui/ws/GlobalNavigationAction.java
@@ -78,7 +78,7 @@ public class GlobalNavigationAction implements NavigationWsAction {
     json.endObject().close();
   }
 
-  private void writeDashboards(JsonWriter json, List<DashboardDto> dashboards) {
+  private static void writeDashboards(JsonWriter json, List<DashboardDto> dashboards) {
     json.name("globalDashboards").beginArray();
     for (DashboardDto dashboard : dashboards) {
       json.beginObject()

diff --git a/server/sonar-server/src/main/java/org/sonar/server/ui/ws/SettingsNavigationAction.java b/server/sonar-server/src/main/java/org/sonar/server/ui/ws/SettingsNavigationAction.java
index bba8ce6de5823a9bbc509f1aa7beb9d2c7dad591..d2daca17dc79a2a4b364042e9fc44853b67da60d 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/ui/ws/SettingsNavigationAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/ui/ws/SettingsNavigationAction.java
@@ -83,7 +83,7 @@ public class SettingsNavigationAction implements NavigationWsAction {
     json.endObject().close();
   }
 
-  private String getPageUrl(ViewProxy<Page> page) {
+  private static String getPageUrl(ViewProxy<Page> page) {
     return page.isController() ? page.getId() : String.format("/plugins/configuration/%s", page.getId());
   }
 }