From 5e5b906bd3b3f49e5080d6511067bb45c3b9f579 Mon Sep 17 00:00:00 2001
From: Evgeny Mandrikov <mandrikov@gmail.com>
Date: Mon, 17 Jan 2011 09:36:29 +0800
Subject: [PATCH] Simplify configuration of dev GWT modules

* Inherit settings from original module

* Introduce reusable module org.sonar.SonarDev
---
 .../plugins/core/clouds/GwtCloudsDev.gwt.xml     | 11 ++---------
 .../coverageviewer/CoverageViewerDev.gwt.xml     | 10 ++--------
 .../GwtDefaultSourceViewerDev.gwt.xml            | 10 ++--------
 .../DuplicationsViewerDev.gwt.xml                | 13 ++-----------
 .../plugins/core/hotspots/GwtHotspotsDev.gwt.xml | 14 ++++----------
 .../testdetailsviewer/TestsViewerDev.gwt.xml     | 15 +++------------
 .../core/ui/pageselector/PageSelectorDev.gwt.xml | 16 ++++------------
 .../violationsviewer/ViolationsViewerDev.gwt.xml | 11 ++---------
 .../ui/dependencies/DependenciesTabDev.gwt.xml   | 10 ++--------
 .../plugins/design/ui/lcom4/Lcom4TabDev.gwt.xml  | 11 +++--------
 .../design/ui/libraries/LibrariesPageDev.gwt.xml | 11 +++--------
 .../plugins/design/ui/page/DesignPageDev.gwt.xml | 11 +++--------
 .../main/resources/org/sonar/SonarDev.gwt.xml    |  5 +++++
 13 files changed, 37 insertions(+), 111 deletions(-)
 create mode 100644 sonar-gwt-api/src/main/resources/org/sonar/SonarDev.gwt.xml

diff --git a/plugins/sonar-core-gwt/src/main/resources/org/sonar/plugins/core/clouds/GwtCloudsDev.gwt.xml b/plugins/sonar-core-gwt/src/main/resources/org/sonar/plugins/core/clouds/GwtCloudsDev.gwt.xml
index a9c37479fcc..9d3f64f412a 100644
--- a/plugins/sonar-core-gwt/src/main/resources/org/sonar/plugins/core/clouds/GwtCloudsDev.gwt.xml
+++ b/plugins/sonar-core-gwt/src/main/resources/org/sonar/plugins/core/clouds/GwtCloudsDev.gwt.xml
@@ -1,13 +1,6 @@
 <module rename-to="org.sonar.plugins.core.clouds.GwtClouds">
-  <inherits name="com.google.gwt.user.User"/>
-  <inherits name="com.google.gwt.json.JSON"/>
-  <inherits name="com.google.gwt.http.HTTP"/>
-  <inherits name="org.sonar.api.web.gwt.Sonar"/>
-
-  <stylesheet src="clouds.css"/>
+  <inherits name="org.sonar.plugins.core.clouds.GwtClouds"/>
+  <inherits name="org.sonar.SonarDev"/>
 
   <entry-point class="org.sonar.plugins.core.clouds.client.GwtClouds"/>
-
-  <!-- optimization of dev environments -->
-  <set-property name="user.agent" value="gecko1_8" />
 </module>
diff --git a/plugins/sonar-core-gwt/src/main/resources/org/sonar/plugins/core/coverageviewer/CoverageViewerDev.gwt.xml b/plugins/sonar-core-gwt/src/main/resources/org/sonar/plugins/core/coverageviewer/CoverageViewerDev.gwt.xml
index 0ab28e22798..e4775a20a21 100644
--- a/plugins/sonar-core-gwt/src/main/resources/org/sonar/plugins/core/coverageviewer/CoverageViewerDev.gwt.xml
+++ b/plugins/sonar-core-gwt/src/main/resources/org/sonar/plugins/core/coverageviewer/CoverageViewerDev.gwt.xml
@@ -1,12 +1,6 @@
 <module rename-to="org.sonar.plugins.core.coverageviewer.CoverageViewer">
