Commits

Anonymous committed 266b9b9 Merge

Merging trunk changes into the demo branch

Comments (0)

Files changed (7)

analysis/nbproject/project.properties

 run.classpath=\
     ${javac.classpath}:\
     ${build.classes.dir}
-# Space-separated list of JVM arguments used when running the project.
-# You may also define separate properties like run-sys-prop.name=value instead of -Dname=value.
-# To set system properties for unit tests define test-sys-prop.name=value:
-run.jvmargs=-Xbootclasspath/p:${libs.javac.classpath}
 run.test.classpath=\
     ${javac.test.classpath}:\
     ${build.test.classes.dir}

analysis/src/j1/tutorial/javac/analysis/infrastructure/Main.java

         assert tool != null;
 
         StandardJavaFileManager fm = tool.getStandardFileManager(null, null, null);
-        final JavacTask ct = (JavacTask)tool.getTask(null, null, null, Arrays.asList("-bootclasspath",  bootPath, "-Xjcov", "-classpath", classpath), null, fm.getJavaFileObjects(toAnalyze.toArray(new String[0])));
+        final JavacTask ct = (JavacTask)tool.getTask(null, null, null, Arrays.asList("-bootclasspath",  bootPath, "-Xjcov", "-classpath", classpath, "-source", "1.6"), null, fm.getJavaFileObjects(toAnalyze.toArray(new String[0])));
         Iterable<? extends CompilationUnitTree> cuts = ct.parse();
         
         ct.analyze();

examples/friend/build.xml

 <!-- the Compile on Save feature is turned off for the project. -->
 <!-- You can turn off the Compile on Save (or Deploy on Save) setting -->
 <!-- in the project's Project Properties dialog box.-->
-<project name="example" default="default" basedir=".">
-    <description>Builds, tests, and runs the project example.</description>
+<project name="friend" default="default" basedir=".">
+    <description>Builds, tests, and runs the project friend.</description>
     <import file="nbproject/build-impl.xml"/>
     <!--
 
 
     An example of overriding the target for project execution could look like this:
 
-        <target name="run" depends="example-impl.jar">
+        <target name="run" depends="friend-impl.jar">
             <exec dir="bin" executable="launcher.exe">
                 <arg file="${dist.jar}"/>
             </exec>

examples/friend/nbproject/build-impl.xml

   - cleanup
 
         -->
-<project xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc" basedir=".." default="default" name="example-impl">
+<project xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc" basedir=".." default="default" name="friend-impl">
     <fail message="Please build using Ant 1.8.0 or higher.">
         <condition>
             <not>
                     </fileset>
                 </union>
                 <taskdef classname="org.testng.TestNGAntTask" classpath="${run.test.classpath}" name="testng"/>
-                <testng classfilesetref="test.set" failureProperty="tests.failed" jvm="${platform.java}" methods="${testng.methods.arg}" mode="${testng.mode}" outputdir="${build.test.results.dir}" suitename="example" testname="TestNG tests" workingDir="${work.dir}">
+                <testng classfilesetref="test.set" failureProperty="tests.failed" jvm="${platform.java}" methods="${testng.methods.arg}" mode="${testng.mode}" outputdir="${build.test.results.dir}" suitename="friend" testname="TestNG tests" workingDir="${work.dir}">
                     <xmlfileset dir="${build.test.classes.dir}" includes="@{testincludes}"/>
                     <propertyset>
                         <propertyref prefix="test-sys-prop."/>
                 <condition else="-testclass @{testClass}" property="test.class.or.method" value="-methods @{testClass}.@{testMethod}">
                     <isset property="test.method"/>
                 </condition>
-                <condition else="-suitename example -testname @{testClass} ${test.class.or.method}" property="testng.cmd.args" value="@{testClass}">
+                <condition else="-suitename friend -testname @{testClass} ${test.class.or.method}" property="testng.cmd.args" value="@{testClass}">
                     <matches pattern=".*\.xml" string="@{testClass}"/>
                 </condition>
                 <delete dir="${build.test.results.dir}" quiet="true"/>
         <delete file="${built-jar.properties}" quiet="true"/>
     </target>
     <target if="already.built.jar.${basedir}" name="-warn-already-built-jar">
-        <echo level="warn" message="Cycle detected: example was already built"/>
+        <echo level="warn" message="Cycle detected: friend was already built"/>
     </target>
     <target depends="init,-deps-jar-init" name="deps-jar" unless="no.deps">
         <mkdir dir="${build.dir}"/>
         <delete file="${built-clean.properties}" quiet="true"/>
     </target>
     <target if="already.built.clean.${basedir}" name="-warn-already-built-clean">
-        <echo level="warn" message="Cycle detected: example was already built"/>
+        <echo level="warn" message="Cycle detected: friend was already built"/>
     </target>
     <target depends="init,-deps-clean-init" name="deps-clean" unless="no.deps">
         <mkdir dir="${build.dir}"/>

examples/friend/nbproject/genfiles.properties

-build.xml.data.CRC32=a3b17513
-build.xml.script.CRC32=bdd09d7a
-build.xml.stylesheet.CRC32=28e38971@1.54.0.46
+build.xml.data.CRC32=942ac4db
+build.xml.script.CRC32=b3444088
+build.xml.stylesheet.CRC32=28e38971@1.55.0.46
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=a3b17513
-nbproject/build-impl.xml.script.CRC32=10f3e916
-nbproject/build-impl.xml.stylesheet.CRC32=c6d2a60f@1.54.0.46
+nbproject/build-impl.xml.data.CRC32=942ac4db
+nbproject/build-impl.xml.script.CRC32=a3f45707
+nbproject/build-impl.xml.stylesheet.CRC32=c6d2a60f@1.55.0.46

examples/friend/nbproject/project.properties

 annotation.processing.processors.list=
 annotation.processing.run.all.processors=true
 annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
-application.title=example
+application.title=friend
 application.vendor=lahvac
 build.classes.dir=${build.dir}/classes
 build.classes.excludes=**/*.java,**/*.form
     ${run.test.classpath}
 # This directory is removed when the project is cleaned:
 dist.dir=dist
-dist.jar=${dist.dir}/example.jar
+dist.jar=${dist.dir}/friend.jar
 dist.javadoc.dir=${dist.dir}/javadoc
 endorsed.classpath=
 excludes=

examples/friend/nbproject/project.xml

     <type>org.netbeans.modules.java.j2seproject</type>
     <configuration>
         <data xmlns="http://www.netbeans.org/ns/j2se-project/3">
-            <name>example</name>
+            <name>friend</name>
             <explicit-platform explicit-source-supported="true"/>
             <source-roots>
                 <root id="src.dir"/>
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.