1.1 --- a/c.s.tools.ide.analysis.modernize/src/com/sun/tools/ide/analysis/modernize/impl/ResponseMerger.java	Thu Jun 15 10:19:33 2017 +0300
     1.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.3 @@ -1,87 +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): Ilia Gromov
    1.42 - */
    1.43 -package com.sun.tools.ide.analysis.modernize.impl;
    1.44 -
    1.45 -import java.util.ArrayList;
    1.46 -import java.util.List;
    1.47 -import java.util.Optional;
    1.48 -import org.netbeans.modules.cnd.api.model.syntaxerr.CsmErrorInfo;
    1.49 -import org.netbeans.modules.cnd.api.model.syntaxerr.CsmErrorProvider;
    1.50 -
    1.51 -/**
    1.52 - *
    1.53 - * @author Ilia Gromov
    1.54 - */
    1.55 -public class ResponseMerger implements CsmErrorProvider.Response {
    1.56 -
    1.57 -    private final List<ModernizeErrorInfo> bag = new ArrayList<>();
    1.58 -    private final CsmErrorProvider.Response delegate;
    1.59 -
    1.60 -    public ResponseMerger(CsmErrorProvider.Response delegate) {
    1.61 -        this.delegate = delegate;
    1.62 -    }
    1.63 -
    1.64 -    @Override
    1.65 -    public void addError(CsmErrorInfo errorInfo) {
    1.66 -        ModernizeErrorInfo o2 = (ModernizeErrorInfo) errorInfo;
    1.67 -        Optional<ModernizeErrorInfo> found = bag.stream()
    1.68 -                .filter(o1 -> isSame(o1, o2))
    1.69 -                .findAny();
    1.70 -
    1.71 -        if (found.isPresent()) {
    1.72 -            found.get().addMessageInfixes(o2.getMessageInfixes());
    1.73 -        } else {
    1.74 -            bag.add(o2);
    1.75 -        }
    1.76 -    }
    1.77 -
    1.78 -    @Override
    1.79 -    public void done() {
    1.80 -        bag.forEach(delegate::addError);
    1.81 -        delegate.done();
    1.82 -        bag.clear();
    1.83 -    }
    1.84 -
    1.85 -    public boolean isSame(ModernizeErrorInfo o1, ModernizeErrorInfo o2) {
    1.86 -        return o1.getStartOffset() == o2.getStartOffset()
    1.87 -                && o1.getEndOffset() == o2.getEndOffset()
    1.88 -                && o1.getDiagnostics().getCheckName().equals(o2.getDiagnostics().getCheckName());
    1.89 -    }
    1.90 -}