Skip to content

Commit fb6b7e5

Browse files
BobHansonBobHanson
authored
Merge pull request #112 from java2script/master
hansonr1 fixes
2 parents 076adf6 + 23e7e8b commit fb6b7e5

File tree

70 files changed

+15273
-686
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

+15273
-686
lines changed

‎docs/Gemfile.lock‎

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@ GEM
2525
execjs (2.7.0)
2626
faraday (0.14.0)
2727
multipart-post (>= 1.2, < 3)
28-
ffi (1.9.23)
28+
ffi (~> 1.9.24)
2929
forwardable-extended (2.6.0)
3030
gemoji (3.0.0)
3131
github-pages (180)
3232
activesupport (= 4.2.9)
3333
github-pages-health-check (= 1.4.0)
34-
jekyll (= 3.7.3)
34+
jekyll (~> 3.7.4)
3535
jekyll-avatar (= 0.5.0)
3636
jekyll-coffeescript (= 1.1.1)
3737
jekyll-commonmark-ghpages (= 0.1.5)
@@ -70,7 +70,7 @@ GEM
7070
listen (= 3.1.5)
7171
mercenary (~> 0.3)
7272
minima (= 2.4.0)
73-
nokogiri (>= 1.8.1, < 2.0)
73+
nokogiri (>= 1.8.5, < 2.0)
7474
rouge (= 2.2.1)
7575
terminal-table (~> 1.4)
7676
github-pages-health-check (1.4.0)
@@ -81,11 +81,11 @@ GEM
8181
typhoeus (~> 1.3)
8282
html-pipeline (2.7.1)
8383
activesupport (>= 2)
84-
nokogiri (>= 1.4)
84+
nokogiri (>= 1.8.5)
8585
http_parser.rb (0.6.0)
8686
i18n (0.9.5)
8787
concurrent-ruby (~> 1.0)
88-
jekyll (3.7.3)
88+
jekyll (~> 3.7.4)
8989
addressable (~> 2.4)
9090
colorator (~> 1.0)
9191
em-websocket (~> 0.5)
@@ -99,99 +99,99 @@ GEM
9999
rouge (>= 1.7, < 4)
100100
safe_yaml (~> 1.0)
101101
jekyll-avatar (0.5.0)
102-
jekyll (~> 3.0)
102+
jekyll (~> 3.7.4)
103103
jekyll-coffeescript (1.1.1)
104104
coffee-script (~> 2.2)
105105
coffee-script-source (~> 1.11.1)
106106
jekyll-commonmark (1.2.0)
107107
commonmarker (~> 0.14)
108-
jekyll (>= 3.0, < 4.0)
108+
jekyll (~> 3.7.4)
109109
jekyll-commonmark-ghpages (0.1.5)
110110
commonmarker (~> 0.17.6)
111111
jekyll-commonmark (~> 1)
112112
rouge (~> 2)
113113
jekyll-default-layout (0.1.4)
114-
jekyll (~> 3.0)
114+
jekyll (~> 3.7.4)
115115
jekyll-feed (0.9.3)
116-
jekyll (~> 3.3)
116+
jekyll (~> 3.7.4)
117117
jekyll-gist (1.5.0)
118118
octokit (~> 4.2)
119119
jekyll-github-metadata (2.9.4)
120-
jekyll (~> 3.1)
120+
jekyll (~> 3.7.4)
121121
octokit (~> 4.0, != 4.4.0)
122122
jekyll-mentions (1.3.0)
123123
activesupport (~> 4.0)
124124
html-pipeline (~> 2.3)
125-
jekyll (~> 3.0)
125+
jekyll (~> 3.7.4)
126126
jekyll-optional-front-matter (0.3.0)
127-
jekyll (~> 3.0)
127+
jekyll (~> 3.7.4)
128128
jekyll-paginate (1.1.0)
129129
jekyll-readme-index (0.2.0)
130-
jekyll (~> 3.0)
130+
jekyll (~> 3.7.4)
131131
jekyll-redirect-from (0.13.0)
132-
jekyll (~> 3.3)
132+
jekyll (~> 3.7.4)
133133
jekyll-relative-links (0.5.3)
134-
jekyll (~> 3.3)
134+
jekyll (~> 3.7.4)
135135
jekyll-remote-theme (0.2.3)
136-
jekyll (~> 3.5)
136+
jekyll (~> 3.7.4)
137137
rubyzip (>= 1.2.1, < 3.0)
138138
typhoeus (>= 0.7, < 2.0)
139139
jekyll-sass-converter (1.5.2)
140140
sass (~> 3.4)
141141
jekyll-seo-tag (2.4.0)
142-
jekyll (~> 3.3)
142+
jekyll (~> 3.7.4)
143143
jekyll-sitemap (1.2.0)
144-
jekyll (~> 3.3)
144+
jekyll (~> 3.7.4)
145145
jekyll-swiss (0.4.0)
146146
jekyll-theme-architect (0.1.0)
147-
jekyll (~> 3.5)
147+
jekyll (~> 3.7.4)
148148
jekyll-seo-tag (~> 2.0)
149149
jekyll-theme-cayman (0.1.0)
150-
jekyll (~> 3.5)
150+
jekyll (~> 3.7.4)
151151
jekyll-seo-tag (~> 2.0)
152152
jekyll-theme-dinky (0.1.0)
153-
jekyll (~> 3.5)
153+
jekyll (~> 3.7.4)
154154
jekyll-seo-tag (~> 2.0)
155155
jekyll-theme-hacker (0.1.0)
156-
jekyll (~> 3.5)
156+
jekyll (~> 3.7.4)
157157
jekyll-seo-tag (~> 2.0)
158158
jekyll-theme-leap-day (0.1.0)
159-
jekyll (~> 3.5)
159+
jekyll (~> 3.7.4)
160160
jekyll-seo-tag (~> 2.0)
161161
jekyll-theme-merlot (0.1.0)
162-
jekyll (~> 3.5)
162+
jekyll (~> 3.7.4)
163163
jekyll-seo-tag (~> 2.0)
164164
jekyll-theme-midnight (0.1.0)
165-
jekyll (~> 3.5)
165+
jekyll (~> 3.7.4)
166166
jekyll-seo-tag (~> 2.0)
167167
jekyll-theme-minimal (0.1.0)
168-
jekyll (~> 3.5)
168+
jekyll (~> 3.7.4)
169169
jekyll-seo-tag (~> 2.0)
170170
jekyll-theme-modernist (0.1.0)
171-
jekyll (~> 3.5)
171+
jekyll (~> 3.7.4)
172172
jekyll-seo-tag (~> 2.0)
173173
jekyll-theme-primer (0.5.2)
174-
jekyll (~> 3.5)
174+
jekyll (~> 3.7.4)
175175
jekyll-github-metadata (~> 2.9)
176176
jekyll-seo-tag (~> 2.2)
177177
jekyll-theme-slate (0.1.0)
178-
jekyll (~> 3.5)
178+
jekyll (~> 3.7.4)
179179
jekyll-seo-tag (~> 2.0)
180180
jekyll-theme-tactile (0.1.0)
181-
jekyll (~> 3.5)
181+
jekyll (~> 3.7.4)
182182
jekyll-seo-tag (~> 2.0)
183183
jekyll-theme-time-machine (0.1.0)
184-
jekyll (~> 3.5)
184+
jekyll (~> 3.7.4)
185185
jekyll-seo-tag (~> 2.0)
186186
jekyll-titles-from-headings (0.5.1)
187-
jekyll (~> 3.3)
187+
jekyll (~> 3.7.4)
188188
jekyll-watch (2.0.0)
189189
listen (~> 3.0)
190190
jemoji (0.9.0)
191191
activesupport (~> 4.0, >= 4.2.9)
192192
gemoji (~> 3.0)
193193
html-pipeline (~> 2.2)
194-
jekyll (~> 3.0)
194+
jekyll (~> 3.7.4)
195195
kramdown (1.16.2)
196196
liquid (4.0.0)
197197
listen (3.1.5)
@@ -201,13 +201,13 @@ GEM
201201
mercenary (0.3.6)
202202
mini_portile2 (2.3.0)
203203
minima (2.4.0)
204-
jekyll (~> 3.5)
204+
jekyll (~> 3.7.4)
205205
jekyll-feed (~> 0.9)
206206
jekyll-seo-tag (~> 2.1)
207207
minitest (5.11.3)
208208
multipart-post (2.0.0)
209209
net-dns (0.8.0)
210-
nokogiri (1.8.2)
210+
nokogiri (>= 1.8.5)
211211
mini_portile2 (~> 2.3.0)
212212
octokit (4.8.0)
213213
sawyer (~> 0.8.0, >= 0.5.3)
@@ -221,7 +221,7 @@ GEM
221221
ruby-enum (0.7.2)
222222
i18n
223223
ruby_dep (1.5.0)
224-
rubyzip (1.2.1)
224+
rubyzip (~> 1.2.2)
225225
safe_yaml (1.0.4)
226226
sass (3.5.6)
227227
sass-listen (~> 4.0.0)

