Skip to content

Commit c823013

Browse files
diederikddiederikd
committedJul 6, 2018
JavaFx problem with Inspector fixed
·
20180706165159-c823013
1 parent f99c388 commit c823013

File tree

31 files changed

+1803
-321
lines changed

31 files changed

+1803
-321
lines changed
 

‎.mps/workspace.xml

+905-283
Large diffs are not rendered by default.

‎.travis.yml

+3
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ jdk:
44
before_install: wget https://download-cf.jetbrains.com/mps/2018.1/MPS-2018.1.zip
55
install: unzip MPS-2018.1.zip
66
script: ant -Dmps_home=./MPS\ 2018.1
7+
before_deploy:
8+
# Set up git user name and tag this commit
9+
- git tag "$(date +'%Y%m%d%H%M%S')-$(git log --format=%h -1)"
710
deploy:
811
provider: releases
912
api_key:

‎build/artifacts/ProjectBrowserPlugin/ProjectBrowserPlugin.zip

-13 Bytes
Binary file not shown.

‎build/tmp/ProjectBrowserPlugin/default/ProjectBrowserPlugin.zip/ProjectBrowserPlugin/META-INF/plugin.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
<idea-plugin>
33
<id>ProjectBrowserPlugin</id>
44
<name>ProjectBrowserPlugin</name>
5-
<version>2017.3</version>
5+
<version>2018.1</version>
6+
<vendor url="www.dulfer.info">dulfer.info</vendor>
67
<depends>jetbrains.mps.core</depends>
78
<depends>jetbrains.jetpad</depends>
89
<depends>jetbrains.mps.build</depends>

‎solutions/BrowserPlugin/MPSBrowserPlugin.msd

+2
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
<dependency reexport="false">742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)</dependency>
1313
<dependency reexport="false">c6a53bd0-9627-4db5-b62a-dbc3d020d641(URL)</dependency>
1414
<dependency reexport="false">00f97843-2682-489d-926d-5f451b5582a4(JavaFxBrowser)</dependency>
15+
<dependency reexport="false">422c2909-59d6-41a9-b318-40e6256b250f(jetbrains.mps.ide.build)</dependency>
1516
</dependencies>
1617
<languageVersions>
1718
<language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="6" />
@@ -39,6 +40,7 @@
3940
<module reference="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" version="0" />
4041
<module reference="ada0a25c-94c6-46b2-be8d-bf541ae59769(MPSBrowserPlugin)" version="0" />
4142
<module reference="c6a53bd0-9627-4db5-b62a-dbc3d020d641(URL)" version="0" />
43+
<module reference="422c2909-59d6-41a9-b318-40e6256b250f(jetbrains.mps.ide.build)" version="0" />
4244
<module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
4345
</dependencyVersions>
4446
</solution>

‎solutions/BrowserPlugin/classes_gen/MPSBrowserPlugin/plugin/BrowserTool_Tool$1.class

-56 Bytes
Binary file not shown.

‎solutions/BrowserPlugin/classes_gen/MPSBrowserPlugin/plugin/trace.info

