Skip to content

Commit 7169fc2

Browse files
committed
Fixed each GMD Addins module - inheritance issue on GMD
1 parent 6d96301 commit 7169fc2

File tree

5 files changed

+19
-7
lines changed

5 files changed

+19
-7
lines changed

src/main/resources/gwt/material/design/addins/GwtMaterialAddins.gwt.xml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,10 @@
2222
<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.7.0//EN"
2323
"http://gwtproject.org/doctype/2.7.0/gwt-module.dtd">
2424
<module rename-to='GwtMaterialAddins'>
25-
<inherits name="gwt.material.design.GwtMaterialDesign"/>
2625
<inherits name="gwt.material.design.addins.GwtMaterialAddinsBase"/>
26+
<inherits name='gwt.material.design.GwtMaterialDesignBasic'/>
27+
<inherits name='gwt.material.design.Resources'/>
2728

29+
<!-- Specify the app entry point class -->
30+
<entry-point class='gwt.material.design.addins.client.MaterialAddins'/>
2831
</module>

src/main/resources/gwt/material/design/addins/GwtMaterialAddinsBase.gwt.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,4 @@
3333

3434
<set-configuration-property name="CssResource.enableGss" value="true"/>
3535
<!--<set-configuration-property name="CssResource.legacy" value="true"/>-->
36-
37-
<!-- Specify the app entry point class -->
38-
<entry-point class='gwt.material.design.addins.client.MaterialAddins'/>
3936
</module>

src/main/resources/gwt/material/design/addins/GwtMaterialAddinsBasic.gwt.xml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@
2222
<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.7.0//EN"
2323
"http://gwtproject.org/doctype/2.7.0/gwt-module.dtd">
2424
<module rename-to='GwtMaterialAddins'>
25-
<inherits name="gwt.material.design.GwtMaterialDesignBasic"/>
2625
<inherits name="gwt.material.design.addins.GwtMaterialAddinsBase"/>
26+
<inherits name="gwt.material.design.GwtMaterialDesignBasic"/>
27+
<inherits name='gwt.material.design.ResourcesBasic'/>
28+
29+
<!-- Specify the app entry point class -->
30+
<entry-point class='gwt.material.design.addins.client.MaterialAddins'/>
2731
</module>

src/main/resources/gwt/material/design/addins/GwtMaterialAddinsBasicDebug.gwt.xml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,10 @@
2626
<when-type-is class="gwt.material.design.addins.client.StartupState"/>
2727
</replace-with>
2828

29-
<inherits name="gwt.material.design.GwtMaterialDesignBasicDebug"/>
3029
<inherits name="gwt.material.design.addins.GwtMaterialAddinsBase"/>
30+
<inherits name="gwt.material.design.GwtMaterialDesignBasicDebug"/>
31+
<inherits name='gwt.material.design.ResourcesBasic'/>
32+
33+
<!-- Specify the app entry point class -->
34+
<entry-point class='gwt.material.design.addins.client.MaterialAddins'/>
3135
</module>

src/main/resources/gwt/material/design/addins/GwtMaterialAddinsDebug.gwt.xml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,10 @@
2626
<when-type-is class="gwt.material.design.addins.client.StartupState"/>
2727
</replace-with>
2828

29-
<inherits name="gwt.material.design.GwtMaterialDesignDebug"/>
3029
<inherits name="gwt.material.design.addins.GwtMaterialAddinsBase"/>
30+
<inherits name='gwt.material.design.GwtMaterialDesignBasicDebug'/>
31+
<inherits name='gwt.material.design.Resources'/>
32+
33+
<!-- Specify the app entry point class -->
34+
<entry-point class='gwt.material.design.addins.client.MaterialAddins'/>
3135
</module>

0 commit comments

Comments
 (0)