Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit d28cf1d

Browse files
committed
Added Cost of the MST
1 parent 1d5813d commit d28cf1d

File tree

8 files changed

+4107
-55
lines changed

8 files changed

+4107
-55
lines changed

‎nbproject/UPDATED.TXT‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
============================================
2-
Project FXSimulator_1.0 build script updated
3-
============================================
1+
========================================
2+
Project FXSimulator build script updated
3+
========================================
44

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_1.xml and then updated to the currently supported state.
8+
backed up to jfx-impl_backup_2.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/build-impl.xml‎

Lines changed: 21 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,8 @@ is divided into following sections:
7272
<property file="${user.properties.file}"/>
7373
<!-- The two properties below are usually overridden -->
7474
<!-- by the active platform. Just a fallback. -->
75-
<property name="default.javac.source" value="1.4"/>
76-
<property name="default.javac.target" value="1.4"/>
75+
<property name="default.javac.source" value="1.6"/>
76+
<property name="default.javac.target" value="1.6"/>
7777
</target>
7878
<target depends="-pre-init,-init-private,-init-libraries,-init-user" name="-init-project">
7979
<property file="nbproject/configs/${config}.properties"/>
@@ -102,7 +102,7 @@ is divided into following sections:
102102
<and>
103103
<isset property="javac.profile"/>
104104
<length length="0" string="${javac.profile}" when="greater"/>
105-
<matches pattern="1\.[89](\..*)?" string="${javac.source}"/>
105+
<matches pattern="((1\.[89])|9)(\..*)?" string="${javac.source}"/>
106106
</and>
107107
</condition>
108108
<condition property="do.archive">
@@ -183,6 +183,7 @@ is divided into following sections:
183183
<property name="application.args" value=""/>
184184
<property name="source.encoding" value="${file.encoding}"/>
185185
<property name="runtime.encoding" value="${source.encoding}"/>
186+
<property name="manifest.encoding" value="${source.encoding}"/>
186187
<condition property="javadoc.encoding.used" value="${javadoc.encoding}">
187188
<and>
188189
<isset property="javadoc.encoding"/>
@@ -218,7 +219,12 @@ is divided into following sections:
218219
</not>
219220
</and>
220221
</condition>
221-
<property name="javac.fork" value="${jdkBug6558476}"/>
222+
<condition else="false" property="javac.fork">
223+
<or>
224+
<istrue value="${jdkBug6558476}"/>
225+
<istrue value="${javac.external.vm}"/>
226+
</or>
227+
</condition>
222228
<property name="jar.index" value="false"/>
223229
<property name="jar.index.metainf" value="${jar.index}"/>
224230
<property name="copylibs.rebase" value="true"/>
@@ -244,6 +250,7 @@ is divided into following sections:
244250
<condition else="" property="testng.debug.mode" value="-mixed">
245251
<istrue value="${junit+testng.available}"/>
246252
</condition>
253+
<property name="java.failonerror" value="true"/>
247254
</target>
248255
<target name="-post-init">
249256
<!-- Empty placeholder for easier customization. -->
@@ -721,7 +728,7 @@ is divided into following sections:
721728
<sequential>
722729
<property environment="env"/>
723730
<resolve name="profiler.current.path" value="${profiler.info.pathvar}"/>
724-
<java classname="@{classname}" dir="${profiler.info.dir}" fork="true" jvm="${profiler.info.jvm}">
731+
<java classname="@{classname}" dir="${profiler.info.dir}" failonerror="${java.failonerror}"fork="true" jvm="${profiler.info.jvm}">
725732
<jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
726733
<jvmarg value="${profiler.info.jvmargs.agent}"/>
727734
<jvmarg line="${profiler.info.jvmargs}"/>
@@ -796,7 +803,7 @@ is divided into following sections:
796803
<attribute default="${debug.classpath}" name="classpath"/>
797804
<element name="customize" optional="true"/>
798805
<sequential>
799-
<java classname="@{classname}" dir="${work.dir}" fork="true">
806+
<java classname="@{classname}" dir="${work.dir}" failonerror="${java.failonerror}"fork="true">
800807
<jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
801808
<jvmarg line="${debug-args-line}"/>
802809
<jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
@@ -823,7 +830,7 @@ is divided into following sections:
823830
<attribute default="jvm" name="jvm"/>
824831
<element name="customize" optional="true"/>
825832
<sequential>
826-
<java classname="@{classname}" dir="${work.dir}" fork="true">
833+
<java classname="@{classname}" dir="${work.dir}" failonerror="${java.failonerror}"fork="true">
827834
<jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
828835
<jvmarg value="-Dfile.encoding=${runtime.encoding}"/>
829836
<redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>
@@ -862,7 +869,7 @@ is divided into following sections:
862869
</chainedmapper>
863870
</pathconvert>
864871
<taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
865-
<copylibs compress="${jar.compress}" excludeFromCopy="${copylibs.excludes}" index="${jar.index}" indexMetaInf="${jar.index.metainf}" jarfile="${dist.jar}" manifest="@{manifest}" rebase="${copylibs.rebase}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
872+
<copylibs compress="${jar.compress}" excludeFromCopy="${copylibs.excludes}" index="${jar.index}" indexMetaInf="${jar.index.metainf}" jarfile="${dist.jar}" manifest="@{manifest}" manifestencoding="UTF-8"rebase="${copylibs.rebase}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
866873
<fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/>
867874
<manifest>
868875
<attribute name="Class-Path" value="${jar.classpath}"/>
@@ -874,7 +881,7 @@ is divided into following sections:
874881
</target>
875882
<target name="-init-presetdef-jar">
876883
<presetdef name="jar" uri="http://www.netbeans.org/ns/j2se-project/1">
877-
<jar compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}">
884+
<jar compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}"manifestencoding="UTF-8">
878885
<j2seproject1:fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/>
879886
</jar>
880887
</presetdef>
@@ -998,23 +1005,23 @@ is divided into following sections:
9981005
</target>
9991006
<target depends="init" if="do.archive+manifest.available" name="-do-jar-copy-manifest">
10001007
<tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>
1001-
<copy file="${manifest.file}" tofile="${tmp.manifest.file}"/>
1008+
<copy encoding="${manifest.encoding}"file="${manifest.file}"outputencoding="UTF-8" tofile="${tmp.manifest.file}"/>
10021009
</target>
10031010
<target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+main.class.available" name="-do-jar-set-mainclass">
1004-
<manifest file="${tmp.manifest.file}" mode="update">
1011+
<manifest encoding="UTF-8"file="${tmp.manifest.file}" mode="update">
10051012
<attribute name="Main-Class" value="${main.class}"/>
10061013
</manifest>
10071014
</target>
10081015
<target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+profile.available" name="-do-jar-set-profile">
1009-
<manifest file="${tmp.manifest.file}" mode="update">
1016+
<manifest encoding="UTF-8"file="${tmp.manifest.file}" mode="update">
10101017
<attribute name="Profile" value="${javac.profile}"/>
10111018
</manifest>
10121019
</target>
10131020
<target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+splashscreen.available" name="-do-jar-set-splashscreen">
10141021
<basename file="${application.splash}" property="splashscreen.basename"/>
10151022
<mkdir dir="${build.classes.dir}/META-INF"/>
10161023
<copy failonerror="false" file="${application.splash}" todir="${build.classes.dir}/META-INF"/>
1017-
<manifest file="${tmp.manifest.file}" mode="update">
1024+
<manifest encoding="UTF-8"file="${tmp.manifest.file}" mode="update">
10181025
<attribute name="SplashScreen-Image" value="META-INF/${splashscreen.basename}"/>
10191026
</manifest>
10201027
</target>
@@ -1209,7 +1216,7 @@ is divided into following sections:
12091216
<target depends="-profile-check" description="Profile a selected class in the IDE." if="profiler.configured" name="profile-test-with-main">
12101217
<fail unless="run.class">Must select one file in the IDE or set run.class</fail>
12111218
<startprofiler/>
1212-
<antcal target="run-test-with-main"/>
1219+
<antcall target="run-test-with-main"/>
12131220
</target>
12141221
<target depends="-profile-check,-profile-applet-pre72" if="profiler.configured" name="profile-applet" unless="profiler.info.jvmargs.agent">
12151222
<fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>

