Skip to content

Commit e459f15

Browse files
author
jossonsmith
committed
Pack more small *.js into some bigger *.z.js files. This will improve loading performance.
1 parent ea585ca commit e459f15

1 file changed

Lines changed: 119 additions & 55 deletions

File tree

  • sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt

‎sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/package.js‎

Lines changed: 119 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -17,61 +17,10 @@ $wt = org.eclipse.swt;
1717
"widgets"]);
1818

1919
var path = ClazzLoader.getClasspathFor ("org.eclipse.swt.*");
20-
// if (false)
21-
ClazzLoader.jarClasspath (path + "events.z.js", [
22-
"$swt.internal.SWTEventListener",
23-
"$.SWTEventObject",
24-
25-
"$wt.widgets.Event",
26-
"$.Listener",
27-
"$.TypedListener",
28-
"$.EventTable",
29-
30-
"$wt.events.TypedEvent",
31-
32-
"$.ArmEvent",
33-
"$.ControlEvent",
34-
"$.DisposeEvent",
35-
"$.FocusEvent",
36-
"$.HelpEvent",
37-
"$.KeyEvent",
38-
"$.MenuEvent",
39-
"$.ModifyEvent",
40-
"$.MouseAdapter",
41-
"$.MouseEvent",
42-
"$.PaintEvent",
43-
"$.SelectionEvent",
44-
"$.ShellEvent",
45-
"$.TraverseEvent",
46-
"$.TreeEvent",
47-
"$.VerifyEvent",
48-
49-
"$.ArmListener",
50-
"$.ControlListener",
51-
"$.ControlAdapter",
52-
"$.DisposeListener",
53-
"$.FocusListener",
54-
"$.FocusAdapter",
55-
"$.HelpListener",
56-
"$.KeyListener",
57-
"$.KeyAdapter",
58-
"$.MenuListener",
59-
"$.MenuAdapter",
60-
"$.ModifyListener",
61-
"$.MouseListener",
62-
"$.MouseMoveListener",
63-
"$.MouseTrackListener",
64-
"$.MouseTrackAdapter",
65-
"$.PaintListener",
66-
"$.SelectionListener",
67-
"$.SelectionAdapter",
68-
"$.ShellListener",
69-
"$.ShellAdapter",
70-
"$.TraverseListener",
71-
"$.TreeListener",
72-
"$.TreeAdapter",
73-
"$.VerifyListener"
74-
]);
20+
21+
// The core.z.js should already intialized
22+
ClazzLoader.loadZJar (path + "events.z.js", "org.eclipse.swt.widgets.EventTable");
23+
7524
//if (false)
7625
ClazzLoader.jarClasspath (path + "basic.z.js", [
7726
"$wt.internal.SerializableCompatibility",
@@ -112,9 +61,124 @@ $wt = org.eclipse.swt;
11261
"$wt.internal.browser.OS",
11362

11463
"$wt.graphics.Image",
64+
"$.ImageData",
11565
"$wt.widgets.Item",
11666
"$.Layout"
11767
]);
68+
var wPath = ClazzLoader.getClasspathFor ("org.eclipse.swt.widgets.*");
69+
ClazzLoader.jarClasspath (wPath + "Shell.z.js", [
70+
"$wt.widgets.Display",
71+
"$.Widget",
72+
"$.Control",
73+
"$.ScrollBar",
74+
"$.Scrollable",
75+
"$.Composite",
76+
"$.Canvas",
77+
"$.Decorations",
78+
"$.Shell"
79+
]);
80+
var w = "$wt.widgets.";
81+
ClazzLoader.jarClasspath (wPath + "Tree.z.js", [
82+
w + "TreeItem",
83+
"$.TreeColumn",
84+
"$.Tree"
85+
]);
86+
ClazzLoader.jarClasspath (wPath + "Tray.z.js", [
87+
w + "TrayItem",
88+
"$.Tray"
89+
]);
90+
ClazzLoader.jarClasspath (wPath + "ToolBar.z.js", [
91+
w + "ToolItem",
92+
"$.ToolBar"
93+
]);
94+
ClazzLoader.jarClasspath (wPath + "Table.z.js", [
95+
w + "TableItem",
96+
"$.TableColumn",
97+
"$.Table",
98+
"$wt.internal.dnd.TableColumnDND"
99+
]);
100+
ClazzLoader.jarClasspath (wPath + "SashForm.z.js", [
101+
"$wt.internal.dnd.SashDND",
102+
w + "Sash",
103+
"$wt.custom.SashFormData",
104+
"$.SashFormLayout",
105+
"$.SashForm"
106+
]);
107+
108+
var cPath = ClazzLoader.getClasspathFor ("org.eclipse.swt.custom.*");
109+
var c = "$wt.custom.";
110+
ClazzLoader.jarClasspath (cPath + "CBanner.z.js", [
111+
c + "CBannerLayout",
112+
"$.CBanner"
113+
]);
114+
ClazzLoader.jarClasspath (cPath + "CLabel.z.js", [
115+
c + "CLayoutData",
116+
"$.CLabel"
117+
]);
118+
ClazzLoader.jarClasspath (cPath + "CTabFolder.z.js", [
119+
c + "CTabFolderEvent",
120+
"$.CTabFolderListener",
121+
"$.CTabFolderAdapter",
122+
"$.CTabFolder2Listener",
123+
"$.CTabFolder2Adapter",
124+
"$.CTabFolderLayout",
125+
"$.CTabItem",
126+
"$.CTabFolder",
127+
]);
128+
ClazzLoader.jarClasspath (cPath + "ViewForm.z.js", [
129+
c + "ViewFormLayout",
130+
"$.ViewForm"
131+
]);
132+
133+
ClazzLoader.jarClasspath (wPath + "Slider.z.js", [
134+
"$wt.internal.dnd.SliderDND",
135+
w + "Slider"
136+
]);
137+
ClazzLoader.jarClasspath (wPath + "Scale.z.js", [
138+
"$wt.internal.dnd.ScaleDND",
139+
w + "Scale"
140+
]);
141+
//if (false)
142+
ClazzLoader.jarClasspath (wPath + "TabFolder.z.js", [
143+
w + "TabItem",
144+
"$.TabFolder"
145+
]);
146+
ClazzLoader.jarClasspath (wPath + "Menu.z.js", [
147+
w + "MenuItem",
148+
"$.Menu"
149+
]);
150+
ClazzLoader.jarClasspath (wPath + "CoolBar.z.js", [
151+
w + "CoolItem",
152+
"$.CoolBar"
153+
]);
154+
155+
var lPath = ClazzLoader.getClasspathFor ("org.eclipse.swt.layout.*");
156+
var l = "$wt.layout.";
157+
ClazzLoader.jarClasspath (lPath + "GridLayout.z.js", [
158+
l + "GridData",
159+
"$.GridLayout"
160+
]);
161+
ClazzLoader.jarClasspath (lPath + "FillLayout.z.js", [
162+
l + "FillData",
163+
"$.FillLayout"
164+
]);
165+
ClazzLoader.jarClasspath (lPath + "RowLayout.z.js", [
166+
l + "RowData",
167+
"$.RowLayout"
168+
]);
169+
ClazzLoader.jarClasspath (lPath + "FormLayout.z.js", [
170+
l + "FormAttachment",
171+
"$.FormData",
172+
"$.FormLayout"
173+
]);
174+
175+
var gPath = ClazzLoader.getClasspathFor ("org.eclipse.swt.graphics.*");
176+
var g = "$wt.graphics.";
177+
ClazzLoader.jarClasspath (gPath + "Font.z.js", [
178+
g + "FontData",
179+
"$.FontMetrics",
180+
"$.Font"
181+
]);
118182
/*
119183
ClazzLoader.jarClasspath (path + "events.js", [
120184
"java.util.AbstractList",

0 commit comments

Comments
 (0)