-  <inherits name="com.google.gwt.user.User"/>
-  <inherits name="com.google.gwt.json.JSON"/>
-  <inherits name="com.google.gwt.http.HTTP"/>
-  <inherits name="org.sonar.Sonar"/>
-  <inherits name="com.google.gwt.gen2.table.Table"/>
+  <inherits name="org.sonar.plugins.core.coverageviewer.CoverageViewer"/>
+  <inherits name="org.sonar.SonarDev"/>
 
   <entry-point class="org.sonar.plugins.core.coverageviewer.client.CoverageViewer"/>
-
-  <!-- optimization of dev environments -->
-  <set-property name="user.agent" value="gecko1_8" />
 </module>
diff --git a/plugins/sonar-core-gwt/src/main/resources/org/sonar/plugins/core/defaultsourceviewer/GwtDefaultSourceViewerDev.gwt.xml b/plugins/sonar-core-gwt/src/main/resources/org/sonar/plugins/core/defaultsourceviewer/GwtDefaultSourceViewerDev.gwt.xml
index eb23d0f5df8..42f869d4edd 100644
--- a/plugins/sonar-core-gwt/src/main/resources/org/sonar/plugins/core/defaultsourceviewer/GwtDefaultSourceViewerDev.gwt.xml
+++ b/plugins/sonar-core-gwt/src/main/resources/org/sonar/plugins/core/defaultsourceviewer/GwtDefaultSourceViewerDev.gwt.xml
@@ -1,12 +1,6 @@
 <module rename-to="org.sonar.plugins.core.defaultsourceviewer.GwtDefaultSourceViewer">
-  <inherits name="com.google.gwt.user.User"/>
-  <inherits name="com.google.gwt.json.JSON"/>
-  <inherits name="com.google.gwt.http.HTTP"/>
-  <inherits name="org.sonar.Sonar"/>
-  <inherits name="com.google.gwt.gen2.table.Table"/>
+  <inherits name="org.sonar.plugins.core.defaultsourceviewer.GwtDefaultSourceViewer"/>
+  <inherits name="org.sonar.SonarDev"/>
 
   <entry-point class="org.sonar.plugins.core.defaultsourceviewer.client.GwtDefaultSourceViewer"/>
-
-  <!-- optimization of dev environments -->
-  <set-property name="user.agent" value="gecko1_8" />
 </module>
diff --git a/plugins/sonar-core-gwt/src/main/resources/org/sonar/plugins/core/duplicationsviewer/DuplicationsViewerDev.gwt.xml b/plugins/sonar-core-gwt/src/main/resources/org/sonar/plugins/core/duplicationsviewer/DuplicationsViewerDev.gwt.xml
index a4d082aca8f..d3a0ffd3806 100644
--- a/plugins/sonar-core-gwt/src/main/resources/org/sonar/plugins/core/duplicationsviewer/DuplicationsViewerDev.gwt.xml
+++ b/plugins/sonar-core-gwt/src/main/resources/org/sonar/plugins/core/duplicationsviewer/DuplicationsViewerDev.gwt.xml
@@ -1,15 +1,6 @@
 <module rename-to="org.sonar.plugins.core.duplicationsviewer.DuplicationsViewer">
-  <inherits name="com.google.gwt.xml.XML"/>
-  <inherits name="com.google.gwt.user.User"/>
-  <inherits name="com.google.gwt.json.JSON"/>
-  <inherits name="com.google.gwt.http.HTTP"/>
-  <inherits name="org.sonar.Sonar"/>
-  <inherits name="com.google.gwt.gen2.table.Table"/>
-
-  <stylesheet src="DuplicationsViewer.css"/>
+  <inherits name="org.sonar.plugins.core.duplicationsviewer.DuplicationsViewer"/>
+  <inherits name="org.sonar.SonarDev"/>
 
   <entry-point class="org.sonar.plugins.core.duplicationsviewer.client.DuplicationsViewer"/>
-
-  <!-- optimization of dev environments -->
-  <set-property name="user.agent" value="gecko1_8" />
 </module>
diff --git a/plugins/sonar-core-gwt/src/main/resources/org/sonar/plugins/core/hotspots/GwtHotspotsDev.gwt.xml b/plugins/sonar-core-gwt/src/main/resources/org/sonar/plugins/core/hotspots/GwtHotspotsDev.gwt.xml
index de57eb5f22f..47a4c556c08 100644
--- a/plugins/sonar-core-gwt/src/main/resources/org/sonar/plugins/core/hotspots/GwtHotspotsDev.gwt.xml
+++ b/plugins/sonar-core-gwt/src/main/resources/org/sonar/plugins/core/hotspots/GwtHotspotsDev.gwt.xml
@@ -1,12 +1,6 @@
 <module rename-to="org.sonar.plugins.core.hotspots.GwtHotspots">
