1.1 --- a/c.s.tools.ide.analysis.modernize/src/com/sun/tools/ide/analysis/modernize/impl/ModernizeAnalyzerImpl.java	Thu Jun 15 13:26:38 2017 +0300
     1.2 +++ b/c.s.tools.ide.analysis.modernize/src/com/sun/tools/ide/analysis/modernize/impl/ModernizeAnalyzerImpl.java	Thu Jun 15 14:17:04 2017 +0300
     1.3 @@ -73,8 +73,6 @@
     1.4  
     1.5      private static final String PREFIX = "tidy-"; //NOI18N
     1.6  
     1.7 -    private ModernizeErrorProvider currentErrorProvider;
     1.8 -
     1.9      private ModernizeAnalyzerImpl(Context ctx) {
    1.10          super(ctx);
    1.11      }
    1.12 @@ -84,43 +82,32 @@
    1.13          return ModernizeErrorProvider.getInstance();
    1.14      }
    1.15  
    1.16 -    @Override
    1.17 +    @Override 
    1.18      protected boolean isCompileUnitBased() {
    1.19          return true;
    1.20      }
    1.21  
    1.22      @Override
    1.23 -    protected Collection<ErrorDescription> done() {
    1.24 -        if (currentErrorProvider != null) {
    1.25 -            Collection<ErrorDescription> results = currentErrorProvider.done();
    1.26 -            currentErrorProvider = null;
    1.27 -            return results;
    1.28 -        }
    1.29 -        return Collections.<ErrorDescription>emptyList();
    1.30 -    }
    1.31 -
    1.32 -    @Override
    1.33      protected Collection<? extends ErrorDescription> doRunImpl(final FileObject sr, final Context ctx, final CsmErrorProvider provider, final AtomicBoolean cancel) {
    1.34          final CsmFile csmFile = CsmUtilities.getCsmFile(sr, false, false);
    1.35          if (csmFile == null) {
    1.36              return Collections.<ErrorDescription>emptyList();
    1.37          }
    1.38          CsmErrorProvider.Request request = new RequestImpl(csmFile, ctx, cancel);
    1.39 -        final ArrayList<ErrorDescription> res = new ArrayList<>();
    1.40 -        CsmErrorProvider.Response response = new ModernizeResponse(sr, res, cancel);
    1.41 -        this.currentErrorProvider = (ModernizeErrorProvider) provider;
    1.42 +        final ArrayList<ErrorDescription> res = new ArrayList<ErrorDescription>();
    1.43 +        CsmErrorProvider.Response response = new ResponseImpl(sr, res, cancel);
    1.44          provider.getErrors(request, response);
    1.45          return res;
    1.46      }
    1.47  
    1.48 -    protected static class ModernizeResponse extends AbstractResponse {
    1.49 +    protected static class ResponseImpl extends AbstractResponse {
    1.50  
    1.51 -        public ModernizeResponse(FileObject sr, ArrayList<ErrorDescription> res, AtomicBoolean cancel) {
    1.52 +        public ResponseImpl(FileObject sr, ArrayList<ErrorDescription> res, AtomicBoolean cancel) {
    1.53              super(sr, res, cancel);
    1.54          }
    1.55  
    1.56          @Override
    1.57 -        public ErrorDescription addErrorImpl(CsmErrorInfo errorInfo, FileObject fo) {
    1.58 +        protected ErrorDescription addErrorImpl(CsmErrorInfo errorInfo, FileObject fo) {
    1.59              String messages[] = errorInfo.getMessage().split("\n"); //NOI18N
    1.60              if (messages.length > 0) {
    1.61                  StringBuilder sb = new StringBuilder();
    1.62 @@ -173,7 +160,7 @@
    1.63  
    1.64          @Override
    1.65          public Iterable<? extends WarningDescription> getWarnings() {
    1.66 -            List<WarningDescription> result = new ArrayList<>();
    1.67 +            List<WarningDescription> result = new ArrayList<WarningDescription>();
    1.68              final ModernizeErrorProvider provider = ModernizeErrorProvider.getInstance();
    1.69              for (CodeAudit audit : provider.getAudits()) {
    1.70                  result.add(WarningDescription.create(PREFIX + audit.getID(), audit.getName(), ModernizeErrorProvider.NAME, provider.getDisplayName()));