Skip to content
This repository was archived by the owner on Sep 26, 2020. It is now read-only.

Commit 3d6cdf9

Browse files
committed
Disentangle module dependencies, breaks (most) cyclic dependencies.
There are basically 3 types of modules: - those that provide source or super-source - those that only provide configuration (deferred-binding, linker, etc.) - those that aggregate the above The rule I followed is that non-source modules should try hard to not import sources that are not already imported by their dependencies. They use a <source path="null"/> to enforce that in some cases. Additionally, configuration-only modules that are "private" (not intended to being inherited directly by users) do not inherit any module, they just assume the aggregate module that inherits them also inherits the required dependencies and provides the sources. To split the User module, RemoteService is made standalone, and a Cookies, Random, Timer, and UI modules are introduced, along with TakesValue, HasText, AsyncCallback and RemoteServiceApi to be used in Editor, I18N, RPC and JSONP, and javax.validation respectively. The c.g.g.user.HTTPRequest module is removed, as the HTTPRequest class that it was tied to has been removed a long time ago. Editor has been split so that it doesn't depend on UI, EditorUI has been introduced for that, which UI inherits. Finally, a ValidationBase module has been added so that javax.validation can be inherited for its API, without inheriting the whole c.g.g.validation module. git fetch https://gwt.googlesource.com/gwt refs/changes/43/1243/9 && git cherry-pick FETCH_HEAD Change-Id: I18ab07b3c31902c0af7fc4b0e716906265355329
1 parent 1733819 commit 3d6cdf9

File tree

70 files changed

+481
-164
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+481
-164
lines changed
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<module>
33
<inherits name='com.google.gwt.place.Place'/>
4+
<inherits name='com.google.gwt.user.UI'/>
45

56
<source path="shared"/>
67
</module>

user/src/com/google/gwt/animation/Animation.gwt.xml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,9 @@
1818
<!-- -->
1919
<module>
2020
<inherits name="com.google.gwt.core.Core"/>
21-
<inherits name="com.google.gwt.user.UserAgent"/>
22-
23-
<!-- Include User module to inherit Timer -->
24-
<inherits name="com.google.gwt.user.User"/>
21+
<inherits name="com.google.gwt.useragent.UserAgent"/>
22+
23+
<inherits name="com.google.gwt.user.Timer"/>
2524

2625
<!-- Fallback implementation, based on a timer -->
2726
<replace-with class="com.google.gwt.animation.client.AnimationSchedulerImplTimer">

user/src/com/google/gwt/canvas/Canvas.gwt.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
the License.
1515
-->
1616
<module>
17-
<inherits name="com.google.gwt.user.User"/>
17+
<inherits name="com.google.gwt.user.UI"/>
1818
<inherits name="com.google.gwt.canvas.dom.DOM"/>
1919

2020
<!-- Define the support property -->

user/src/com/google/gwt/cell/Cell.gwt.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
<inherits name="com.google.gwt.dom.DOM"/>
1818
<inherits name="com.google.gwt.safehtml.SafeHtml"/>
1919
<inherits name="com.google.gwt.text.Text"/>
20+
<inherits name="com.google.gwt.user.UI"/>
21+
<inherits name="com.google.gwt.user.datepicker.DatePicker"/>
2022

2123
<inherits name="com.google.gwt.cell.TextButtonCell"/>
2224

user/src/com/google/gwt/cell/TextButtonCell.gwt.xml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,7 @@
1414
the License.
1515
-->
1616
<module>
17-
<inherits name="com.google.gwt.dom.DOM"/>
18-
<inherits name="com.google.gwt.safehtml.SafeHtml"/>
19-
<inherits name="com.google.gwt.text.Text"/>
20-
2117
<replace-with class="com.google.gwt.cell.client.TextButtonCell.DefaultAppearance">
2218
<when-type-is class="com.google.gwt.cell.client.TextButtonCell.Appearance" />
2319
</replace-with>
24-
25-
<source path="client"/>
2620
</module>

user/src/com/google/gwt/dom/DOM.gwt.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@
1919
<module>
2020
<inherits name="com.google.gwt.core.Core"/>
2121
<inherits name="com.google.gwt.safehtml.SafeHtml"/>
22-
<inherits name="com.google.gwt.user.UserAgent"/>
22+
<inherits name="com.google.gwt.useragent.UserAgent"/>
23+
<inherits name="com.google.gwt.canvas.dom.DOM"/>
24+
<inherits name="com.google.gwt.media.dom.DOM"/>
2325

2426
<replace-with class="com.google.gwt.dom.client.DOMImplOpera">
2527
<when-type-is class="com.google.gwt.dom.client.DOMImpl"/>

user/src/com/google/gwt/dom/builder/DomBuilder.gwt.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
<inherits name="com.google.gwt.core.Core"/>
2121
<inherits name="com.google.gwt.dom.DOM"/>
2222
<inherits name="com.google.gwt.safehtml.SafeHtml"/>
23+
<inherits name="com.google.gwt.safecss.SafeCss"/>
2324

2425
<!-- Default to string concatenation with inner HTML. -->
2526
<!-- TODO(jlabanca): Research performance using different methods. -->

user/src/com/google/gwt/editor/Editor.gwt.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@
1414
<!-- Editor framework support -->
1515
<module>
1616
<inherits name="com.google.gwt.core.Core" />
17-
<inherits name="com.google.gwt.validation.Validation" />
17+
<inherits name="com.google.gwt.event.EventBase" />
18+
<inherits name="com.google.gwt.user.TakesValue" />
19+
<inherits name="javax.validation.Validation" />
1820

19-
<source path="client"/>
20-
<source path="shared"/>
21-
<source path="ui/client"/>
21+
<source path="client" skips="adapters/HasDataEditor.java"/>
2222

2323
<generate-with class="com.google.gwt.editor.rebind.SimpleBeanEditorDriverGenerator">
2424
<when-type-assignable class="com.google.gwt.editor.client.SimpleBeanEditorDriver" />
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<?xml version="1.0" ?>
2+
<!--
3+
Copyright 2010 Google Inc. Licensed under the Apache License, Version 2.0
4+
(the "License"); you may not use this file except in compliance with the
5+
License. You may obtain a copy of the License at
6+
7+
http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law
8+
or agreed to in writing, software distributed under the License is
9+
distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
10+
KIND, either express or implied. See the License for the specific language
11+
governing permissions and limitations under the License.
12+
-->
13+
14+
<!-- Editor framework support -->
15+
<module>
16+
<inherits name="com.google.gwt.editor.Editor" />
17+
<inherits name="com.google.gwt.editor.HasDataEditor" />
18+
<inherits name="com.google.gwt.user.UI" />
19+
20+
<source path="ui/client"/>
21+
</module>
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<?xml version="1.0" ?>
2+
<!--
3+
Copyright 2010 Google Inc. Licensed under the Apache License, Version 2.0
4+
(the "License"); you may not use this file except in compliance with the
5+
License. You may obtain a copy of the License at
6+
7+
http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law
8+
or agreed to in writing, software distributed under the License is
9+
distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
10+
KIND, either express or implied. See the License for the specific language
11+
governing permissions and limitations under the License.
12+
-->
13+
14+
<!-- Editor framework support -->
15+
<module>
16+
<inherits name="com.google.gwt.editor.Editor" />
17+
<inherits name="com.google.gwt.view.View" />
18+
19+
<source path="client" includes="adapters/HasDataEditor.java"/>
20+
</module>

0 commit comments

Comments
 (0)