+104-7
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,15 @@
88
<concept fqn="c:f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123165:jetbrains.mps.baseLanguage.structure.InstanceMethodDeclaration" />
99
<concept fqn="c:f3061a53-9226-4cc5-a443-f952ceaf5816/1068581242864:jetbrains.mps.baseLanguage.structure.LocalVariableDeclarationStatement" />
1010
<concept fqn="c:f3061a53-9226-4cc5-a443-f952ceaf5816/1068581242878:jetbrains.mps.baseLanguage.structure.ReturnStatement" />
11+
<concept fqn="c:f3061a53-9226-4cc5-a443-f952ceaf5816/6329021646629104954:jetbrains.mps.baseLanguage.structure.SingleLineComment" />
1112
<concept fqn="c:f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123157:jetbrains.mps.baseLanguage.structure.Statement" />
1213
<concept fqn="c:f3061a53-9226-4cc5-a443-f952ceaf5816/1070462154015:jetbrains.mps.baseLanguage.structure.StaticFieldDeclaration" />
1314
<concept fqn="c:f3061a53-9226-4cc5-a443-f952ceaf5816/1070475587102:jetbrains.mps.baseLanguage.structure.SuperConstructorInvocation" />
15+
<concept fqn="c:f3061a53-9226-4cc5-a443-f952ceaf5816/1164879751025:jetbrains.mps.baseLanguage.structure.TryCatchStatement" />
1416
<root nodeRef="r:fd652edb-4d2c-4ed6-a2a0-5da9b575e791(MPSBrowserPlugin.plugin)/1569872169207638341">
1517
<file name="MPSBrowserPlugin.java">
16-
<node id="1569872169207786028" at="9,0,10,0" concept="9" trace="project" />
17-
<node id="1569872169207785412" at="10,0,11,0" concept="9" trace="browsertool" />
18+
<node id="1569872169207786028" at="9,0,10,0" concept="10" trace="project" />
19+
<node id="1569872169207785412" at="10,0,11,0" concept="10" trace="browsertool" />
1820
<node id="1569872169207743586" at="14,70,15,25" concept="1" />
1921
<node id="1569872169207771370" at="15,25,16,23" concept="1" />
2022
<node id="1569872169207777660" at="18,31,19,26" concept="1" />
@@ -35,25 +37,120 @@
3537
<unit id="1569872169207638341" at="8,0,22,0" name="MPSBrowserPlugin.plugin.MPSBrowserPlugin" />
3638
</file>
3739
</root>
40+
<root nodeRef="r:fd652edb-4d2c-4ed6-a2a0-5da9b575e791(MPSBrowserPlugin.plugin)/2671382829206290196">
41+
<file name="SwingMPSFXWebView.java">
42+
<node id="2671382829206290222" at="17,0,18,0" concept="2" trace="browser" />
43+
<node id="2671382829206290226" at="18,0,19,0" concept="2" trace="jfxPanel" />
44+
<node id="2671382829206290234" at="19,0,20,0" concept="2" trace="webEngine" />
45+
<node id="2671382829206290238" at="20,0,21,0" concept="2" trace="CurrentURL" />
46+
<node id="2671382829206290262" at="22,30,23,21" concept="1" />
47+
<node id="2671382829206290245" at="25,33,26,22" concept="7" />
48+
<node id="2671382829206290253" at="28,41,29,21" concept="1" />
49+
<node id="2671382829206393851" at="34,25,35,35" concept="1" />
50+
<node id="2671382829206290284" at="39,33,40,30" concept="1" />
51+
<node id="2671382829206290288" at="40,30,41,18" concept="1" />
52+
<node id="2671382829206290290" at="41,18,42,34" concept="1" />
53+
<node id="2671382829206290293" at="42,34,43,39" concept="1" />
54+
<node id="2671382829206402958" at="48,13,49,99" concept="6" />
55+
<node id="2671382829206402970" at="50,42,51,41" concept="6" />
56+
<node id="2671382829206402976" at="51,41,52,42" concept="6" />
57+
<node id="2671382829206402982" at="52,42,53,33" concept="1" />
58+
<node id="2671382829206402988" at="53,33,54,42" concept="1" />
59+
<node id="2671382829206402993" at="54,42,55,36" concept="1" />
60+
<node id="2671382829206523142" at="71,25,72,20" concept="6" />
61+
<node id="2671382829206290365" at="72,20,73,28" concept="1" />
62+
<node id="2671382829206290369" at="73,28,74,33" concept="1" />
63+
<node id="2671382829206290416" at="74,33,75,40" concept="8" />
64+
<node id="2671382829206290372" at="75,40,76,32" concept="1" />
65+
<node id="2671382829206290376" at="76,32,77,40" concept="1" />
66+
<node id="2671382829206290380" at="77,40,78,35" concept="1" />
67+
<node id="2671382829206290384" at="78,35,79,41" concept="6" />
68+
<node id="2671382829206290387" at="79,41,80,40" concept="1" />
69+
<node id="2671382829206290393" at="80,40,81,38" concept="6" />
70+
<node id="2671382829206290418" at="81,38,82,51" concept="8" />
71+
<node id="2671382829206290420" at="82,51,83,27" concept="8" />
72+
<node id="2671382829206290397" at="83,27,84,33" concept="1" />
73+
<node id="2671382829206425252" at="88,21,89,31" concept="1" />
74+
<node id="2671382829206587102" at="22,0,25,0" concept="0" trace="SwingMPSFXWebView#()V" />
75+
<node id="2671382829206290243" at="25,0,28,0" concept="5" trace="getCurrentURL#()Ljava/lang/String;" />
76+
<node id="2671382829206290249" at="28,0,31,0" concept="5" trace="setCurrentURL#(Ljava/lang/String;)V" />
77+
<node id="2671382829206425248" at="88,0,91,0" concept="5" trace="run#()V" />
78+
<node id="2671382829206635671" at="33,0,37,0" concept="5" trace="run#()V" />
79+
<node id="2671382829206630447" at="31,22,37,7" concept="1" />
80+
<node id="2671382829206290282" at="39,0,45,0" concept="5" trace="initComponents#()V" />
81+
<node id="2671382829206402965" at="49,99,56,11" concept="4" />
82+
<node id="2671382829206290265" at="31,0,39,0" concept="5" trace="load#()V" />
83+
<node id="2671382829206402952" at="47,25,58,9" concept="12" />
84+
<node id="2671382829206651695" at="47,0,60,0" concept="5" trace="run#()V" />
85+
<node id="2671382829206642996" at="45,31,60,7" concept="1" />
86+
<node id="2671382829206676996" at="71,0,86,0" concept="5" trace="run#()V" />
87+
<node id="2671382829206290299" at="45,0,62,0" concept="5" trace="adjustHeight#()V" />
88+
<node id="2671382829206671060" at="69,30,86,7" concept="1" />
89+
<node id="2671382829206290355" at="69,0,88,0" concept="5" trace="createScene#()V" />
90+
<scope id="2671382829206402953" at="57,0,57,33">
91+
<var name="e" id="2671382829206402955" />
92+
</scope>
93+
<scope id="2671382829206402954" at="57,33,57,33" />
94+
<scope id="2671382829206587105" at="22,30,23,21" />
95+
<scope id="2671382829206290244" at="25,33,26,22" />
96+
<scope id="2671382829206290252" at="28,41,29,21" />
97+
<scope id="2671382829206635675" at="34,25,35,35" />
98+
<scope id="2671382829206425251" at="88,21,89,31" />
99+
<scope id="2671382829206587102" at="22,0,25,0" />
100+
<scope id="2671382829206290243" at="25,0,28,0" />
101+
<scope id="2671382829206290249" at="28,0,31,0">
102+
<var name="url" id="2671382829206290250" />
103+
</scope>
104+
<scope id="2671382829206425248" at="88,0,91,0" />
105+
<scope id="2671382829206635671" at="33,0,37,0" />
106+
<scope id="2671382829206290283" at="39,33,43,39" />
107+
<scope id="2671382829206402969" at="50,42,55,36">
108+
<var name="height" id="2671382829206402977" />
109+
<var name="i" id="2671382829206402971" />
110+
</scope>
111+
<scope id="2671382829206290266" at="31,22,37,7" />
112+
<scope id="2671382829206290282" at="39,0,45,0" />
113+
<scope id="2671382829206290265" at="31,0,39,0" />
114+
<scope id="2671382829206402957" at="48,13,56,11">
115+
<var name="result" id="2671382829206402959" />
116+
</scope>
117+
<scope id="2671382829206651699" at="47,25,58,9" />
118+
<scope id="2671382829206651695" at="47,0,60,0" />
119+
<scope id="2671382829206677000" at="71,25,84,33">
120+
<var name="pane" id="2671382829206290383" />
121+
<var name="scene" id="2671382829206290392" />
122+
<var name="stage" id="2671382829206523143" />
123+
</scope>
124+
<scope id="2671382829206290300" at="45,31,60,7" />
125+
<scope id="2671382829206676996" at="71,0,86,0" />
126+
<scope id="2671382829206290299" at="45,0,62,0" />
127+
<scope id="2671382829206290356" at="69,30,86,7" />
128+
<scope id="2671382829206290355" at="69,0,88,0" />
129+
<unit id="2671382829206635669" at="32,26,37,5" name="MPSBrowserPlugin.plugin.SwingMPSFXWebView$1" />
130+
<unit id="2671382829206651693" at="46,26,60,5" name="MPSBrowserPlugin.plugin.SwingMPSFXWebView$2" />
131+
<unit id="2671382829206676994" at="70,26,86,5" name="MPSBrowserPlugin.plugin.SwingMPSFXWebView$3" />
132+
<unit id="2671382829206290196" at="16,0,92,0" name="MPSBrowserPlugin.plugin.SwingMPSFXWebView" />
133+
</file>
134+
</root>
38135
<root nodeRef="r:fd652edb-4d2c-4ed6-a2a0-5da9b575e791(MPSBrowserPlugin.plugin)/4190535063041855328">
39136
<file name="BrowserTool_Tool.java">
40-
<node id="4190535063041855328" at="23,0,24,0" concept="9" trace="ICON" />
137+
<node id="4190535063041855328" at="23,0,24,0" concept="10" trace="ICON" />
41138
<node id="5063423476139030613" at="24,0,25,0" concept="2" trace="projectvar" />
42139
<node id="4190535063041856034" at="25,0,26,0" concept="2" trace="jp" />
43140
<node id="6638639422340962742" at="26,0,27,0" concept="2" trace="fxWebView" />
44141
<node id="4536059984594307982" at="27,0,28,0" concept="2" trace="browserPlugin" />
45-
<node id="4190535063041855328" at="28,44,29,218" concept="10" />
142+
<node id="4190535063041855328" at="28,44,29,218" concept="11" />
46143
<node id="4190535063041855328" at="31,37,32,24" concept="1" />
47144
<node id="6749750758532575893" at="34,25,35,51" concept="1" />
48145
<node id="4536059984594327417" at="35,51,36,99" concept="1" />
49146
<node id="6749750758532575899" at="36,99,37,66" concept="1" />
50147
<node id="6749750758532575908" at="37,66,38,59" concept="1" />
51148
<node id="6749750758532575929" at="40,52,41,73" concept="1" />
52-
<node id="6749750758532575937" at="41,73,42,144" concept="1" />
53-
<node id="6749750758532575944" at="42,144,43,51" concept="1" />
149+
<node id="6749750758532575937" at="41,73,42,88" concept="1" />
150+
<node id="6749750758532575944" at="42,88,43,51" concept="1" />
54151
<node id="6749750758532575951" at="45,9,46,46" concept="1" />
55152
<node id="6749750758532598875" at="48,6,49,39" concept="1" />
56-
<node id="6749750758532602696" at="49,39,50,0" concept="8" />
153+
<node id="6749750758532602696" at="49,39,50,0" concept="9" />
57154
<node id="1569872169207563632" at="52,31,53,208" concept="1" />
58155
<node id="1569872169207577923" at="53,208,54,43" concept="1" />
59156
<node id="4190535063041878142" at="56,36,57,36" concept="7" />

0 commit comments

Comments
 (0)
Please sign in to comment.