Index: java/src/org/netbeans/modules/java/JavaDataLoader.java =================================================================== RCS file: /cvs/java/src/org/netbeans/modules/java/JavaDataLoader.java,v retrieving revision 1.75 diff -u -r1.75 JavaDataLoader.java --- java/src/org/netbeans/modules/java/JavaDataLoader.java 22 Jul 2005 19:23:16 -0000 1.75 +++ java/src/org/netbeans/modules/java/JavaDataLoader.java 15 Sep 2005 08:54:11 -0000 @@ -19,7 +19,6 @@ import java.io.InputStream; import java.io.ObjectInput; import java.text.DateFormat; -import java.util.ArrayList; import java.util.Collection; import java.util.Date; import java.util.LinkedList; @@ -56,11 +55,6 @@ public static final String PROP_PARSER_ENGINE = "parserEngine"; // NOI18N - /** The list of parsing listener - the instance is in this class, because JavaDataLoader - * class is prevented to be garbage collected. - */ - static ArrayList parsingListeners = new ArrayList(); - static final long serialVersionUID =-6286836352608877232L; /** Create the loader. Index: java/src/org/netbeans/modules/java/parser/DefaultWrapper.java =================================================================== RCS file: /cvs/java/src/org/netbeans/modules/java/parser/DefaultWrapper.java,v retrieving revision 1.4 diff -u -r1.4 DefaultWrapper.java --- java/src/org/netbeans/modules/java/parser/DefaultWrapper.java 2 Jun 2004 11:48:55 -0000 1.4 +++ java/src/org/netbeans/modules/java/parser/DefaultWrapper.java 15 Sep 2005 08:54:11 -0000 @@ -15,9 +15,7 @@ import org.openide.src.*; -import org.netbeans.modules.java.bridge.Binding; import org.netbeans.modules.java.bridge.WrapperFactory; -import org.netbeans.modules.java.bridge.BindingFactory; import org.netbeans.modules.java.bridge.ImportElement; /** Index: java/src/org/netbeans/modules/java/parser/ParseObjectRequest.java =================================================================== RCS file: /cvs/java/src/org/netbeans/modules/java/parser/ParseObjectRequest.java,v retrieving revision 1.8 diff -u -r1.8 ParseObjectRequest.java --- java/src/org/netbeans/modules/java/parser/ParseObjectRequest.java 2 Jun 2004 11:48:58 -0000 1.8 +++ java/src/org/netbeans/modules/java/parser/ParseObjectRequest.java 15 Sep 2005 08:54:11 -0000 @@ -14,10 +14,8 @@ package org.netbeans.modules.java.parser; import org.netbeans.modules.java.ElementFactory; -import org.netbeans.modules.java.ErrConsumer; import java.io.IOException; import java.io.InputStream; -import java.io.Reader; import java.util.Collection; import org.netbeans.api.java.classpath.ClassPath; @@ -95,8 +93,6 @@ * request */ public Collection getMessages(); - public ErrConsumer getErrConsumer(); - public String getSourceName(); public ClassPath getLibraryPath(); Index: java/src/org/netbeans/modules/java/parser/ParseSourceRequest.java =================================================================== RCS file: /cvs/java/src/org/netbeans/modules/java/parser/ParseSourceRequest.java,v retrieving revision 1.23 diff -u -r1.23 ParseSourceRequest.java --- java/src/org/netbeans/modules/java/parser/ParseSourceRequest.java 2 Jun 2004 11:48:58 -0000 1.23 +++ java/src/org/netbeans/modules/java/parser/ParseSourceRequest.java 15 Sep 2005 08:54:11 -0000 @@ -7,7 +7,7 @@ * http://www.sun.com/ * * The Original Code is NetBeans. The Initial Developer of the Original - * Code is Sun Microsystems, Inc. Portions Copyright 1997-2003 Sun + * Code is Sun Microsystems, Inc. Portions Copyright 1997-2005 Sun * Microsystems, Inc. All Rights Reserved. */ package org.netbeans.modules.java.parser; @@ -25,17 +25,13 @@ import org.openide.text.CloneableEditorSupport; import org.netbeans.modules.java.ElementFactory; -import org.netbeans.modules.java.ErrConsumer; -import org.netbeans.modules.java.JavaDataObject; import org.netbeans.modules.java.Util; -import org.netbeans.modules.java.settings.JavaSettings; /** * * @author sdedic - * @version */ -public class ParseSourceRequest implements ParsableObjectRequest, ErrConsumer { +public class ParseSourceRequest implements ParsableObjectRequest { public static final int STATE_WAITING = 0; public static final int STATE_READING = 1; public static final int STATE_CANCELLED = 2; @@ -43,8 +39,6 @@ public static final int STATE_UPDATING = 4; public static final int STATE_COMPLETED = 10; - private static final int READ_THRESHOLD = 2048; - JavaParser.Env environment; ChangeListener listener; int state; @@ -77,8 +71,6 @@ } public ParseSourceRequest(Object parserType) { - JavaSettings settings=JavaSettings.getDefault(); - this.parserType = parserType; state = STATE_WAITING; valid = true; @@ -223,29 +215,6 @@ public Object getParserType() { return parserType; - } - - public ErrConsumer getErrConsumer() { - if (JavaParser.DEEP_PARSER.equals(getParserType())) { - return this; - } - // null IS intentional for the shallow parser. Before you change it - // be aware of JavaEditor.processAnnotations(ParserMessage[] errors) depends on it - return null; - } - - public void pushError(Object severity, FileObject errorFile, int line, int column, String message, String referenceText) { - Integer lineInt; - - if (errorFile != null && !errorFile.getNameExt().equals(getSourceName())) - return; // error in different file - - ParserMessageImpl newErr = - new ParserMessageImpl(severity,line,column,message); - if (errors == null) { - errors = new ArrayList(50); - } - errors.add(newErr); } /** @return the set of errors encountered while processing this Index: java/src/org/netbeans/modules/java/parser/ParsingSupport.java =================================================================== RCS file: /cvs/java/src/org/netbeans/modules/java/parser/ParsingSupport.java,v retrieving revision 1.45 diff -u -r1.45 ParsingSupport.java --- java/src/org/netbeans/modules/java/parser/ParsingSupport.java 2 Jun 2004 11:48:58 -0000 1.45 +++ java/src/org/netbeans/modules/java/parser/ParsingSupport.java 15 Sep 2005 08:54:11 -0000 @@ -20,43 +20,28 @@ import java.lang.ref.ReferenceQueue; import java.lang.ref.WeakReference; import java.util.*; -import java.io.Reader; import java.io.InputStream; import java.io.IOException; import javax.swing.event.ChangeListener; import javax.swing.event.ChangeEvent; -import javax.swing.text.Segment; -import javax.swing.text.StyledDocument; -import javax.swing.text.BadLocationException; import org.netbeans.api.java.classpath.ClassPath; -import org.openide.cookies.SourceCookie; -import org.openide.filesystems.FileObject; import org.openide.nodes.Node; import org.openide.src.*; import org.openide.text.CloneableEditorSupport; import org.openide.util.RequestProcessor; import org.openide.util.Task; -import org.openide.util.TaskListener; import org.openide.util.Utilities; -import org.netbeans.modules.java.bridge.ElementImpl; -import org.netbeans.modules.java.bridge.DefaultLangModel; -import org.netbeans.modules.java.bridge.WrapperFactory; import org.netbeans.modules.java.bridge.LangModel; import org.netbeans.modules.java.bridge.CommitListener; import org.netbeans.modules.java.bridge.SrcElementImpl; import org.netbeans.modules.java.codegen.DocumentBinding; -import org.netbeans.modules.java.codegen.SourceText; import org.netbeans.modules.java.ParserEngine; import org.netbeans.modules.java.ElementFactory; -import org.netbeans.modules.java.ErrConsumer; -import org.netbeans.modules.java.JavaDataObject; -import org.netbeans.modules.java.Parsing; - import org.netbeans.modules.java.JavaDataObject; /** @@ -72,8 +57,6 @@ */ public class ParsingSupport implements JavaParser { - private static final int READ_THRESHOLD = 2048; - private PropertyChangeSupport propSupport; public static final String PROP_STATUS = "status"; // NOI18N @@ -374,16 +357,6 @@ fireStateChange(); } - private void fireParsingEvent(final Collection messages) { - final Object hook = getSourceImpl(); - - EVENT_RP.post(new Runnable() { - public void run() { - Parsing.fireEvent(jdo, messages); - } - }); - } - protected void fireStateChange() { if (changeList == null) return; @@ -577,23 +550,6 @@ } } - private void updateModel() throws SourceException { - model.removePreCommitListener(this); - if (getSyntaxErrors() > 0 && !errorsOK) { - // don't update the model at all. - resultStatus = SourceElement.STATUS_PARTIAL; - return; - } - if (isValid()) { - // we have the write lock, noone changed the model - // since we started. - - // SUCCESS (?) - resultStatus = getSyntaxErrors() > 0 ? - SourceElement.STATUS_PARTIAL : SourceElement.STATUS_OK; - } - } - private void parseLockModel() throws SourceException { model.addPreCommitListener(this); resultStatus = -1; @@ -629,15 +585,11 @@ } public void complete() { - Collection messages; - synchronized (ParsingSupport.this) { if (currentRequest == this) currentRequest = null; - messages = request.getMessages(); } changeStatus(resultStatus); - fireParsingEvent(messages); task.complete(); if (chained != null) chained.complete(); @@ -724,10 +676,6 @@ return request.getParserType(); } - public ErrConsumer getErrConsumer() { - return request.getErrConsumer(); - } - public String getSourceName() { return request.getSourceName(); } @@ -767,14 +715,10 @@ /* --------------------------------------------------------------------*/ static RequestProcessor PARSING_RP; - /** processor dedicated for parser events. */ - private static RequestProcessor EVENT_RP; - private void addRequest(Processor proc, int priority) { synchronized (this) { if (PARSING_RP == null) { PARSING_RP = new RequestProcessor("Java source parsing"); // NOI18N - EVENT_RP = new RequestProcessor("Java Parser Event Queue"); // NOI18N } if (currentRequest != proc) { if (currentRequest != null) @@ -797,7 +741,6 @@ } protected void notifyFinalized(Reference refImpl) { - int oldStatus; synchronized (this) { if (refImplementation != refImpl) @@ -816,8 +759,6 @@ } public void run() { - Reference f; - ParsingSupport supp = (ParsingSupport)refSupp.get(); if (supp != null) supp.notifyFinalized(this); Index: java/src/org/netbeans/modules/java/parser/ProcessorObjectRequest.java =================================================================== RCS file: /cvs/java/src/org/netbeans/modules/java/parser/ProcessorObjectRequest.java,v retrieving revision 1.3 diff -u -r1.3 ProcessorObjectRequest.java --- java/src/org/netbeans/modules/java/parser/ProcessorObjectRequest.java 2 Jun 2004 11:48:58 -0000 1.3 +++ java/src/org/netbeans/modules/java/parser/ProcessorObjectRequest.java 15 Sep 2005 08:54:11 -0000 @@ -18,7 +18,6 @@ package org.netbeans.modules.java.parser; import org.openide.text.CloneableEditorSupport; -import org.netbeans.modules.java.parser.JavaParser; /** *