-  <inherits name="com.google.gwt.user.User"/>
-  <inherits name="com.google.gwt.json.JSON"/>
-  <inherits name="com.google.gwt.http.HTTP"/>
-  <inherits name="org.sonar.Sonar"/>
-  <inherits name="com.google.gwt.i18n.I18N"/>
-  <stylesheet src="hotspots.css"/>
-  <entry-point class="org.sonar.plugins.core.hotspots.client.GwtHotspots"/>
+  <inherits name="org.sonar.plugins.core.hotspots.GwtHotspots"/>
+  <inherits name="org.sonar.SonarDev"/>
 
-  <!-- optimization of dev environments -->
-  <set-property name="user.agent" value="gecko1_8" />
-</module>
\ No newline at end of file
+  <entry-point class="org.sonar.plugins.core.hotspots.client.GwtHotspots"/>
+</module>
diff --git a/plugins/sonar-core-gwt/src/main/resources/org/sonar/plugins/core/testdetailsviewer/TestsViewerDev.gwt.xml b/plugins/sonar-core-gwt/src/main/resources/org/sonar/plugins/core/testdetailsviewer/TestsViewerDev.gwt.xml
index c44229ca597..8f8f3d80b0c 100644
--- a/plugins/sonar-core-gwt/src/main/resources/org/sonar/plugins/core/testdetailsviewer/TestsViewerDev.gwt.xml
+++ b/plugins/sonar-core-gwt/src/main/resources/org/sonar/plugins/core/testdetailsviewer/TestsViewerDev.gwt.xml
@@ -1,15 +1,6 @@
 <module rename-to="org.sonar.plugins.core.testdetailsviewer.TestsViewer">
-  <inherits name="com.google.gwt.xml.XML"/>
-  <inherits name="com.google.gwt.user.User"/>
-  <inherits name="com.google.gwt.json.JSON"/>
-  <inherits name="com.google.gwt.http.HTTP"/>
-  <inherits name="org.sonar.Sonar"/>
-  <inherits name="com.google.gwt.gen2.table.Table"/>
-
-  <stylesheet src="TestsViewer.css"/>
+  <inherits name="org.sonar.plugins.core.testdetailsviewer.TestsViewer"/>
+  <inherits name="org.sonar.SonarDev"/>
 
   <entry-point class="org.sonar.plugins.core.testdetailsviewer.client.TestsViewer"/>
-
-  <!-- optimization of dev environments -->
-  <set-property name="user.agent" value="gecko1_8" />
-</module>
\ No newline at end of file
+</module>
diff --git a/plugins/sonar-core-gwt/src/main/resources/org/sonar/plugins/core/ui/pageselector/PageSelectorDev.gwt.xml b/plugins/sonar-core-gwt/src/main/resources/org/sonar/plugins/core/ui/pageselector/PageSelectorDev.gwt.xml
index b1c8bc295f8..b624f2e73aa 100644
--- a/plugins/sonar-core-gwt/src/main/resources/org/sonar/plugins/core/ui/pageselector/PageSelectorDev.gwt.xml
+++ b/plugins/sonar-core-gwt/src/main/resources/org/sonar/plugins/core/ui/pageselector/PageSelectorDev.gwt.xml
@@ -1,14 +1,6 @@
 <module rename-to="org.sonar.plugins.core.ui.pageselector.PageSelector">
-  <inherits name="com.google.gwt.user.User"/>
-  <inherits name="com.google.gwt.json.JSON"/>
-  <inherits name="com.google.gwt.http.HTTP"/>
-  <inherits name="com.google.gwt.i18n.I18N"/> 
-  <inherits name="org.sonar.api.web.gwt.Sonar"/>
-  <inherits name="org.sonar.Sonar"/>
-  <stylesheet src="pageselector.css" />
-  
-  <entry-point class="org.sonar.plugins.core.ui.pageselector.client.PageSelector"/>
+  <inherits name="org.sonar.plugins.core.ui.pageselector.PageSelector"/>
+  <inherits name="org.sonar.SonarDev"/>
 
