Skip to content

Commit 3f42671

Browse files
sowmensowmen
committed
Added Right menu options. Changed css styles
1 parent 9489a98 commit 3f42671

15 files changed

Lines changed: 4621 additions & 119 deletions

‎nbproject/UPDATED.TXT‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Project FXSimulator build script updated
55
Project build script file jfx-impl.xml in nbproject sub-directory has not been recognized
66
as compliant with this version of NetBeans JavaFX support module. To ensure correct
77
and complete functionality within this NetBeans installation the script file has been
8-
backed up to jfx-impl_backup_2.xml and then updated to the currently supported state.
8+
backed up to jfx-impl_backup_3.xml and then updated to the currently supported state.
99

1010
FX Project build script auto-update may be triggered on project open either after
1111
NetBeans installation update or by manual changes in jfx-impl.xml. Please note that

‎nbproject/jfx-impl.xml‎

Lines changed: 5 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -327,48 +327,26 @@
327327
<property name="ant-javafx.jar.location" value="${platform.home}${file.separator}tools${file.separator}ant-javafx.jar"/>
328328
</target>
329329
<target name="-check-ant-javafx-in-probjdk-lib" unless="ant-javafx.jar.location">
330-
<condition property="do.set.ant-javafx.in.probjdk.lib.has_jre">
331-
<available file="${java.home}${file.separator}..${file.separator}lib${file.separator}ant-javafx.jar"/>
332-
</condition>
333-
<condition property="do.set.ant-javafx.in.probjdk.lib.no_jre">
334-
<available file="${java.home}${file.separator}lib${file.separator}ant-javafx.jar"/>
335-
</condition>
336330
<condition property="do.set.ant-javafx.in.probjdk.lib">
337331
<and>
338332
<not><isset property="ant-javafx.jar.location"/></not>
339-
<or>
340-
<isset property="do.set.ant-javafx.in.probjdk.lib.has_jre"/>
341-
<isset property="do.set.ant-javafx.in.probjdk.lib.no_jre"/>
342-
</or>
333+
<available file="${java.home}${file.separator}..${file.separator}lib${file.separator}ant-javafx.jar"/>
343334
</and>
344335
</condition>
345336
</target>
346337
<target name="-set-ant-javafx-in-probjdk-lib" depends="-set-ant-javafx-in-platform-home-tools,-check-ant-javafx-in-probjdk-lib" if="do.set.ant-javafx.in.probjdk.lib">
347-
<condition property="ant-javafx.jar.location" value="${java.home}${file.separator}..${file.separator}lib${file.separator}ant-javafx.jar" else="${java.home}${file.separator}lib${file.separator}ant-javafx.jar">
348-
<isset property="do.set.ant-javafx.in.probjdk.lib.has_jre"/>
349-
</condition>
338+
<property name="ant-javafx.jar.location" value="${java.home}${file.separator}..${file.separator}lib${file.separator}ant-javafx.jar"/>
350339
</target>
351340
<target name="-check-ant-javafx-in-probjdk-tools" unless="ant-javafx.jar.location">
352-
<condition property="do.set.ant-javafx.in.probjdk.tools.has_jre">
353-
<available file="${java.home}${file.separator}..${file.separator}tools${file.separator}ant-javafx.jar"/>
354-
</condition>
355-
<condition property="do.set.ant-javafx.in.probjdk.tools.no_jre">
356-
<available file="${java.home}${file.separator}tools${file.separator}ant-javafx.jar"/>
357-
</condition>
358341
<condition property="do.set.ant-javafx.in.probjdk.tools">
359342
<and>
360343
<not><isset property="ant-javafx.jar.location"/></not>
361-
<or>
362-
<isset property="do.set.ant-javafx.in.probjdk.tools.has_jre"/>
363-
<isset property="do.set.ant-javafx.in.probjdk.tools.no_jre"/>
364-
</or>
344+
<available file="${java.home}${file.separator}..${file.separator}tools${file.separator}ant-javafx.jar"/>
365345
</and>
366346
</condition>
367347
</target>
368348
<target name="-set-ant-javafx-in-probjdk-tools" depends="-set-ant-javafx-in-probjdk-lib,-check-ant-javafx-in-probjdk-tools" if="do.set.ant-javafx.in.probjdk.tools">
369-
<condition property="ant-javafx.jar.location" value="${java.home}${file.separator}..${file.separator}tools${file.separator}ant-javafx.jar" else="${java.home}${file.separator}tools${file.separator}ant-javafx.jar">
370-
<isset property="do.set.ant-javafx.in.probjdk.tools.has_jre"/>
371-
</condition>
349+
<property name="ant-javafx.jar.location" value="${java.home}${file.separator}..${file.separator}tools${file.separator}ant-javafx.jar"/>
372350
</target>
373351
<target name="-check-ant-javafx-in-macjdk-lib" unless="ant-javafx.jar.location">
374352
<condition property="do.set.ant-javafx.in.macjdk.lib">
@@ -1847,25 +1825,6 @@
18471825
18481826
// manifest
18491827
var man = jar.createManifest();
1850-
var userManifestPath = project.getProperty("manifest.file");
1851-
if (userManifestPath) {
1852-
var userManifestFile = project.resolveFile(userManifestPath);
1853-
if (userManifestFile.isFile()) {
1854-
var manifestEncoding = project.getProperty("manifest.encoding");
1855-
var userManifestReader = manifestEncoding ?
1856-
new java.io.InputStreamReader(
1857-
new java.io.FileInputStream(userManifestFile),
1858-
manifestEncoding) :
1859-
new java.io.InputStreamReader(
1860-
new java.io.FileInputStream(userManifestFile));
1861-
try {
1862-
var userManifest = new org.apache.tools.ant.taskdefs.Manifest(userManifestReader);
1863-
man.merge(userManifest);
1864-
} finally {
1865-
userManifestReader.close();
1866-
}
1867-
}
1868-
}
18691828
var a1val = new String(project.getProperty("application.vendor"));
18701829
var a1 = new org.apache.tools.ant.taskdefs.Manifest.Attribute();
18711830
a1.setName("Implementation-Vendor");
@@ -3719,7 +3678,6 @@
37193678
<jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
37203679
<jvmarg line="${debug-args-line}"/>
37213680
<jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
3722-
<jvmarg value="-Dglass.disableGrab=true"/>
37233681
<jvmarg value="-Dfile.encoding=${runtime.encoding}"/>
37243682
<redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>
37253683
<jvmarg line="${run.jvmargs}"/>
@@ -3858,7 +3816,7 @@
38583816
<target name="-debug-javaws-debuggee" depends="-init-debug-args">
38593817
<echo message="Executing ${jfx.deployment.jnlp} in debug mode using ${active.webstart.executable}"/>
38603818
<exec executable="${active.webstart.executable}">
3861-
<env key="JAVAWS_VM_ARGS" value="${debug-args-line} -Xrunjdwp:transport=${debug-transport},address=${jpda.address} -Dglass.disableGrab=true"/>
3819+
<env key="JAVAWS_VM_ARGS" value="${debug-args-line} -Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
38623820
<arg value="-wait"/>
38633821
<arg file="${jfx.deployment.jnlp}"/>
38643822
</exec>

0 commit comments

Comments
 (0)