‎docs/README‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,4 @@
1-
This directory contains the content of the Java2Script project website,
2-
implemented through GitHub Pages.
31

4-
For details on GitHub Pages see https://pages.github.com.
5-
For details on Jekyll, used by GitHub Pages, see
6-
https://jekyllrb.com and
7-
https://help.github.com/articles/using-jekyll-as-a-static-site-generator-with-github-pages
8-
2+
See https://github.com/BobHanson/java2script/tree/master/sources/net.sf.j2s.core/dist for installation instructions.
93

10-
If you want to setup site locally with Jekyll see:
11-
https://help.github.com/articles/setting-up-your-github-pages-site-locally-with-jekyll/
124

‎docs/quickstart.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@
44

55
## Installation
66

7+
see https://github.com/BobHanson/java2script/tree/master/sources/net.sf.j2s.core/dist for installation instructions.
8+
9+
The instructions given here are for a much earlier version.
10+
711
### Prerequisites
812

913
- Eclipse Neon (4.6) or higher.

‎sources/net.sf.j2s.core/dist/swingjs/SwingJS-site.zip‎

18.5 KB
Binary file not shown.

‎sources/net.sf.j2s.core/dist/swingjs/net.sf.j2s.core.jar‎

86 Bytes
Binary file not shown.

‎sources/net.sf.j2s.core/dist/swingjs/timestamp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20190907142751
1+
20190923090813

