Attachment #74187 for bug #130086

This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

View | Details | Raw Unified | Return to bug 130086
Collapse All | Expand All

Lines 287-298 Link Here

(-)make/netbeans/nb-javac/nbproject/build-impl.xml (-1 / +14 lines)
287	<target name="-init-macrodef-java">	287	<target name="-init-macrodef-java">
288	<macrodef name="java" uri="http://www.netbeans.org/ns/j2se-project/1">	288	<macrodef name="java" uri="http://www.netbeans.org/ns/j2se-project/1">
289	<attribute default="${main.class}" name="classname"/>	289	<attribute default="${main.class}" name="classname"/>
		290	<attribute default="${run.classpath}" name="classpath"/>
290	<element name="customize" optional="true"/>	291	<element name="customize" optional="true"/>
291	<sequential>	292	<sequential>
292	<java classname="@{classname}" dir="${work.dir}" fork="true">	293	<java classname="@{classname}" dir="${work.dir}" fork="true">
293	<jvmarg line="${run.jvmargs}"/>	294	<jvmarg line="${run.jvmargs}"/>
294	<classpath>	295	<classpath>
295	<path path="${run.classpath}"/>	296	<path path="@{classpath}"/>
296	</classpath>	297	</classpath>
297	<syspropertyset>	298	<syspropertyset>
298	<propertyref prefix="run-sys-prop."/>	299	<propertyref prefix="run-sys-prop."/>
Lines 442-447 Link Here
442	<fail unless="run.class">Must select one file in the IDE or set run.class</fail>	443	<fail unless="run.class">Must select one file in the IDE or set run.class</fail>
443	<j2seproject1:java classname="${run.class}"/>	444	<j2seproject1:java classname="${run.class}"/>
444	</target>	445	</target>
		446	<target depends="init,-do-not-recompile,compile-test-single" name="run-test-with-main">
		447	<fail unless="run.class">Must select one file in the IDE or set run.class</fail>
		448	<j2seproject1:java classname="${run.class}" classpath="${run.test.classpath}"/>
		449	</target>
445	<!--	450	<!--
446	=================	451	=================
447	DEBUGGING SECTION	452	DEBUGGING SECTION
Lines 450-455 Link Here
450	<target depends="init" if="netbeans.home" name="-debug-start-debugger">	455	<target depends="init" if="netbeans.home" name="-debug-start-debugger">
451	<j2seproject1:nbjpdastart name="${debug.class}"/>	456	<j2seproject1:nbjpdastart name="${debug.class}"/>
452	</target>	457	</target>
		458	<target depends="init" if="netbeans.home" name="-debug-start-debugger-main-test">
		459	<j2seproject1:nbjpdastart classpath="${debug.test.classpath}" name="${debug.class}"/>
		460	</target>
453	<target depends="init,compile" name="-debug-start-debuggee">	461	<target depends="init,compile" name="-debug-start-debuggee">
454	<j2seproject3:debug>	462	<j2seproject3:debug>
455	<customize>	463	<customize>
Lines 467-472 Link Here
467	<j2seproject3:debug classname="${debug.class}"/>	475	<j2seproject3:debug classname="${debug.class}"/>
468	</target>	476	</target>
469	<target depends="init,-do-not-recompile,compile-single,-debug-start-debugger,-debug-start-debuggee-single" if="netbeans.home" name="debug-single"/>	477	<target depends="init,-do-not-recompile,compile-single,-debug-start-debugger,-debug-start-debuggee-single" if="netbeans.home" name="debug-single"/>
		478	<target depends="init,compile-test-single" if="netbeans.home" name="-debug-start-debuggee-main-test">
		479	<fail unless="debug.class">Must select one file in the IDE or set debug.class</fail>
		480	<j2seproject3:debug classname="${debug.class}" classpath="${debug.test.classpath}"/>
		481	</target>
		482	<target depends="init,-do-not-recompile,compile-test-single,-debug-start-debugger-main-test,-debug-start-debuggee-main-test" if="netbeans.home" name="debug-test-with-main"/>
470	<target depends="init" name="-pre-debug-fix">	483	<target depends="init" name="-pre-debug-fix">
471	<fail unless="fix.includes">Must set fix.includes</fail>	484	<fail unless="fix.includes">Must set fix.includes</fail>
472	<property name="javac.includes" value="${fix.includes}.java"/>	485	<property name="javac.includes" value="${fix.includes}.java"/>

Lines 4-8 Link Here

(-)make/netbeans/nb-javac/nbproject/genfiles.properties (-2 / +2 lines)
4	# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.	4	# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
5	# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.	5	# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
6	nbproject/build-impl.xml.data.CRC32=0dbef76c	6	nbproject/build-impl.xml.data.CRC32=0dbef76c
7	nbproject/build-impl.xml.script.CRC32=9507f8c6	7	nbproject/build-impl.xml.script.CRC32=c3344704
8	nbproject/build-impl.xml.stylesheet.CRC32=e55b27f5	8	nbproject/build-impl.xml.stylesheet.CRC32=84d9cdb5




                    break;
                }
            }
            if (result != null)
                return;
                ClassSymbol cs = env.info.scope.owner.outermostClass();
                treeLoader.couplingError(cs, tree);
            }
        } else {
            TypeVar a = (tree.type != null)
            ? (TypeVar)tree.type
                    : new TypeVar(tree.name, env.info.scope.owner, syms.botType);

            }
            result = a;
        }
    }

    /** Default class enter visitor method: do nothing.
     */

Return to bug 130086

Lines 590-600 Link Here

(-)src/share/classes/com/sun/tools/javac/comp/Enter.java (-3 / +2 lines)
590	break;	590	break;
591	}	591	}
592	}	592	}
593	if (result == null) {	593	if (result != null)
		594	return;
594	ClassSymbol cs = env.info.scope.owner.outermostClass();	595	ClassSymbol cs = env.info.scope.owner.outermostClass();
595	treeLoader.couplingError(cs, tree);	596	treeLoader.couplingError(cs, tree);
596	}	597	}
597	} else {
598	TypeVar a = (tree.type != null)	598	TypeVar a = (tree.type != null)
599	? (TypeVar)tree.type	599	? (TypeVar)tree.type
600	: new TypeVar(tree.name, env.info.scope.owner, syms.botType);	600	: new TypeVar(tree.name, env.info.scope.owner, syms.botType);
Lines 604-610 Link Here
604	}	604	}
605	result = a;	605	result = a;
606	}	606	}
607	}
608		607
609	/** Default class enter visitor method: do nothing.	608	/** Default class enter visitor method: do nothing.
610	*/	609	*/