‎nbproject/genfiles.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ build.xml.stylesheet.CRC32=8064a381@1.75.2.48
44
# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
55
# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
66
nbproject/build-impl.xml.data.CRC32=f3e7f00b
7-
nbproject/build-impl.xml.script.CRC32=bc67df42
8-
nbproject/build-impl.xml.stylesheet.CRC32=876e7a8f@1.75.2.48
7+
nbproject/build-impl.xml.script.CRC32=b9a9d06c
8+
nbproject/build-impl.xml.stylesheet.CRC32=830a3534@1.80.1.48

‎nbproject/jfx-impl.xml‎

Lines changed: 47 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -327,26 +327,48 @@
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>
330336
<condition property="do.set.ant-javafx.in.probjdk.lib">
331337
<and>
332338
<not><isset property="ant-javafx.jar.location"/></not>
333-
<available file="${java.home}${file.separator}..${file.separator}lib${file.separator}ant-javafx.jar"/>
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>
334343
</and>
335344
</condition>
336345
</target>
337346
<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">
338-
<property name="ant-javafx.jar.location" value="${java.home}${file.separator}..${file.separator}lib${file.separator}ant-javafx.jar"/>
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>
339350
</target>
340351
<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>
341358
<condition property="do.set.ant-javafx.in.probjdk.tools">
342359
<and>
343360
<not><isset property="ant-javafx.jar.location"/></not>
344-
<available file="${java.home}${file.separator}..${file.separator}tools${file.separator}ant-javafx.jar"/>
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>
345365
</and>
346366
</condition>
347367
</target>
348368
<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">
349-
<property name="ant-javafx.jar.location" value="${java.home}${file.separator}..${file.separator}tools${file.separator}ant-javafx.jar"/>
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>
350372
</target>
351373
<target name="-check-ant-javafx-in-macjdk-lib" unless="ant-javafx.jar.location">
352374
<condition property="do.set.ant-javafx.in.macjdk.lib">
@@ -1825,6 +1847,25 @@
18251847
18261848
// manifest
18271849
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+
}
18281869
var a1val = new String(project.getProperty("application.vendor"));
18291870
var a1 = new org.apache.tools.ant.taskdefs.Manifest.Attribute();
18301871
a1.setName("Implementation-Vendor");
@@ -3678,6 +3719,7 @@
36783719
<jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
36793720
<jvmarg line="${debug-args-line}"/>
36803721
<jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
3722+
<jvmarg value="-Dglass.disableGrab=true"/>
36813723
<jvmarg value="-Dfile.encoding=${runtime.encoding}"/>
36823724
<redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>
36833725
<jvmarg line="${run.jvmargs}"/>
@@ -3816,7 +3858,7 @@
38163858
<target name="-debug-javaws-debuggee" depends="-init-debug-args">
38173859
<echo message="Executing ${jfx.deployment.jnlp} in debug mode using ${active.webstart.executable}"/>
38183860
<exec executable="${active.webstart.executable}">
3819-
<env key="JAVAWS_VM_ARGS" value="${debug-args-line} -Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
3861+
<env key="JAVAWS_VM_ARGS" value="${debug-args-line} -Xrunjdwp:transport=${debug-transport},address=${jpda.address} -Dglass.disableGrab=true"/>
38203862
<arg value="-wait"/>
38213863
<arg file="${jfx.deployment.jnlp}"/>
38223864
</exec>

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /