Attachment #121317 for bug #214647

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 214647
Collapse All | Expand All

Lines 2-6 Link Here

(-)a/j2ee.common/manifest.mf (-1 / +1 lines)
2	OpenIDE-Module: org.netbeans.modules.j2ee.common/1	2	OpenIDE-Module: org.netbeans.modules.j2ee.common/1
3	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/j2ee/common/Bundle.properties	3	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/j2ee/common/Bundle.properties
4	OpenIDE-Module-Needs: javax.script.ScriptEngine.freemarker	4	OpenIDE-Module-Needs: javax.script.ScriptEngine.freemarker
5	OpenIDE-Module-Specification-Version: 1.72	5	OpenIDE-Module-Specification-Version: 1.73
6	AutoUpdate-Show-In-Client: false	6	AutoUpdate-Show-In-Client: false




    private WhiteListUpdater(Project p, PropertyEvaluator eval) {
        this.p = p;
        this.eval = eval;
        lastWhiteList = getServerWhiteList();
        eval.addPropertyChangeListener(this);
    }

    public static WhiteListUpdater createWhiteListUpdater(Project p, PropertyEvaluator e) {
        return new WhiteListUpdater(p, e);
    }

    public void enable() {
        lastWhiteList = getServerWhiteList();
        eval.addPropertyChangeListener(this);        
    }
    
    public void disable() {
        eval.removePropertyChangeListener(this);       
    }

    private void updateWhitelist(final String oldWhiteListId, final String newWhiteListId) {
        rp.post(new Runnable() {
            @Override

Lines 170-176 Link Here

(-)a/web.project/nbproject/project.xml (-1 / +1 lines)
170	<compile-dependency/>	170	<compile-dependency/>
171	<run-dependency>	171	<run-dependency>
172	<release-version>1</release-version>	172	<release-version>1</release-version>
173	<specification-version>1.62</specification-version>	173	<specification-version>1.73</specification-version>
174	</run-dependency>	174	</run-dependency>
175	</dependency>	175	</dependency>
176	<dependency>	176	<dependency>

Lines 227-233 Link Here

(-)a/web.project/src/org/netbeans/modules/web/project/WebProject.java (-1 / +5 lines)
227	private final WebProjectLibrariesModifierImpl libMod;	227	private final WebProjectLibrariesModifierImpl libMod;
228	private final ClassPathProviderImpl cpProvider;	228	private final ClassPathProviderImpl cpProvider;
229	private ClassPathUiSupport.Callback classPathUiSupportCallback;	229	private ClassPathUiSupport.Callback classPathUiSupportCallback;
230	private WhiteListUpdater whiteListUpdater;	230	private final WhiteListUpdater whiteListUpdater;
231		231
232	private AntBuildExtender buildExtender;	232	private AntBuildExtender buildExtender;
233		233
Lines 851-856 Link Here
851	protected void projectOpened() {	851	protected void projectOpened() {
852	evaluator().addPropertyChangeListener(WebProject.this.webModule);	852	evaluator().addPropertyChangeListener(WebProject.this.webModule);
853		853
		854	whiteListUpdater.enable();
		855
854	WebLogicalViewProvider logicalViewProvider = (WebLogicalViewProvider) WebProject.this.getLookup().lookup (WebLogicalViewProvider.class);	856	WebLogicalViewProvider logicalViewProvider = (WebLogicalViewProvider) WebProject.this.getLookup().lookup (WebLogicalViewProvider.class);
855	if (logicalViewProvider != null) {	857	if (logicalViewProvider != null) {
856	logicalViewProvider.initialize();	858	logicalViewProvider.initialize();
Lines 1203-1208 Link Here
1203	protected void projectClosed() {	1205	protected void projectClosed() {
1204	evaluator().removePropertyChangeListener(WebProject.this.webModule);	1206	evaluator().removePropertyChangeListener(WebProject.this.webModule);
1205		1207
		1208	whiteListUpdater.disable();
		1209
1206	webPagesFileWatch.reset();	1210	webPagesFileWatch.reset();
1207	webInfFileWatch.reset();	1211	webInfFileWatch.reset();
1208		1212

Return to bug 214647

Lines 80-93 Link Here

(-)a/j2ee.common/src/org/netbeans/modules/j2ee/common/project/WhiteListUpdater.java (-2 / +9 lines)
80	private WhiteListUpdater(Project p, PropertyEvaluator eval) {	80	private WhiteListUpdater(Project p, PropertyEvaluator eval) {
81	this.p = p;	81	this.p = p;
82	this.eval = eval;	82	this.eval = eval;
83	lastWhiteList = getServerWhiteList();
84	eval.addPropertyChangeListener(this);
85	}	83	}
86		84
87	public static WhiteListUpdater createWhiteListUpdater(Project p, PropertyEvaluator e) {	85	public static WhiteListUpdater createWhiteListUpdater(Project p, PropertyEvaluator e) {
88	return new WhiteListUpdater(p, e);	86	return new WhiteListUpdater(p, e);
89	}	87	}
90		88
		89	public void enable() {
		90	lastWhiteList = getServerWhiteList();
		91	eval.addPropertyChangeListener(this);
		92	}
		93
		94	public void disable() {
		95	eval.removePropertyChangeListener(this);
		96	}
		97
91	private void updateWhitelist(final String oldWhiteListId, final String newWhiteListId) {	98	private void updateWhitelist(final String oldWhiteListId, final String newWhiteListId) {
92	rp.post(new Runnable() {	99	rp.post(new Runnable() {
93	@Override	100	@Override