‎sources/net.sf.j2s.core/dist/swingjs/ver/3.2.4/SwingJS-site.zip‎

18.5 KB
Binary file not shown.

‎sources/net.sf.j2s.core/dist/swingjs/ver/3.2.4/net.sf.j2s.core.jar‎

86 Bytes
Binary file not shown.

‎sources/net.sf.j2s.core/dist/swingjs/ver/3.2.4/timestamp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20190907142751
1+
20190923090813

‎sources/net.sf.j2s.core/src/net/sf/j2s/core/Java2ScriptCompiler.java‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,8 @@ class Java2ScriptCompiler {
7979

8080
private IJavaProject project;
8181

82+
private boolean isDebugging;
83+
8284
static boolean isActive(IJavaProject project) {
8385
try {
8486
return new File(project.getProject().getLocation().toOSString(), J2S_OPTIONS_FILE_NAME).exists();
@@ -152,6 +154,8 @@ boolean initializeProject(IJavaProject project, boolean isCompilationParticipant
152154
siteFolder = projectFolder + "/" + siteFolder;
153155
j2sPath = siteFolder + "/swingjs/j2s";
154156

157+
if (isDebugging)
158+
System.out.println("Java2ScriptCompiler writing to " + j2sPath);
155159
// method declarations and invocations are only logged
156160
// when the designated files are deleted prior to building
157161

@@ -199,7 +203,7 @@ boolean initializeProject(IJavaProject project, boolean isCompilationParticipant
199203
if (nonqualifiedPackages.length() == 0)
200204
nonqualifiedPackages = null;
201205
// includes @j2sDebug blocks
202-
boolean isDebugging = "debug".equals(getProperty("j2s.compiler.mode"));
206+
isDebugging = "debug".equals(getProperty("j2s.compiler.mode"));
203207

204208
String classReplacements = getProperty("j2s.class.replacements");
205209

@@ -375,7 +379,10 @@ private void createJSFile(String j2sPath, String packageName, String elementName
375379
}
376380
}
377381
}
378-
writeToFile(new File(j2sPath, elementName + ".js"), js);
382+
File f = new File(j2sPath, elementName + ".js");
383+
if (isDebugging)
384+
System.out.println("Java2ScriptCompiler creating " + f);
385+
writeToFile(f, js);
379386
}
380387

381388
private String getFileContents(File file) {

0 commit comments

Comments
 (0)