-  <!-- optimization of dev environments -->
-  <set-property name="user.agent" value="gecko1_8" />
-</module>
\ No newline at end of file
+  <entry-point class="org.sonar.plugins.core.ui.pageselector.client.PageSelector"/>
+</module>
diff --git a/plugins/sonar-core-gwt/src/main/resources/org/sonar/plugins/core/violationsviewer/ViolationsViewerDev.gwt.xml b/plugins/sonar-core-gwt/src/main/resources/org/sonar/plugins/core/violationsviewer/ViolationsViewerDev.gwt.xml
index e628eae9114..955baeabd73 100644
--- a/plugins/sonar-core-gwt/src/main/resources/org/sonar/plugins/core/violationsviewer/ViolationsViewerDev.gwt.xml
+++ b/plugins/sonar-core-gwt/src/main/resources/org/sonar/plugins/core/violationsviewer/ViolationsViewerDev.gwt.xml
@@ -1,13 +1,6 @@
 <module rename-to="org.sonar.plugins.core.violationsviewer.ViolationsViewer">
-  <inherits name="com.google.gwt.user.User"/>
-  <inherits name="com.google.gwt.json.JSON"/>
-  <inherits name="com.google.gwt.http.HTTP"/>
-  <inherits name="org.sonar.Sonar"/>
-  <inherits name="com.google.gwt.gen2.table.Table"/>
-  <inherits name="com.google.gwt.i18n.I18N"/>
+  <inherits name="org.sonar.plugins.core.violationsviewer.ViolationsViewer"/>
+  <inherits name="org.sonar.SonarDev"/>
 
   <entry-point class="org.sonar.plugins.core.violationsviewer.client.ViolationsViewer"/>
-
-  <!-- optimization of dev environments -->
-  <set-property name="user.agent" value="gecko1_8" />
 </module>
diff --git a/plugins/sonar-design-plugin/src/main/resources/org/sonar/plugins/design/ui/dependencies/DependenciesTabDev.gwt.xml b/plugins/sonar-design-plugin/src/main/resources/org/sonar/plugins/design/ui/dependencies/DependenciesTabDev.gwt.xml
index 2d99592a078..44bf5bf0788 100644
--- a/plugins/sonar-design-plugin/src/main/resources/org/sonar/plugins/design/ui/dependencies/DependenciesTabDev.gwt.xml
+++ b/plugins/sonar-design-plugin/src/main/resources/org/sonar/plugins/design/ui/dependencies/DependenciesTabDev.gwt.xml
@@ -1,12 +1,6 @@
 <module rename-to="org.sonar.plugins.design.ui.dependencies.DependenciesTab">
-  <inherits name="com.google.gwt.user.User"/>
-  <inherits name="com.google.gwt.json.JSON"/>
-  <inherits name="com.google.gwt.http.HTTP"/>
-  <inherits name="org.sonar.Sonar"/>
+  <inherits name="org.sonar.plugins.design.ui.dependencies.DependenciesTab"/>
+  <inherits name="org.sonar.SonarDev"/>
 
-  <stylesheet src='dependencies-tab.css'/>
   <entry-point class="org.sonar.plugins.design.ui.dependencies.client.DependenciesTab"/>
-
-  <!-- optimization of dev environments -->
-  <set-property name="user.agent" value="gecko1_8" />
 </module>
diff --git a/plugins/sonar-design-plugin/src/main/resources/org/sonar/plugins/design/ui/lcom4/Lcom4TabDev.gwt.xml b/plugins/sonar-design-plugin/src/main/resources/org/sonar/plugins/design/ui/lcom4/Lcom4TabDev.gwt.xml
index f89e89f04a0..c4f98f07a4c 100644
--- a/plugins/sonar-design-plugin/src/main/resources/org/sonar/plugins/design/ui/lcom4/Lcom4TabDev.gwt.xml
+++ b/plugins/sonar-design-plugin/src/main/resources/org/sonar/plugins/design/ui/lcom4/Lcom4TabDev.gwt.xml
@@ -1,11 +1,6 @@
 <module rename-to="org.sonar.plugins.design.ui.lcom4.Lcom4Tab">
