1.1 --- a/c.s.tools.ide.analysis.modernize/src/com/sun/tools/ide/analysis/modernize/impl/AnalyzerResponseMerger.java	Thu Jun 15 13:26:38 2017 +0300
     1.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.3 @@ -1,105 +0,0 @@
     1.4 -/*
     1.5 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
     1.6 - *
     1.7 - * Copyright (c) 2017 Oracle and/or its affiliates. All rights reserved.
     1.8 - *
     1.9 - * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
    1.10 - * Other names may be trademarks of their respective owners.
    1.11 - *
    1.12 - * The contents of this file are subject to the terms of either the GNU
    1.13 - * General Public License Version 2 only ("GPL") or the Common
    1.14 - * Development and Distribution License("CDDL") (collectively, the
    1.15 - * "License"). You may not use this file except in compliance with the
    1.16 - * License. You can obtain a copy of the License at
    1.17 - * http://www.netbeans.org/cddl-gplv2.html
    1.18 - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
    1.19 - * specific language governing permissions and limitations under the
    1.20 - * License.  When distributing the software, include this License Header
    1.21 - * Notice in each file and include the License file at
    1.22 - * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
    1.23 - * particular file as subject to the "Classpath" exception as provided
    1.24 - * by Oracle in the GPL Version 2 section of the License file that
    1.25 - * accompanied this code. If applicable, add the following below the
    1.26 - * License Header, with the fields enclosed by brackets [] replaced by
    1.27 - * your own identifying information:
    1.28 - * "Portions Copyrighted [year] [name of copyright owner]"
    1.29 - *
    1.30 - * If you wish your version of this file to be governed by only the CDDL
    1.31 - * or only the GPL Version 2, indicate your decision by adding
    1.32 - * "[Contributor] elects to include this software in this distribution
    1.33 - * under the [CDDL or GPL Version 2] license." If you do not indicate a
    1.34 - * single choice of license, a recipient has the option to distribute
    1.35 - * your version of this file under either the CDDL, the GPL Version 2 or
    1.36 - * to extend the choice of license to its licensees as provided above.
    1.37 - * However, if you add GPL Version 2 code and therefore, elected the GPL
    1.38 - * Version 2 license, then the option applies only if the new code is
    1.39 - * made subject to such option by the copyright holder.
    1.40 - *
    1.41 - * Contributor(s):
    1.42 - */
    1.43 -package com.sun.tools.ide.analysis.modernize.impl;
    1.44 -
    1.45 -import com.sun.tools.ide.analysis.modernize.impl.ModernizeAnalyzerImpl.ModernizeResponse;
    1.46 -import java.util.ArrayList;
    1.47 -import java.util.HashMap;
    1.48 -import java.util.List;
    1.49 -import java.util.Map;
    1.50 -import java.util.Optional;
    1.51 -import java.util.stream.Collectors;
    1.52 -import org.netbeans.modules.cnd.analysis.api.AnalyzerResponse;
    1.53 -import org.netbeans.spi.editor.hints.ErrorDescription;
    1.54 -import org.openide.filesystems.FileObject;
    1.55 -
    1.56 -/**
    1.57 - *
    1.58 - * @author Ilia Gromov
    1.59 - */
    1.60 -public class AnalyzerResponseMerger {
    1.61 -
    1.62 -    private static class ErrorDesc {
    1.63 -
    1.64 -        final ModernizeErrorInfo info;
    1.65 -        final FileObject fo;
    1.66 -
    1.67 -        public ErrorDesc(ModernizeErrorInfo info, FileObject fo) {
    1.68 -            this.info = info;
    1.69 -            this.fo = fo;
    1.70 -        }
    1.71 -
    1.72 -        public boolean isSame(ErrorDesc o2) {
    1.73 -            return isSame(this.info, o2.info) && this.fo.equals(o2.fo);
    1.74 -        }
    1.75 -
    1.76 -        public boolean isSame(ModernizeErrorInfo o1, ModernizeErrorInfo o2) {
    1.77 -            return o1.getStartOffset() == o2.getStartOffset()
    1.78 -                    && o1.getEndOffset() == o2.getEndOffset()
    1.79 -                    && o1.getDiagnostics().getCheckName().equals(o2.getDiagnostics().getCheckName());
    1.80 -        }
    1.81 -    }
    1.82 -
    1.83 -    private final List<ErrorDesc> errors = new ArrayList<>();
    1.84 -    private final ModernizeResponse delegate;
    1.85 -
    1.86 -    public AnalyzerResponseMerger(ModernizeResponse delegate) {
    1.87 -        this.delegate = delegate;
    1.88 -    }
    1.89 -
    1.90 -    public void addError(ModernizeErrorInfo info, FileObject fo) {
    1.91 -        ErrorDesc errorDesc = new ErrorDesc(info, fo);
    1.92 -        Optional<ErrorDesc> found = errors.stream()
    1.93 -                .filter(o1 -> o1.isSame(errorDesc))
    1.94 -                .findAny();
    1.95 -
    1.96 -        if (found.isPresent()) {
    1.97 -            found.get().info.addMessageInfixes(errorDesc.info.getMessageInfixes());
    1.98 -        } else {
    1.99 -            errors.add(errorDesc);
   1.100 -        }
   1.101 -    }
   1.102 -
   1.103 -    public List<ErrorDescription> done() {
   1.104 -        return errors.stream()
   1.105 -                .map(error -> delegate.addErrorImpl(error.info, error.fo))
   1.106 -                .collect(Collectors.toList());
   1.107 -    }
   1.108 -}