-  <inherits name="com.google.gwt.user.User"/>
-  <inherits name="com.google.gwt.json.JSON"/>
-  <inherits name="com.google.gwt.http.HTTP"/>
-  <inherits name="org.sonar.Sonar"/>
-  <stylesheet src="lcom4.css"/>
-  <entry-point class="org.sonar.plugins.design.ui.lcom4.client.Lcom4Tab"/>
+  <inherits name="org.sonar.plugins.design.ui.lcom4.Lcom4Tab"/>
+  <inherits name="org.sonar.SonarDev"/>
 
-  <!-- optimization of dev environments -->
-  <set-property name="user.agent" value="gecko1_8" />
+  <entry-point class="org.sonar.plugins.design.ui.lcom4.client.Lcom4Tab"/>
 </module>
diff --git a/plugins/sonar-design-plugin/src/main/resources/org/sonar/plugins/design/ui/libraries/LibrariesPageDev.gwt.xml b/plugins/sonar-design-plugin/src/main/resources/org/sonar/plugins/design/ui/libraries/LibrariesPageDev.gwt.xml
index 5628099ea77..37f3a2f0609 100644
--- a/plugins/sonar-design-plugin/src/main/resources/org/sonar/plugins/design/ui/libraries/LibrariesPageDev.gwt.xml
+++ b/plugins/sonar-design-plugin/src/main/resources/org/sonar/plugins/design/ui/libraries/LibrariesPageDev.gwt.xml
@@ -1,11 +1,6 @@
 <module rename-to="org.sonar.plugins.design.ui.libraries.LibrariesPage">
-  <inherits name="com.google.gwt.user.User"/>
-  <inherits name="com.google.gwt.json.JSON"/>
-  <inherits name="com.google.gwt.http.HTTP"/>
-  <inherits name="org.sonar.Sonar"/>
-  <stylesheet src="libraries.css"/>
-  <entry-point class="org.sonar.plugins.design.ui.libraries.client.LibrariesPage"/>
+  <inherits name="org.sonar.plugins.design.ui.libraries.LibrariesPage"/>
+  <inherits name="org.sonar.SonarDev"/>
 
-  <!-- optimization of dev environments -->
-  <set-property name="user.agent" value="gecko1_8" />
+  <entry-point class="org.sonar.plugins.design.ui.libraries.client.LibrariesPage"/>
 </module>
diff --git a/plugins/sonar-design-plugin/src/main/resources/org/sonar/plugins/design/ui/page/DesignPageDev.gwt.xml b/plugins/sonar-design-plugin/src/main/resources/org/sonar/plugins/design/ui/page/DesignPageDev.gwt.xml
index 0e137c320df..0bbeccd6929 100644
--- a/plugins/sonar-design-plugin/src/main/resources/org/sonar/plugins/design/ui/page/DesignPageDev.gwt.xml
+++ b/plugins/sonar-design-plugin/src/main/resources/org/sonar/plugins/design/ui/page/DesignPageDev.gwt.xml
@@ -1,11 +1,6 @@
 <module rename-to="org.sonar.plugins.design.ui.page.DesignPage">
-  <inherits name="com.google.gwt.user.User"/>
-  <inherits name="com.google.gwt.json.JSON"/>
-  <inherits name="com.google.gwt.http.HTTP"/>
-  <inherits name="org.sonar.Sonar"/>
-  <stylesheet src="design.css"/>
-  <entry-point class="org.sonar.plugins.design.ui.page.client.DesignPage"/>
+  <inherits name="org.sonar.plugins.design.ui.page.DesignPage"/>
+  <inherits name="org.sonar.SonarDev"/>
 
-  <!-- optimization of dev environments -->
-  <set-property name="user.agent" value="gecko1_8" />
+  <entry-point class="org.sonar.plugins.design.ui.page.client.DesignPage"/>
 </module>
diff --git a/sonar-gwt-api/src/main/resources/org/sonar/SonarDev.gwt.xml b/sonar-gwt-api/src/main/resources/org/sonar/SonarDev.gwt.xml
new file mode 100644
index 00000000000..65d1c1d8faf
--- /dev/null
+++ b/sonar-gwt-api/src/main/resources/org/sonar/SonarDev.gwt.xml
@@ -0,0 +1,5 @@
+<module>
+  <!-- optimization of dev environments -->
+  <set-property name="user.agent" value="gecko1_8" />
+  <set-property name="locale" value="default"/>
+</module>
-- 
2.39.5