Attachment #133791 for bug #228994

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

Lines 137-143 Link Here

(-)a/cnd.asm/nbproject/project.xml (-1 / +1 lines)
137	<build-prerequisite/>	137	<build-prerequisite/>
138	<compile-dependency/>	138	<compile-dependency/>
139	<run-dependency>	139	<run-dependency>
140	<specification-version>8.0</specification-version>	140	<specification-version>8.32</specification-version>
141	</run-dependency>	141	</run-dependency>
142	</dependency>	142	</dependency>
143	<dependency>	143	<dependency>





import org.netbeans.modules.cnd.asm.model.AsmState;
import org.netbeans.modules.cnd.asm.model.lang.AsmElement;
import org.openide.util.Pair;

public class GoToLabelAction {
                

        Pair<AsmElement, AsmElement> pair = state.resolveLink(pos);
        
        if (pair != null) {
            return new int[] { pair.first().getStartOffset(),
                               pair.first().getEndOffset(),
                               pair.second().getStartOffset()
                             };                        
        } 
        

Lines 72-78 Link Here

(-)a/cnd.asm/src/org/netbeans/modules/cnd/asm/core/editor/AsmModelAccessorImpl.java (-2 / +2 lines)
72	import org.netbeans.modules.cnd.asm.model.lang.syntax.AsmParser;	72	import org.netbeans.modules.cnd.asm.model.lang.syntax.AsmParser;
73	import org.netbeans.modules.cnd.asm.model.util.AsmModelUtilities;	73	import org.netbeans.modules.cnd.asm.model.util.AsmModelUtilities;
74	import org.netbeans.modules.cnd.asm.model.util.EmptyAsmState;	74	import org.netbeans.modules.cnd.asm.model.util.EmptyAsmState;
75	import org.netbeans.modules.cnd.asm.model.util.Pair;	75	import org.openide.util.Pair;
76		76
77	public class AsmModelAccessorImpl implements AsmModelAccessor {	77	public class AsmModelAccessorImpl implements AsmModelAccessor {
78		78
Lines 215-221 Link Here
215	AsmElement result = resolver.getResult();	215	AsmElement result = resolver.getResult();
216		216
217	if (result != null) {	217	if (result != null) {
218	return Pair.getPair(inital, result);	218	return Pair.<AsmElement, AsmElement>of(inital, result);
219	}	219	}
220	}	220	}
221		221

Lines 48-54 Link Here

(-)a/cnd.asm/src/org/netbeans/modules/cnd/asm/model/AsmState.java (-1 / +1 lines)
48	import org.openide.util.Lookup;	48	import org.openide.util.Lookup;
49		49
50	import org.netbeans.modules.cnd.asm.model.lang.AsmElement;	50	import org.netbeans.modules.cnd.asm.model.lang.AsmElement;
51	import org.netbeans.modules.cnd.asm.model.util.Pair;	51	import org.openide.util.Pair;
52		52
53	public interface AsmState {	53	public interface AsmState {
54	AsmElement getElements();	54	AsmElement getElements();

Lines 36-41 Link Here

(-)a/cnd.asm/src/org/netbeans/modules/cnd/asm/model/util/EmptyAsmState.java (+1 lines)
36	import org.netbeans.modules.cnd.asm.model.AsmState;	36	import org.netbeans.modules.cnd.asm.model.AsmState;
37	import org.netbeans.modules.cnd.asm.model.lang.AsmElement;	37	import org.netbeans.modules.cnd.asm.model.lang.AsmElement;
38	import org.netbeans.modules.cnd.asm.model.lang.impl.LeafAsmElement;	38	import org.netbeans.modules.cnd.asm.model.lang.impl.LeafAsmElement;
		39	import org.openide.util.Pair;
39		40
40	public class EmptyAsmState implements AsmState,	41	public class EmptyAsmState implements AsmState,
41	AsmFakeable {	42	AsmFakeable {




/*
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 *
 * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
 *
 * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
 * Other names may be trademarks of their respective owners.
 *
 * The contents of this file are subject to the terms of either the GNU
 * General Public License Version 2 only ("GPL") or the Common
 * Development and Distribution License("CDDL") (collectively, the
 * "License"). You may not use this file except in compliance with the
 * License. You can obtain a copy of the License at
 * http://www.netbeans.org/cddl-gplv2.html
 * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
 * specific language governing permissions and limitations under the
 * License.  When distributing the software, include this License Header
 * Notice in each file and include the License file at
 * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
 * particular file as subject to the "Classpath" exception as provided
 * by Oracle in the GPL Version 2 section of the License file that
 * accompanied this code. If applicable, add the following below the
 * License Header, with the fields enclosed by brackets [] replaced by
 * your own identifying information:
 * "Portions Copyrighted [year] [name of copyright owner]"
 *
 * Contributor(s):
 *
 * The Original Software is NetBeans. The Initial Developer of the Original
 * Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
 * Microsystems, Inc. All Rights Reserved.
 *
 * If you wish your version of this file to be governed by only the CDDL
 * or only the GPL Version 2, indicate your decision by adding
 * "[Contributor] elects to include this software in this distribution
 * under the [CDDL or GPL Version 2] license." If you do not indicate a
 * single choice of license, a recipient has the option to distribute
 * your version of this file under either the CDDL, the GPL Version 2 or
 * to extend the choice of license to its licensees as provided above.
 * However, if you add GPL Version 2 code and therefore, elected the GPL
 * Version 2 license, then the option applies only if the new code is
 * made subject to such option by the copyright holder.
 */


package org.netbeans.modules.cnd.asm.model.util;

public class Pair<T1, T2> {
    private final T1 p1; 
    private final T2 p2; 
    
    public Pair(T1 p1, T2 p2) {
        this.p1 = p1;
        this.p2 = p2;
    }
    
    public T1 getFirst() {
        return p1;
    }
    
    public T2 getSecond() {
        return p2;
    }    
    
    public static <T1, T2> Pair<T1, T2> getPair(T1 p1, T2 p2) {
        return new Pair<T1,T2>(p1, p2);
    }
}




import org.xml.sax.Attributes;

import org.netbeans.modules.cnd.asm.model.lang.BitWidth;
import org.netbeans.modules.cnd.asm.model.util.Pair;
import org.netbeans.modules.cnd.asm.model.lang.instruction.Instruction;
import org.netbeans.modules.cnd.asm.model.lang.Register;
import org.netbeans.modules.cnd.asm.model.lang.instruction.InstructionArgs;
import static org.netbeans.modules.cnd.asm.model.xml.ModelXMLAttributes.*;
import org.openide.util.Pair;

public class ModelXMLRootContext implements XMLReaderContext {
        

                     XMLBaseRegister result = new DefaultXMLBaseRegister(ctx.getName(), ctx.getWidth());
                     Set<Register> children = new HashSet<Register>();
                     for (Pair<String, Integer> pair : ctx.getChildren()) {
                         XMLBaseRegister res = process(getForName(pair.first()));
                         children.addAll(res.getChildren());
                         children.add(res);
                         res.setDirectParent(result);

                String name = checkForName(attributes, REG_NAME_ATTRIBUTE); 
                String offset = checkForName(attributes, REG_OFFSET_ATTRIBUTE);
                
                children.add(Pair.<String, Integer>of(name, Integer.parseInt(offset)));
                return null;
            }
            

Lines 43-49 Link Here

(-)a/cnd.repository/nbproject/project.xml (-1 / +1 lines)
43	<build-prerequisite/>	43	<build-prerequisite/>
44	<compile-dependency/>	44	<compile-dependency/>
45	<run-dependency>	45	<run-dependency>
46	<specification-version>8.0</specification-version>	46	<specification-version>8.32</specification-version>
47	</run-dependency>	47	</run-dependency>
48	</dependency>	48	</dependency>
49	<dependency>	49	<dependency>




import org.netbeans.modules.cnd.debug.CndTraceFlags;
import org.netbeans.modules.cnd.repository.spi.Key;
import org.netbeans.modules.cnd.repository.spi.Persistent;
import org.netbeans.modules.cnd.repository.util.Pair;
import org.netbeans.modules.cnd.utils.CndUtils;
import org.openide.util.Pair;

/**
 * An in-memory cache for storing repository objects 

                    s.r.unlock();
                }
                if (value instanceof Persistent ) {
                    result.add(Pair.<Key,Persistent>of(key, (Persistent) value));
                    s.w.lock();
                    try {
                        s.storage.remove(key);




import org.netbeans.modules.cnd.repository.spi.Key;
import org.netbeans.modules.cnd.repository.spi.Key.Behavior;
import org.netbeans.modules.cnd.repository.spi.Persistent;
import org.netbeans.modules.cnd.repository.util.Pair;
import org.netbeans.modules.cnd.utils.CndUtils;
import org.openide.util.Lookup;
import org.openide.util.Pair;

/**
 * Implements a repository unit

    public void close() throws IOException {
        Collection<Pair<Key, Persistent>> hung = cache.clearHungObjects();
        for( Pair<Key, Persistent> pair : hung ) {
            putPhysically(pair.first(), pair.second());
        }
        singleFileStorage.close();
        multyFileStorage.close();




/*
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 *
 * Copyright 2010 Oracle and/or its affiliates. All rights reserved.
 *
 * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
 * Other names may be trademarks of their respective owners.
 *
 * The contents of this file are subject to the terms of either the GNU
 * General Public License Version 2 only ("GPL") or the Common
 * Development and Distribution License("CDDL") (collectively, the
 * "License"). You may not use this file except in compliance with the
 * License. You can obtain a copy of the License at
 * http://www.netbeans.org/cddl-gplv2.html
 * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
 * specific language governing permissions and limitations under the
 * License.  When distributing the software, include this License Header
 * Notice in each file and include the License file at
 * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
 * particular file as subject to the "Classpath" exception as provided
 * by Oracle in the GPL Version 2 section of the License file that
 * accompanied this code. If applicable, add the following below the
 * License Header, with the fields enclosed by brackets [] replaced by
 * your own identifying information:
 * "Portions Copyrighted [year] [name of copyright owner]"
 * 
 * If you wish your version of this file to be governed by only the CDDL
 * or only the GPL Version 2, indicate your decision by adding
 * "[Contributor] elects to include this software in this distribution
 * under the [CDDL or GPL Version 2] license." If you do not indicate a
 * single choice of license, a recipient has the option to distribute
 * your version of this file under either the CDDL, the GPL Version 2 or
 * to extend the choice of license to its licensees as provided above.
 * However, if you add GPL Version 2 code and therefore, elected the GPL
 * Version 2 license, then the option applies only if the new code is
 * made subject to such option by the copyright holder.
 * 
 * Contributor(s):
 * 
 * Portions Copyrighted 2008 Sun Microsystems, Inc.
 */

package org.netbeans.modules.cnd.repository.util;

/**
 * A simple struct, mainly for returning pairs of values
 * @author Vladimir Kvashin
 */
public class Pair<T1, T2> {
    
    public final T1 first;
    public final T2 second;
    
    public Pair(T1 first, T2 second) {
        this.first = first;
        this.second = second;
    }
    
}

Lines 358-364 Link Here

(-)a/csl.api/nbproject/project.xml (-1 / +1 lines)
358	<build-prerequisite/>	358	<build-prerequisite/>
359	<compile-dependency/>	359	<compile-dependency/>
360	<run-dependency>	360	<run-dependency>
361	<specification-version>8.0</specification-version>	361	<specification-version>8.32</specification-version>
362	</run-dependency>	362	</run-dependency>
363	</dependency>	363	</dependency>
364	<dependency>	364	<dependency>




import org.openide.filesystems.FileUtil;
import org.openide.loaders.DataObject;
import org.openide.util.Exceptions;
import org.openide.util.Pair;

/**
 *

                    r = instantiateRule(o);
                }
                if ( r != null ) {
                    rules.add( Pair.<Rule,FileObject>of( r, o ) );
                }
            }
        }
        Collections.sort(rules, new Comparator<Pair<Rule,FileObject>>() {
            @Override
            public int compare(Pair<Rule,FileObject> p1, Pair<Rule,FileObject> p2) {
                return p1.first().getDisplayName().compareTo(p2.first().getDisplayName());
            }
        });
        return rules;

        dir2node.put(rootFolder, rootNode);

        for( Pair<Rule,FileObject> pair : rules ) {
            Rule rule = pair.first();
            FileObject fo = pair.second();

            if ( rule instanceof ErrorRule ) {
                addRule( (ErrorRule)rule, (Map)dest );

        dir2node.put(rootFolder, rootNode);

        for( Pair<Rule,FileObject> pair : rules ) {
            Rule rule = pair.first();
            FileObject fo = pair.second();

            if ( rule instanceof AstRule ) {
                

        dir2node.put(rootFolder, rootNode);

        for( Pair<Rule,FileObject> pair : rules ) {
            Rule rule = pair.first();
            FileObject fo = pair.second();

            if ( rule instanceof SelectionRule ) {
                addRule((SelectionRule)rule, (List)dest );




/*
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 *
 * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
 *
 * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
 * Other names may be trademarks of their respective owners.
 *
 * The contents of this file are subject to the terms of either the GNU
 * General Public License Version 2 only ("GPL") or the Common
 * Development and Distribution License("CDDL") (collectively, the
 * "License"). You may not use this file except in compliance with the
 * License. You can obtain a copy of the License at
 * http://www.netbeans.org/cddl-gplv2.html
 * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
 * specific language governing permissions and limitations under the
 * License.  When distributing the software, include this License Header
 * Notice in each file and include the License file at
 * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
 * particular file as subject to the "Classpath" exception as provided
 * by Oracle in the GPL Version 2 section of the License file that
 * accompanied this code. If applicable, add the following below the
 * License Header, with the fields enclosed by brackets [] replaced by
 * your own identifying information:
 * "Portions Copyrighted [year] [name of copyright owner]"
 *
 * Contributor(s):
 *
 * The Original Software is NetBeans. The Initial Developer of the Original
 * Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
 * Microsystems, Inc. All Rights Reserved.
 *
 * If you wish your version of this file to be governed by only the CDDL
 * or only the GPL Version 2, indicate your decision by adding
 * "[Contributor] elects to include this software in this distribution
 * under the [CDDL or GPL Version 2] license." If you do not indicate a
 * single choice of license, a recipient has the option to distribute
 * your version of this file under either the CDDL, the GPL Version 2 or
 * to extend the choice of license to its licensees as provided above.
 * However, if you add GPL Version 2 code and therefore, elected the GPL
 * Version 2 license, then the option applies only if the new code is
 * made subject to such option by the copyright holder.
 */
package org.netbeans.modules.csl.hints.infrastructure;

/**
 *
 * @author Jan Lahoda
 */
public final class Pair<A, B> {

    private final A a;
    private final B b;

    public Pair(A a, B b) {
        this.a = a;
        this.b = b;
    }

    public A getA() {
        return a;
    }

    public B getB() {
        return b;
    }

    public static <A,B> Pair<A,B> of(A a, B b) {
      return new Pair<A, B>(a, b);
    } 
}




import org.netbeans.modules.csl.editor.codetemplates.CslCorePackageAccessor;
import org.netbeans.modules.csl.hints.infrastructure.GsfHintsManager;
import org.netbeans.modules.csl.hints.infrastructure.HintsSettings;
import org.netbeans.modules.csl.hints.infrastructure.Pair;
import org.netbeans.modules.csl.spi.DefaultError;
import org.netbeans.modules.csl.spi.GsfUtilities;
import org.netbeans.modules.csl.spi.ParserResult;

import org.openide.filesystems.XMLFileSystem;
import org.openide.loaders.DataObject;
import org.openide.loaders.DataObjectNotFoundException;
import org.openide.util.Pair;
import org.openide.util.test.MockLookup;

/**

            }
        }

        return Pair.<EditHistory,String>of(history, modifiedText);
    }

    protected final Pair<EditHistory,String> getEditHistory(BaseDocument doc, final EditHistory history, String... edits) throws BadLocationException {

            }
        }

        return Pair.<EditHistory,String>of(history, modifiedText);
    }

//    /**

Lines 2-6 Link Here

(-)a/css.editor/manifest.mf (-1 / +1 lines)
2	OpenIDE-Module: org.netbeans.modules.css.editor/1	2	OpenIDE-Module: org.netbeans.modules.css.editor/1
3	OpenIDE-Module-Layer: org/netbeans/modules/css/resources/layer.xml	3	OpenIDE-Module-Layer: org/netbeans/modules/css/resources/layer.xml
4	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/css/resources/Bundle.properties	4	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/css/resources/Bundle.properties
5	OpenIDE-Module-Specification-Version: 1.52	5	OpenIDE-Module-Specification-Version: 1.53
6	AutoUpdate-Show-In-Client: false	6	AutoUpdate-Show-In-Client: false

Lines 179-185 Link Here

(-)a/css.editor/nbproject/project.xml (-2 / +2 lines)
179	<build-prerequisite/>	179	<build-prerequisite/>
180	<compile-dependency/>	180	<compile-dependency/>
181	<run-dependency>	181	<run-dependency>
182	<specification-version>1.28</specification-version>	182	<specification-version>1.46</specification-version>
183	</run-dependency>	183	</run-dependency>
184	</dependency>	184	</dependency>
185	<dependency>	185	<dependency>
Lines 259-265 Link Here
259	<build-prerequisite/>	259	<build-prerequisite/>
260	<compile-dependency/>	260	<compile-dependency/>
261	<run-dependency>	261	<run-dependency>
262	<specification-version>8.0</specification-version>	262	<specification-version>8.32</specification-version>
263	</run-dependency>	263	</run-dependency>
264	</dependency>	264	</dependency>
265	<dependency>	265	<dependency>

Lines 51-57 Link Here

(-)a/css.editor/src/org/netbeans/modules/css/editor/csl/CssDeclarationFinder.java (-3 / +3 lines)
51	import org.netbeans.modules.css.editor.module.spi.FeatureCancel;	51	import org.netbeans.modules.css.editor.module.spi.FeatureCancel;
52	import org.netbeans.modules.css.editor.module.spi.FutureParamTask;	52	import org.netbeans.modules.css.editor.module.spi.FutureParamTask;
53	import org.netbeans.modules.css.lib.api.CssParserResult;	53	import org.netbeans.modules.css.lib.api.CssParserResult;
54	import org.netbeans.modules.web.common.api.Pair;	54	import org.openide.util.Pair;
55		55
56	/**	56	/**
57	* Hyperlinking for @import declaration only.	57	* Hyperlinking for @import declaration only.
Lines 80-87 Link Here
80	public OffsetRange getReferenceSpan(Document doc, int caretOffset) {	80	public OffsetRange getReferenceSpan(Document doc, int caretOffset) {
81	Pair<OffsetRange, FutureParamTask<DeclarationLocation, EditorFeatureContext>> declarationLocation = CssModuleSupport.getDeclarationLocation(doc, caretOffset, new FeatureCancel());	81	Pair<OffsetRange, FutureParamTask<DeclarationLocation, EditorFeatureContext>> declarationLocation = CssModuleSupport.getDeclarationLocation(doc, caretOffset, new FeatureCancel());
82	if(declarationLocation != null) {	82	if(declarationLocation != null) {
83	taskRef.set(declarationLocation.getB());	83	taskRef.set(declarationLocation.second());
84	return declarationLocation.getA();	84	return declarationLocation.first();
85	}	85	}
86	return OffsetRange.NONE;	86	return OffsetRange.NONE;
87	}	87	}

Lines 55-63 Link Here

(-)a/css.editor/src/org/netbeans/modules/css/editor/module/CssModuleSupport.java (-1 / +1 lines)
55	import org.netbeans.modules.css.lib.api.Node;	55	import org.netbeans.modules.css.lib.api.Node;
56	import org.netbeans.modules.css.lib.api.NodeVisitor;	56	import org.netbeans.modules.css.lib.api.NodeVisitor;
57	import org.netbeans.modules.css.lib.api.properties.PropertyDefinition;	57	import org.netbeans.modules.css.lib.api.properties.PropertyDefinition;
58	import org.netbeans.modules.web.common.api.Pair;
59	import org.openide.filesystems.FileObject;	58	import org.openide.filesystems.FileObject;
60	import org.openide.util.Lookup;	59	import org.openide.util.Lookup;
		60	import org.openide.util.Pair;
61		61
62	/**	62	/**
63	*	63	*




import java.util.ArrayList;
import java.util.Collection;
import java.util.Properties;

import org.openide.util.Exceptions;
import org.openide.util.Lookup;
import org.openide.util.Pair;

/**
 *

            }
            String key = loadConvert(lr.lineBuf, 0, keyLen, convtBuf);
            String value = loadConvert(lr.lineBuf, valueStart, limit - valueStart, convtBuf);
            col.add(Pair.<String, String>of(key, value));
        }
    }





import org.netbeans.modules.parsing.api.Snapshot;
import org.netbeans.modules.web.common.api.LexerUtils;
import org.netbeans.modules.web.common.api.Lines;
import org.netbeans.modules.web.common.api.Pair;
import org.netbeans.modules.web.common.api.WebUtils;
import org.openide.filesystems.FileObject;
import org.openide.util.NbBundle;
import org.openide.util.Pair;
import org.openide.util.lookup.ServiceProvider;

/**

            }
        };

        return Pair.<OffsetRange, FutureParamTask<DeclarationLocation, EditorFeatureContext>>of(foundRange, callable);
    }

    @Override

Lines 54-61 Link Here

(-)a/css.editor/src/org/netbeans/modules/css/editor/module/spi/CssEditorModule.java (-1 / +1 lines)
54	import org.netbeans.modules.csl.api.OffsetRange;	54	import org.netbeans.modules.csl.api.OffsetRange;
55	import org.netbeans.modules.csl.api.StructureItem;	55	import org.netbeans.modules.csl.api.StructureItem;
56	import org.netbeans.modules.css.lib.api.NodeVisitor;	56	import org.netbeans.modules.css.lib.api.NodeVisitor;
57	import org.netbeans.modules.web.common.api.Pair;
58	import org.openide.filesystems.FileObject;	57	import org.openide.filesystems.FileObject;
		58	import org.openide.util.Pair;
59		59
60	/**	60	/**
61	* The basic class clients wanting to extend the CSS editor functionality needs	61	* The basic class clients wanting to extend the CSS editor functionality needs




import org.netbeans.modules.css.lib.api.properties.PropertyDefinition;
import org.netbeans.modules.parsing.api.Snapshot;
import org.netbeans.modules.web.common.api.LexerUtils;
import org.netbeans.modules.web.common.api.Pair;
import org.openide.filesystems.FileObject;
import org.openide.util.NbBundle;
import org.openide.util.Pair;

/**
 *


        PropertyCategory category = PropertyCategory.DEFAULT;
        for(Pair<String, String> pair : parseBundle) {
            String name = pair.first();
            String value = pair.second();
            
            if(name.startsWith("$")) {
                //property category

Lines 3-6 Link Here

(-)a/css.lib/manifest.mf (-1 / +1 lines)
3	OpenIDE-Module: org.netbeans.modules.css.lib/1	3	OpenIDE-Module: org.netbeans.modules.css.lib/1
4	OpenIDE-Module-Layer: org/netbeans/modules/css/lib/layer.xml	4	OpenIDE-Module-Layer: org/netbeans/modules/css/lib/layer.xml
5	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/css/lib/Bundle.properties	5	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/css/lib/Bundle.properties
6	OpenIDE-Module-Specification-Version: 1.54	6	OpenIDE-Module-Specification-Version: 1.55

Lines 54-60 Link Here

(-)a/css.lib/nbproject/project.xml (-2 / +2 lines)
54	<build-prerequisite/>	54	<build-prerequisite/>
55	<compile-dependency/>	55	<compile-dependency/>
56	<run-dependency>	56	<run-dependency>
57	<specification-version>1.21</specification-version>	57	<specification-version>1.46</specification-version>
58	</run-dependency>	58	</run-dependency>
59	</dependency>	59	</dependency>
60	<dependency>	60	<dependency>
Lines 70-76 Link Here
70	<build-prerequisite/>	70	<build-prerequisite/>
71	<compile-dependency/>	71	<compile-dependency/>
72	<run-dependency>	72	<run-dependency>
73	<specification-version>8.18</specification-version>	73	<specification-version>8.32</specification-version>
74	</run-dependency>	74	</run-dependency>
75	</dependency>	75	</dependency>
76	<dependency>	76	<dependency>




import java.util.logging.Logger;
import static org.netbeans.modules.css.lib.api.properties.GrammarResolver.Log.*;
import org.netbeans.modules.css.lib.properties.GrammarParseTreeBuilder;
import org.openide.util.Pair;

/**
 * Resolves a css property value against its grammar.

        }

        Pair<InputState, Collection<ValueGrammarElement>> pair = resolvedSomething.get(lastResolved);
        pair.second().add(valueGrammarElement);
    }

    private void groupMemberResolved(GrammarElement member, GroupGrammarElement group, InputState state, boolean root) {

        if (LOG) {
            log(ALTERNATIVES, String.format("input matched %s, %s", member.path(), state));
        }
        resolvedSomething.put(group, Pair.<InputState, Collection<ValueGrammarElement>>of(state, new LinkedList<ValueGrammarElement>()));
        lastResolved = group;
    }

    private Set<ValueGrammarElement> getAlternatives() {
        HashSet<ValueGrammarElement> alternatives = new HashSet<>();
        for (Pair<InputState, Collection<ValueGrammarElement>> tri : resolvedSomething.values()) {
            for (ValueGrammarElement value : tri.second()) {
                alternatives.add(value);
            }
        }

Lines 3-7 Link Here

(-)a/css.prep/manifest.mf (-1 / +1 lines)
3	OpenIDE-Module: org.netbeans.modules.css.prep	3	OpenIDE-Module: org.netbeans.modules.css.prep
4	OpenIDE-Module-Layer: org/netbeans/modules/css/prep/layer.xml	4	OpenIDE-Module-Layer: org/netbeans/modules/css/prep/layer.xml
5	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/css/prep/Bundle.properties	5	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/css/prep/Bundle.properties
6	OpenIDE-Module-Specification-Version: 1.10	6	OpenIDE-Module-Specification-Version: 1.11
7		7




                    <compile-dependency/>
                    <run-dependency>
                        <release-version>1</release-version>
                        <specification-version>1.53</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>

                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>1.46</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>

                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>8.32</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>




import org.netbeans.modules.web.common.api.DependencyType;
import org.netbeans.modules.web.common.api.LexerUtils;
import org.netbeans.modules.web.common.api.Lines;
import org.netbeans.modules.web.common.api.Pair;
import org.netbeans.modules.web.common.api.WebUtils;
import org.openide.filesystems.FileObject;
import org.openide.util.Exceptions;
import org.openide.util.Pair;
import org.openide.util.lookup.ServiceProvider;

/**

                        return DeclarationLocation.NONE;
                    }
                };
                return Pair.<OffsetRange, FutureParamTask<DeclarationLocation, EditorFeatureContext>>of(foundRange, callable);

            case SASS_VAR:
            case AT_IDENT: //less var //TODO - add default directives - see the css grammar file comment about that

                        return DeclarationLocation.NONE;
                    }
                };
                return Pair.<OffsetRange, FutureParamTask<DeclarationLocation, EditorFeatureContext>>of(foundRange, callable);

            default:
                return null;




import org.netbeans.api.extexecution.input.InputProcessor;
import org.netbeans.api.extexecution.input.InputProcessors;
import org.netbeans.api.progress.ProgressUtils;
import org.netbeans.modules.web.common.api.Pair;
import org.openide.util.NbBundle;
import org.openide.util.Pair;
import org.openide.util.Parameters;
import org.openide.util.Utilities;
import org.openide.windows.InputOutput;

     */
    public ExternalExecutable(String command) {
        Pair<String, List<String>> parsedCommand = parseCommand(command);
        executable = parsedCommand.first();
        parameters = parsedCommand.second();
        this.command = command.trim();
    }


            return Pair.of(tokens[0].trim(), Collections.<String>emptyList());
        }
        Pair<String, List<String>> parsedCommand = Pair.of(tokens[0].trim(), Arrays.asList(Utilities.parseParameters(tokens[1].trim())));
        LOGGER.log(Level.FINE, "Parameters parsed: {0} {1}", new Object[] {parsedCommand.first(), parsedCommand.second()});
        return parsedCommand;
    }


Lines 67-73 Link Here

(-)a/css.prep/src/org/netbeans/modules/css/prep/util/ExternalExecutableValidator.java (-1 / +1 lines)
67	public static String validateCommand(@NullAllowed String command, @NullAllowed String executableName) {	67	public static String validateCommand(@NullAllowed String command, @NullAllowed String executableName) {
68	String executable = null;	68	String executable = null;
69	if (command != null) {	69	if (command != null) {
70	executable = ExternalExecutable.parseCommand(command).getA();	70	executable = ExternalExecutable.parseCommand(command).first();
71	}	71	}
72	if (executableName == null) {	72	if (executableName == null) {
73	return FileUtils.validateFile(executable, false);	73	return FileUtils.validateFile(executable, false);

Lines 64-70 Link Here

(-)a/debugger.jpda.ui/nbproject/project.xml (-2 / +2 lines)
64	<compile-dependency/>	64	<compile-dependency/>
65	<run-dependency>	65	<run-dependency>
66	<release-version>2</release-version>	66	<release-version>2</release-version>
67	<specification-version>2.42</specification-version>	67	<specification-version>2.42</specification-version>
68	</run-dependency>	68	</run-dependency>
69	</dependency>	69	</dependency>
70	<dependency>	70	<dependency>
Lines 277-283 Link Here
277	<build-prerequisite/>	277	<build-prerequisite/>
278	<compile-dependency/>	278	<compile-dependency/>
279	<run-dependency>	279	<run-dependency>
280	<specification-version>8.0</specification-version>	280	<specification-version>8.32</specification-version>
281	</run-dependency>	281	</run-dependency>
282	</dependency>	282	</dependency>
283	<dependency>	283	<dependency>




import org.openide.NotifyDescriptor;
import org.openide.util.HelpCtx;
import org.openide.util.NbBundle;
import org.openide.util.Pair;

/**
 * @author  Jan Jancura

        ResourceBundle bundle = NbBundle.getBundle(ClassBreakpointPanel.class);
        String tooltipText = bundle.getString("TTT_TF_Class_Breakpoint_Class_Name");
        Pair<JScrollPane, JEditorPane> editorCC = addClassNameEditorCC(JavaClassNbDebugEditorKit.MIME_TYPE, pSettings, className, tooltipText);
        spClassName = editorCC.first();
        epClassName = editorCC.second();
        epClassName.getAccessibleContext().setAccessibleName(bundle.getString("ACSN_Method_Breakpoint_ClassName"));
        epClassName.getAccessibleContext().setAccessibleDescription(bundle.getString("ACSD_Class_Breakpoint_ClassName"));
        HelpCtx.setHelpIDString(epClassName, HELP_ID);

        }
        sle.setToolTipText(tooltipText);
        epClassName.setToolTipText(tooltipText);
        return Pair.<JScrollPane, JEditorPane>of(sle, epClassName);
    }
    
    // Variables declaration - do not modify//GEN-BEGIN:variables

Lines 59-64 Link Here

(-)a/debugger.jpda.ui/src/org/netbeans/modules/debugger/jpda/ui/breakpoints/ExceptionBreakpointPanel.java (-2 / +3 lines)
59	import org.openide.NotifyDescriptor;	59	import org.openide.NotifyDescriptor;
60	import org.openide.util.HelpCtx;	60	import org.openide.util.HelpCtx;
61	import org.openide.util.NbBundle;	61	import org.openide.util.NbBundle;
		62	import org.openide.util.Pair;
62		63
63		64
64	/**	65	/**
Lines 114-121 Link Here
114	String tooltipText = bundle.getString("TTT_TF_Field_Breakpoint_Class_Name");	115	String tooltipText = bundle.getString("TTT_TF_Field_Breakpoint_Class_Name");
115	Pair<JScrollPane, JEditorPane> editorCC = ClassBreakpointPanel.addClassNameEditorCC(	116	Pair<JScrollPane, JEditorPane> editorCC = ClassBreakpointPanel.addClassNameEditorCC(
116	ExceptionClassNbDebugEditorKit.MIME_TYPE, pSettings, className, tooltipText);	117	ExceptionClassNbDebugEditorKit.MIME_TYPE, pSettings, className, tooltipText);
117	spExceptionClassName = editorCC.get1();	118	spExceptionClassName = editorCC.first();
118	epExceptionClassName = editorCC.get2();	119	epExceptionClassName = editorCC.second();
119	epExceptionClassName.getAccessibleContext().setAccessibleName(bundle.getString("ACSN_Method_Breakpoint_ClassName"));	120	epExceptionClassName.getAccessibleContext().setAccessibleName(bundle.getString("ACSN_Method_Breakpoint_ClassName"));
120	epExceptionClassName.getAccessibleContext().setAccessibleDescription(bundle.getString("ACSD_Exception_Breakpoint_ClassName"));	121	epExceptionClassName.getAccessibleContext().setAccessibleDescription(bundle.getString("ACSD_Exception_Breakpoint_ClassName"));
121	HelpCtx.setHelpIDString(epExceptionClassName, HELP_ID);	122	HelpCtx.setHelpIDString(epExceptionClassName, HELP_ID);




import org.openide.NotifyDescriptor;
import org.openide.util.HelpCtx;
import org.openide.util.NbBundle;
import org.openide.util.Pair;

/**
 * @author  Jan Jancura

        ResourceBundle bundle = NbBundle.getBundle(FieldBreakpointPanel.class);
        String tooltipText = bundle.getString("TTT_TF_Field_Breakpoint_Class_Name");
        Pair<JScrollPane, JEditorPane> editorCC = ClassBreakpointPanel.addClassNameEditorCC(JavaClassNbDebugEditorKit.MIME_TYPE, pSettings, className, tooltipText);
        spClassName = editorCC.first();
        epClassName = editorCC.second();
        epClassName.getAccessibleContext().setAccessibleName(bundle.getString("ACSN_Method_Breakpoint_ClassName"));
        epClassName.getAccessibleContext().setAccessibleDescription(bundle.getString("ACSD_Field_Breakpoint_ClassName"));
        HelpCtx.setHelpIDString(epClassName, HELP_ID);
        jLabel3.setLabelFor(spClassName);
        
        editorCC = ClassBreakpointPanel.addClassNameEditorCC(JavaFieldNbDebugEditorKit.MIME_TYPE, null, b.getFieldName(), bundle.getString("TTT_TF_Field_Breakpoint_Field_Name"));
        spFieldName = editorCC.first();
        epFieldName = editorCC.second();
        
        jLabel1.setLabelFor(spFieldName);
        java.awt.GridBagConstraints gridBagConstraints = new java.awt.GridBagConstraints();




import org.openide.ErrorManager;
import org.openide.util.HelpCtx;
import org.openide.util.NbBundle;
import org.openide.util.Pair;

/**
 * @author  Jan Jancura

        className = ClassBreakpointPanel.concatClassFilters(cf);
        String tooltipText = NbBundle.getMessage(MethodBreakpointPanel.class, "TTT_TF_Field_Breakpoint_Class_Name");
        Pair<JScrollPane, JEditorPane> editorCC = ClassBreakpointPanel.addClassNameEditorCC(JavaClassNbDebugEditorKit.MIME_TYPE, null, className, tooltipText);
        spClassName = editorCC.first();
        epClassName = editorCC.second();
        epClassName.getAccessibleContext().setAccessibleName(NbBundle.getMessage(MethodBreakpointPanel.class, "ACSN_Method_Breakpoint_ClassName"));
        epClassName.getAccessibleContext().setAccessibleDescription(NbBundle.getMessage(MethodBreakpointPanel.class, "ACSD_Method_Breakpoint_ClassName"));
        jLabel3.setLabelFor(spClassName);

        panelClassName.add(java.awt.BorderLayout.CENTER, spClassName);
        
        editorCC = ClassBreakpointPanel.addClassNameEditorCC(JavaMethodNbDebugEditorKit.MIME_TYPE, null, className, org.openide.util.NbBundle.getMessage(MethodBreakpointPanel.class, "TTT_TF_Method_Breakpoint_Method_Name"));
        spMethodName = editorCC.first();
        epMethodName = editorCC.second();
        jLabel1.setLabelFor(spMethodName);
        java.awt.GridBagConstraints gridBagConstraints = new java.awt.GridBagConstraints();
        gridBagConstraints.gridx = 1;




/*
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 *
 * Copyright 2012 Oracle and/or its affiliates. All rights reserved.
 *
 * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
 * Other names may be trademarks of their respective owners.
 *
 * The contents of this file are subject to the terms of either the GNU
 * General Public License Version 2 only ("GPL") or the Common
 * Development and Distribution License("CDDL") (collectively, the
 * "License"). You may not use this file except in compliance with the
 * License. You can obtain a copy of the License at
 * http://www.netbeans.org/cddl-gplv2.html
 * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
 * specific language governing permissions and limitations under the
 * License.  When distributing the software, include this License Header
 * Notice in each file and include the License file at
 * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
 * particular file as subject to the "Classpath" exception as provided
 * by Oracle in the GPL Version 2 section of the License file that
 * accompanied this code. If applicable, add the following below the
 * License Header, with the fields enclosed by brackets [] replaced by
 * your own identifying information:
 * "Portions Copyrighted [year] [name of copyright owner]"
 *
 * If you wish your version of this file to be governed by only the CDDL
 * or only the GPL Version 2, indicate your decision by adding
 * "[Contributor] elects to include this software in this distribution
 * under the [CDDL or GPL Version 2] license." If you do not indicate a
 * single choice of license, a recipient has the option to distribute
 * your version of this file under either the CDDL, the GPL Version 2 or
 * to extend the choice of license to its licensees as provided above.
 * However, if you add GPL Version 2 code and therefore, elected the GPL
 * Version 2 license, then the option applies only if the new code is
 * made subject to such option by the copyright holder.
 *
 * Contributor(s):
 *
 * Portions Copyrighted 2012 Sun Microsystems, Inc.
 */
package org.netbeans.modules.debugger.jpda.ui.breakpoints;

/**
 * A pair of values
 * 
 * @author Martin Entlicher
 */
final class Pair<T1, T2> {
        
    private final T1 o1;
    private final T2 o2;

    public Pair(final T1 o1, final T2 o2) {
        this.o1 = o1;
        this.o2 = o2;
    }

    public T1 get1() {
        return o1;
    }

    public T2 get2() {
        return o2;
    }

}

Lines 2-6 Link Here

(-)a/html.editor/manifest.mf (-1 / +1 lines)
2	OpenIDE-Module: org.netbeans.modules.html.editor/2	2	OpenIDE-Module: org.netbeans.modules.html.editor/2
3	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/html/editor/resources/Bundle.properties	3	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/html/editor/resources/Bundle.properties
4	OpenIDE-Module-Layer: org/netbeans/modules/html/editor/resources/layer.xml	4	OpenIDE-Module-Layer: org/netbeans/modules/html/editor/resources/layer.xml
5	OpenIDE-Module-Specification-Version: 2.19	5	OpenIDE-Module-Specification-Version: 2.20
6	AutoUpdate-Show-In-Client: false	6	AutoUpdate-Show-In-Client: false

Lines 276-282 Link Here

(-)a/html.editor/nbproject/project.xml (-2 / +2 lines)
276	<build-prerequisite/>	276	<build-prerequisite/>
277	<compile-dependency/>	277	<compile-dependency/>
278	<run-dependency>	278	<run-dependency>
279	<specification-version>1.12</specification-version>	279	<specification-version>1.46</specification-version>
280	</run-dependency>	280	</run-dependency>
281	</dependency>	281	</dependency>
282	<dependency>	282	<dependency>
Lines 365-371 Link Here
365	<build-prerequisite/>	365	<build-prerequisite/>
366	<compile-dependency/>	366	<compile-dependency/>
367	<run-dependency>	367	<run-dependency>
368	<specification-version>8.0</specification-version>	368	<specification-version>8.32</specification-version>
369	</run-dependency>	369	</run-dependency>
370	</dependency>	370	</dependency>
371	<dependency>	371	<dependency>




import org.netbeans.modules.html.editor.api.gsf.HtmlParserResult;
import org.netbeans.modules.html.editor.lib.api.elements.*;
import org.netbeans.modules.parsing.api.Snapshot;
import org.netbeans.modules.web.common.api.Pair;
import org.openide.filesystems.FileObject;
import org.openide.util.NbBundle;
import static org.netbeans.modules.html.editor.gsf.Bundle.*;
import org.openide.util.Pair;

/**
 *

        if (cache != null) {
            Pair<ParserResult, List<HtmlStructureItem>> pair = cache.get();
            if (pair != null) {
                if (info == pair.first()) {
                    return pair.second();
                }
            }
        }


        Snapshot snapshot = info.getSnapshot();
        FileObject file = snapshot.getSource().getFileObject();
        List<HtmlStructureItem> elements = new ArrayList<HtmlStructureItem>();
        for(OpenTag tag : root.children(OpenTag.class)) {
            HtmlElementHandle handle = new HtmlElementHandle(tag, file);
            HtmlStructureItem si = new HtmlStructureItem(tag, handle, snapshot);
            elements.add(si);
        }

        //cache
        Pair<ParserResult, List<HtmlStructureItem>> pair = Pair.of(info, elements);
        cache = new WeakReference<Pair<ParserResult, List<HtmlStructureItem>>>(pair);

        return elements;

Lines 425-431 Link Here

(-)a/java.hints/nbproject/project.xml (-1 / +1 lines)
425	<build-prerequisite/>	425	<build-prerequisite/>
426	<compile-dependency/>	426	<compile-dependency/>
427	<run-dependency>	427	<run-dependency>
428	<specification-version>8.10</specification-version>	428	<specification-version>8.32</specification-version>
429	</run-dependency>	429	</run-dependency>
430	</dependency>	430	</dependency>
431	<dependency>	431	<dependency>




import org.netbeans.api.java.source.support.SelectionAwareJavaSourceTaskFactory;
import org.netbeans.modules.java.editor.rename.InstantRenamePerformer;
import org.netbeans.modules.java.hints.errors.Utilities;
import org.netbeans.modules.java.hints.infrastructure.Pair;
import org.netbeans.modules.java.hints.spi.AbstractHint;
import org.netbeans.spi.editor.hints.ChangeInfo;
import org.netbeans.spi.editor.hints.ErrorDescription;

import org.openide.loaders.DataObjectNotFoundException;
import org.openide.util.Exceptions;
import org.openide.util.NbBundle;
import org.openide.util.Pair;

/**
 *

	    if (resolvedArguments != null) {
		nueSuperConstructorCallRealArguments = new LinkedList<ExpressionTree>();

		Iterator<? extends TypeMirror> typeIt   = resolvedArguments.first().iterator();
		Iterator<String>               nameIt   = resolvedArguments.second().iterator();

		while (typeIt.hasNext() && nameIt.hasNext()) {
		    TypeMirror tm = typeIt.next();




import org.netbeans.api.java.source.CompilationInfo;
import org.netbeans.api.java.source.CompilationInfo.CacheClearPolicy;
import org.netbeans.api.java.source.support.CancellableTreePathScanner;
import org.netbeans.modules.java.hints.infrastructure.Pair;
import org.netbeans.modules.java.hints.introduce.Flow;
import org.netbeans.modules.java.hints.introduce.Flow.FlowResult;
import org.netbeans.spi.java.hints.Hint;

import org.netbeans.spi.java.hints.TriggerPattern;
import org.netbeans.spi.java.hints.TriggerPatterns;
import org.openide.util.NbBundle;
import org.openide.util.Pair;

/**
 *

            }
        }.scan(info.getCompilationUnit(), null);

        info.putCachedValue(KEY_COMPUTED_ASSIGNMENTS, result = Pair.<Set<Tree>, Set<Element>>of(usedAssignments, usedVariables), CacheClearPolicy.ON_TASK_END);

        return result;
    }

        if (ctx.isCanceled() || computedAssignments == null) return null;

        final CompilationInfo info = ctx.getInfo();
        final Set<Tree> usedAssignments = computedAssignments.first();
        final Set<Element> usedVariables = computedAssignments.second();
        Element var = info.getTrees().getElement(ctx.getVariables().get("$var"));
        Tree value = ctx.getVariables().get("$value").getLeaf();


Lines 52-58 Link Here

(-)a/java.hints/src/org/netbeans/modules/java/hints/errors/ChangeMethodParameters.java (-1 / +1 lines)
52	import org.netbeans.api.java.source.TreePathHandle;	52	import org.netbeans.api.java.source.TreePathHandle;
53	import org.netbeans.api.java.source.TreeUtilities;	53	import org.netbeans.api.java.source.TreeUtilities;
54	import org.netbeans.modules.java.hints.infrastructure.ErrorHintsProvider;	54	import org.netbeans.modules.java.hints.infrastructure.ErrorHintsProvider;
55	import org.netbeans.modules.java.hints.infrastructure.Pair;
56	import org.netbeans.modules.java.hints.spi.ErrorRule;	55	import org.netbeans.modules.java.hints.spi.ErrorRule;
57	import org.netbeans.modules.java.hints.spi.ErrorRule.Data;	56	import org.netbeans.modules.java.hints.spi.ErrorRule.Data;
58	import org.netbeans.modules.refactoring.java.api.ChangeParametersRefactoring;	57	import org.netbeans.modules.refactoring.java.api.ChangeParametersRefactoring;
Lines 60-65 Link Here
60	import org.netbeans.spi.editor.hints.Fix;	59	import org.netbeans.spi.editor.hints.Fix;
61	import org.openide.util.Exceptions;	60	import org.openide.util.Exceptions;
62	import org.openide.util.NbBundle;	61	import org.openide.util.NbBundle;
		62	import org.openide.util.Pair;
63		63
64		64
65	public class ChangeMethodParameters implements ErrorRule<Void> {	65	public class ChangeMethodParameters implements ErrorRule<Void> {




import org.netbeans.modules.java.hints.errors.CreateClassFix.CreateInnerClassFix;
import org.netbeans.modules.java.hints.errors.CreateClassFix.CreateOuterClassFix;
import org.netbeans.modules.java.hints.infrastructure.ErrorHintsProvider;
import org.netbeans.modules.java.hints.infrastructure.Pair;
import org.netbeans.modules.java.hints.spi.ErrorRule;
import org.netbeans.spi.editor.hints.Fix;
import org.openide.ErrorManager;

import static org.netbeans.modules.java.hints.errors.CreateElementUtilities.*;
import org.netbeans.modules.java.hints.errors.ErrorFixesFakeHint.FixKind;
import org.netbeans.modules.java.hints.errors.Utilities.MethodArguments;
import org.openide.util.Pair;

/**
 *

    }

    private static List<Fix> prepareCreateOuterClassFix(CompilationInfo info, TreePath invocation, Element source, Set<Modifier> modifiers, String simpleName, List<? extends ExpressionTree> realArguments, TypeMirror superType, ElementKind kind, int numTypeParameters) {
        Pair<List<? extends TypeMirror>, List<String>> formalArguments = invocation != null ? Utilities.resolveArguments(info, invocation, realArguments, null) : Pair.<List<? extends TypeMirror>, List<String>>of(null, null);

        if (formalArguments == null) {
            return Collections.<Fix>emptyList();


        PackageElement packageElement = (PackageElement) (source instanceof PackageElement ? source : info.getElementUtilities().outermostTypeElement(source).getEnclosingElement());

        return Collections.<Fix>singletonList(new CreateOuterClassFix(info, root, packageElement.getQualifiedName().toString(), simpleName, modifiers, formalArguments.first(), formalArguments.second(), superType, kind, numTypeParameters));
    }

    private static List<Fix> prepareCreateInnerClassFix(CompilationInfo info, TreePath invocation, TypeElement target, Set<Modifier> modifiers, String simpleName, List<? extends ExpressionTree> realArguments, TypeMirror superType, ElementKind kind, int numTypeParameters) {
        Pair<List<? extends TypeMirror>, List<String>> formalArguments = invocation != null ? Utilities.resolveArguments(info, invocation, realArguments, target) : Pair.<List<? extends TypeMirror>, List<String>>of(null, null);

        if (formalArguments == null) {
            return Collections.<Fix>emptyList();

        if (targetFile == null)
            return Collections.<Fix>emptyList();

        return Collections.<Fix>singletonList(new CreateInnerClassFix(info, simpleName, modifiers, target, formalArguments.first(), formalArguments.second(), superType, kind, numTypeParameters, targetFile));
    }

    private static ElementKind getClassType(Set<ElementKind> types) {




import org.netbeans.modules.java.hints.errors.ImportClass.ImportCandidatesHolder;
import org.netbeans.modules.java.hints.infrastructure.CreatorBasedLazyFixList;
import org.netbeans.modules.java.hints.infrastructure.ErrorHintsProvider;
import org.netbeans.modules.java.hints.infrastructure.Pair;
import org.netbeans.modules.java.hints.spi.ErrorRule;
import org.netbeans.modules.java.preprocessorbridge.spi.ImportProcessor;
import org.netbeans.spi.editor.hints.ChangeInfo;

import org.openide.util.Lookup;
import org.openide.util.NbBundle;
import org.openide.util.NbBundle.Messages;
import org.openide.util.Pair;
import org.openide.util.RequestProcessor;



            Element el = info.getTrees().getElement(new TreePath(new TreePath(new TreePath(info.getCompilationUnit()), it), it.getQualifiedIdentifier()));

            if (candidates != null && el != null) {
                List<Element> a = candidates.first();
                if (a != null && a.contains(el)) {
                    return Collections.<Fix>emptyList();
                }

            imp = imp.getParentPath();
        }

        List<Element> filtered = candidates.first();
        List<Element> unfiltered = candidates.second();
        List<Fix> fixes = new ArrayList<Fix>();
        
        if (unfiltered != null && filtered != null) {

        
        Pair<Map<String, List<Element>>, Map<String, List<Element>>> result = holder.getCandidates();
        
        if (result == null || result.first() == null || result.second() == null) {
            //compute imports:
            Map<String, List<String>> candidates = new HashMap<String, List<String>>();
            ComputeImports imp = new ComputeImports();

                notFilteredCandidates.put(sn, c);
            }
            
            result = Pair.<Map<String, List<Element>>, Map<String, List<Element>>>of(rawCandidates.a, rawCandidates.b);
            
            holder.setCandidates(result);
        }
        
        List<Element> candList = result.first().get(simpleName);
        List<Element> notFilteredCandList = result.second().get(simpleName);
        
        return Pair.<List<Element>, List<Element>>of(candList, notFilteredCandList);
    }
    
    public static class ImportCandidatesHolder {




import org.netbeans.api.java.source.TreeUtilities;
import org.openide.filesystems.FileUtil;
import org.openide.util.NbBundle;
import org.netbeans.modules.java.hints.infrastructure.Pair;
import com.sun.source.tree.ArrayAccessTree;
import com.sun.source.tree.ArrayTypeTree;
import com.sun.source.tree.BinaryTree;

import org.openide.util.Exceptions;

import static com.sun.source.tree.Tree.Kind.*;
import org.openide.util.Pair;

/**
 *

        
        if (ma == null) return null;
        
        return Pair.<List<? extends TypeMirror>, List<String>>of(ma.parameterTypes, ma.parameterNames);
    }
    
    public static MethodArguments resolveArguments(CompilationInfo info, TreePath invocation, List<? extends ExpressionTree> realArguments, Element target, TypeMirror returnType) {




/*
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 *
 * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
 *
 * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
 * Other names may be trademarks of their respective owners.
 *
 * The contents of this file are subject to the terms of either the GNU
 * General Public License Version 2 only ("GPL") or the Common
 * Development and Distribution License("CDDL") (collectively, the
 * "License"). You may not use this file except in compliance with the
 * License. You can obtain a copy of the License at
 * http://www.netbeans.org/cddl-gplv2.html
 * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
 * specific language governing permissions and limitations under the
 * License.  When distributing the software, include this License Header
 * Notice in each file and include the License file at
 * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
 * particular file as subject to the "Classpath" exception as provided
 * by Oracle in the GPL Version 2 section of the License file that
 * accompanied this code. If applicable, add the following below the
 * License Header, with the fields enclosed by brackets [] replaced by
 * your own identifying information:
 * "Portions Copyrighted [year] [name of copyright owner]"
 *
 * Contributor(s):
 *
 * The Original Software is NetBeans. The Initial Developer of the Original
 * Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
 * Microsystems, Inc. All Rights Reserved.
 *
 * If you wish your version of this file to be governed by only the CDDL
 * or only the GPL Version 2, indicate your decision by adding
 * "[Contributor] elects to include this software in this distribution
 * under the [CDDL or GPL Version 2] license." If you do not indicate a
 * single choice of license, a recipient has the option to distribute
 * your version of this file under either the CDDL, the GPL Version 2 or
 * to extend the choice of license to its licensees as provided above.
 * However, if you add GPL Version 2 code and therefore, elected the GPL
 * Version 2 license, then the option applies only if the new code is
 * made subject to such option by the copyright holder.
 */

package org.netbeans.modules.java.hints.infrastructure;

/**
 *
 * @author Jan Lahoda
 */
public final class Pair<A, B> {

    private A a;
    private B b;

    public Pair(A a, B b) {
        this.a = a;
        this.b = b;
    }

    public A getA() {
        return a;
    }

    public B getB() {
        return b;
    }
    
     @Override
     public String toString() {
         return "[" + String.valueOf(a) + "/" + String.valueOf(b) + "]";
     }
}




import org.netbeans.spi.java.hints.TriggerTreeKind;
import org.netbeans.spi.java.hints.HintContext;
import org.netbeans.spi.java.hints.ErrorDescriptionFactory;
import org.netbeans.modules.java.hints.infrastructure.Pair;
import org.netbeans.spi.editor.hints.ErrorDescription;
import org.openide.util.Pair;

/**
 *


    static {
        map = new HashMap<String, Pair<String, String>>();
        map.put("exit", Pair.<String, String>of("System", "Non-portable"));
    }

    @TriggerTreeKind(Tree.Kind.METHOD_INVOCATION)

        String parent = e.getEnclosingElement().getSimpleName().toString();

        Pair<String, String> pair = map.get(simpleName);
        if (pair != null && pair.first().equals(parent)) {
            return ErrorDescriptionFactory.forName(ctx, mit, pair.second());
        }



Lines 139-145 Link Here

(-)a/java.j2seprofiles/nbproject/project.xml (-1 / +1 lines)
139	<build-prerequisite/>	139	<build-prerequisite/>
140	<compile-dependency/>	140	<compile-dependency/>
141	<run-dependency>	141	<run-dependency>
142	<specification-version>8.31</specification-version>	142	<specification-version>8.32</specification-version>
143	</run-dependency>	143	</run-dependency>
144	</dependency>	144	</dependency>
145	<dependency>	145	<dependency>




/*
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 *
 * Copyright 2010 Oracle and/or its affiliates. All rights reserved.
 *
 * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
 * Other names may be trademarks of their respective owners.
 *
 * The contents of this file are subject to the terms of either the GNU
 * General Public License Version 2 only ("GPL") or the Common
 * Development and Distribution License("CDDL") (collectively, the
 * "License"). You may not use this file except in compliance with the
 * License. You can obtain a copy of the License at
 * http://www.netbeans.org/cddl-gplv2.html
 * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
 * specific language governing permissions and limitations under the
 * License.  When distributing the software, include this License Header
 * Notice in each file and include the License file at
 * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
 * particular file as subject to the "Classpath" exception as provided
 * by Oracle in the GPL Version 2 section of the License file that
 * accompanied this code. If applicable, add the following below the
 * License Header, with the fields enclosed by brackets [] replaced by
 * your own identifying information:
 * "Portions Copyrighted [year] [name of copyright owner]"
 *
 * If you wish your version of this file to be governed by only the CDDL
 * or only the GPL Version 2, indicate your decision by adding
 * "[Contributor] elects to include this software in this distribution
 * under the [CDDL or GPL Version 2] license." If you do not indicate a
 * single choice of license, a recipient has the option to distribute
 * your version of this file under either the CDDL, the GPL Version 2 or
 * to extend the choice of license to its licensees as provided above.
 * However, if you add GPL Version 2 code and therefore, elected the GPL
 * Version 2 license, then the option applies only if the new code is
 * made subject to such option by the copyright holder.
 *
 * Contributor(s):
 *
 * Portions Copyrighted 2009 Sun Microsystems, Inc.
 */

package org.netbeans.modules.java.j2seprofiles;

/**
 * Just another copy of Pair.
 * @author Tomas Zezula
 */
final class Pair<P,K> {

    public final P first;
    public final K second;

    private Pair (P first, K second) {
        this.first = first;
        this.second = second;
    }


    public static <P,K> Pair<P,K> of (P first, K second) {
        return new Pair<P,K> (first,second);
    }


    @Override
    public int hashCode () {
        int hashCode  = 0;
        hashCode ^= first == null ? 0 : first.hashCode();
        hashCode ^= second == null ? 0: second.hashCode();
        return hashCode;
    }

    @Override
    public boolean equals (final Object other) {
        if (other instanceof Pair) {
            Pair<?,?> otherPair = (Pair<?,?>) other;
            return (this.first == null ? otherPair.first == null : this.first.equals(otherPair.first)) &&
                   (this.second == null ? otherPair.second == null : this.second.equals(otherPair.second));
        }
        return false;
    }

    @Override
    public String toString () {
        return String.format("Pair[%s,%s]", first,second);
    }
}




import org.openide.filesystems.FileUtil;
import org.openide.filesystems.URLMapper;
import org.openide.util.Exceptions;
import org.openide.util.Pair;
import org.openide.util.lookup.ServiceProvider;

/**

                    filterForRoot = Pair.<Set<FileObject>,Set<FileObject>>of(new HashSet<FileObject>(), new HashSet<FileObject>());
                    filter.put(ownerRoot, filterForRoot);
                }
                filterForRoot.first().add(f);
            }
        }
        for (FileObject f : scope.getFiles()) {

                    filterForRoot = Pair.<Set<FileObject>,Set<FileObject>>of(new HashSet<FileObject>(), new HashSet<FileObject>());
                    filter.put(ownerRoot, filterForRoot);
                }
                filterForRoot.second().add(f);
            }
        }
        final ProfileProvider pp = new ProfileProvider(context);

                    if (canceled.get()) {
                        break;
                    }
                    final URI rootURI = violationsPair.first().first();
                    final Set<Project> projects = submittedBinaries.remove(violationsPair.first());
                    final boolean binary = projects != null;
                    if (!binary) {
                        submittedSources.remove(rootURI);
                    }
                    final Collection<? extends ProfileSupport.Violation> violations = violationsPair.second();
                    if (violations.isEmpty()) {
                        continue;
                    }

        if (filter == null) {
            return true;
        }
        if (filter.second().contains(source)) {
            return true;
        }
        for (FileObject folder : filter.first()) {
            if (folder.equals(source.getParent())) {
                return true;
            }            

Lines 296-302 Link Here

(-)a/java.navigation/nbproject/project.xml (-1 / +1 lines)
296	<build-prerequisite/>	296	<build-prerequisite/>
297	<compile-dependency/>	297	<compile-dependency/>
298	<run-dependency>	298	<run-dependency>
299	<specification-version>8.0</specification-version>	299	<specification-version>8.32</specification-version>
300	</run-dependency>	300	</run-dependency>
301	</dependency>	301	</dependency>
302	<dependency>	302	<dependency>




import org.netbeans.modules.java.navigation.actions.SortActions;
import org.netbeans.modules.java.navigation.base.FiltersManager;
import org.netbeans.modules.java.navigation.base.HistorySupport;
import org.netbeans.modules.java.navigation.base.Pair;
import org.netbeans.modules.java.navigation.base.Resolvers;
import org.netbeans.modules.java.navigation.base.SelectJavadocTask;
import org.openide.nodes.Node;

import org.openide.util.Lookup;
import org.openide.util.Mutex;
import org.openide.util.NbPreferences;
import org.openide.util.Pair;
import org.openide.util.RequestProcessor;
import org.openide.util.lookup.AbstractLookup;
import org.openide.util.lookup.InstanceContent;

            try {
                final Pair<URI,ElementHandle<TypeElement>> handlePair = becomesHandle.get();
                if (handlePair != null) {
                    final FileObject target = URLMapper.findFileObject(handlePair.first().toURL());
                    if (target != null) {
                        final JavaSource targetJs = JavaSource.forFileObject(target);
                        if (targetJs != null) {

                        } else {
                            clearNodes();
                            StatusDisplayer.getDefault().setStatusText(Bundle.ERR_Cannot_Resolve_File(
                                handlePair.second().getQualifiedName()));
                        }
                    } else {
                        clearNodes();
                        StatusDisplayer.getDefault().setStatusText(Bundle.ERR_Cannot_Resolve_File(
                                handlePair.second().getQualifiedName()));
                    }
                } else {
                    clearNodes();




import org.netbeans.api.annotations.common.NullAllowed;
import org.netbeans.api.java.source.ElementHandle;
import org.openide.util.Mutex;
import org.openide.util.Pair;
import org.openide.util.Parameters;
import org.openide.util.WeakListeners;


        @Override
        public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
            String toolTipText = null;
            if (value instanceof Pair && ((Pair)value).second() instanceof ElementHandle) {
                final String fqn =  ((ElementHandle)((Pair)value).second()).getQualifiedName();
                value = getSimpleName(fqn);
                toolTipText = fqn;
            }


        @Override
        public int compare(Pair<URI, ElementHandle<TypeElement>> o1, Pair<URI, ElementHandle<TypeElement>> o2) {
            final String q1 = o1.second().getQualifiedName();
            final String q2 = o2.second().getQualifiedName();
            final String simpleName1 = getSimpleName(q1);
            final String simpleName2 = getSimpleName(q2);
            int res = simpleName1.compareTo(simpleName2);




/*
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 *
 * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
 *
 * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
 * Other names may be trademarks of their respective owners.
 *
 * The contents of this file are subject to the terms of either the GNU
 * General Public License Version 2 only ("GPL") or the Common
 * Development and Distribution License("CDDL") (collectively, the
 * "License"). You may not use this file except in compliance with the
 * License. You can obtain a copy of the License at
 * http://www.netbeans.org/cddl-gplv2.html
 * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
 * specific language governing permissions and limitations under the
 * License.  When distributing the software, include this License Header
 * Notice in each file and include the License file at
 * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
 * particular file as subject to the "Classpath" exception as provided
 * by Oracle in the GPL Version 2 section of the License file that
 * accompanied this code. If applicable, add the following below the
 * License Header, with the fields enclosed by brackets [] replaced by
 * your own identifying information:
 * "Portions Copyrighted [year] [name of copyright owner]"
 *
 * Contributor(s):
 *
 * Portions Copyrighted 2007 Sun Microsystems, Inc.
 */
package org.netbeans.modules.java.navigation.base;

/**
 *
 * @author Tomas Zezula
 */
public final class Pair<P,K> {

    public final P first;
    public final K second;

    private Pair (P first, K second) {
        this.first = first;
        this.second = second;
    }

    
    public static <P,K> Pair<P,K> of (P first, K second) {
        return new Pair<P,K> (first,second);
    }
    
    
    @Override
    public int hashCode () {
        int hashCode  = 0;
        hashCode ^= first == null ? 0 : first.hashCode();
        hashCode ^= second == null ? 0: second.hashCode();
        return hashCode;
    }
    
    @Override
    public boolean equals (final Object other) {
        if (other instanceof Pair) {
            Pair otherPair = (Pair) other;
            return (this.first == null ? otherPair.first == null : this.first.equals(otherPair.first)) &&
                   (this.second == null ? otherPair.second == null : this.second.equals(otherPair.second));
        }
        return false;
    }
    
    @Override
    public String toString () {
        return String.format("Pair[%s,%s]", first,second);
    }
}

Lines 63-68 Link Here

(-)a/java.navigation/src/org/netbeans/modules/java/navigation/base/Resolvers.java (+1 lines)
63	import org.netbeans.api.java.source.JavaSource;	63	import org.netbeans.api.java.source.JavaSource;
64	import org.netbeans.api.java.source.Task;	64	import org.netbeans.api.java.source.Task;
65	import org.openide.filesystems.FileObject;	65	import org.openide.filesystems.FileObject;
		66	import org.openide.util.Pair;
66	import org.openide.util.Parameters;	67	import org.openide.util.Parameters;
67		68
68	/**	69	/**

Lines 58-63 Link Here

(-)a/java.navigation/src/org/netbeans/modules/java/navigation/base/SelectJavadocTask.java (-1 / +2 lines)
58	import org.openide.nodes.Node;	58	import org.openide.nodes.Node;
59	import org.openide.util.Exceptions;	59	import org.openide.util.Exceptions;
60	import org.openide.util.Lookup;	60	import org.openide.util.Lookup;
		61	import org.openide.util.Pair;
61	import org.openide.util.Parameters;	62	import org.openide.util.Parameters;
62		63
63	/**	64	/**
Lines 90-96 Link Here
90	final JavadocTopComponent tc = JavadocTopComponent.findInstance();	91	final JavadocTopComponent tc = JavadocTopComponent.findInstance();
91	if (tc != null) {	92	if (tc != null) {
92	tc.open();	93	tc.open();
93	tc.setJavadoc(documentation.first,documentation.second);	94	tc.setJavadoc(documentation.first(),documentation.second());
94	}	95	}
95	}	96	}
96	});	97	});




import org.netbeans.modules.java.navigation.JavadocTopComponent;
import org.netbeans.modules.java.navigation.NoBorderToolBar;
import org.netbeans.modules.java.navigation.base.HistorySupport;
import org.netbeans.modules.java.navigation.base.Pair;
import org.netbeans.modules.java.navigation.base.Resolvers;
import org.netbeans.modules.java.navigation.base.SelectJavadocTask;
import org.netbeans.modules.java.navigation.base.TapPanel;

import org.openide.util.NbPreferences;
import org.openide.windows.TopComponent;
import org.openide.util.NbBundle.Messages;
import org.openide.util.Pair;
import org.openide.util.RequestProcessor;
import org.openide.util.lookup.AbstractLookup;
import org.openide.util.lookup.InstanceContent;

                final Pair<URI,ElementHandle<TypeElement>> pair = toShow.get();
                if (pair != null) {
                    if (viewType == ViewType.SUB_TYPE &&
                        Object.class.getName().equals(pair.second().getQualifiedName())) {
                        nonActiveInfo.setText(Bundle.WARN_Object());
                        ((CardLayout)contentView.getLayout()).show(contentView, NON_ACTIVE_CONTENT);
                    } else {
                        final FileObject file = URLMapper.findFileObject(pair.first().toURL());
                        JavaSource js;
                        if (file != null && (js=JavaSource.forFileObject(file)) != null) {
                            LOG.log(Level.FINE, "Showing hierarchy for: {0}", pair.second().getQualifiedName());  //NOI18N
                            history.addToHistory(pair);
                            js.runUserActionTask(new Task<CompilationController>() {
                                @Override
                                public void run(CompilationController cc) throws Exception {
                                    cc.toPhase(Phase.ELEMENTS_RESOLVED);
                                    final TypeElement te = pair.second().resolve(cc);
                                    if (te != null) {
                                        final Node root;
                                        if (viewType == ViewType.SUPER_TYPE) {

                            }, true);
                        } else {
                            rootChildren.set(null);
                            StatusDisplayer.getDefault().setStatusText(Bundle.ERR_Cannot_Resolve_File(pair.second().getQualifiedName()));
                        }
                    }
                } else {

            toolbar.setFocusable(false);
            toolbar.setLayout(new GridBagLayout());
            for (Pair<JComponent,GridBagConstraints> p : components) {
                toolbar.add(p.first(),p.second());
            }
            add (toolbar);
        }

Lines 383-389 Link Here

(-)a/java.source/nbproject/project.xml (-1 / +1 lines)
383	<build-prerequisite/>	383	<build-prerequisite/>
384	<compile-dependency/>	384	<compile-dependency/>
385	<run-dependency>	385	<run-dependency>
386	<specification-version>8.25</specification-version>	386	<specification-version>8.32</specification-version>
387	</run-dependency>	387	</run-dependency>
388	</dependency>	388	</dependency>
389	<dependency>	389	<dependency>




import org.netbeans.modules.java.source.parsing.FileObjects;
import org.netbeans.modules.java.source.parsing.JavacParser;
import org.netbeans.modules.java.source.parsing.JavacParserResult;
import org.netbeans.modules.java.source.usages.Pair;
import org.netbeans.modules.parsing.api.Snapshot;
import org.netbeans.modules.parsing.spi.Parser;
import org.openide.cookies.EditorCookie;
import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileUtil;
import org.openide.loaders.DataObject;
import org.openide.util.Pair;
import org.openide.util.Parameters;

/** Assorted information about the JavaSource.

        if (cu == null) {
            return null;
        }
        return TreePath.getPath(cu, changedTree.second());
    }       
    
    /**




import org.netbeans.modules.java.source.usages.ClassIndexManager;
import org.netbeans.modules.java.source.usages.ClasspathInfoAccessor;
import org.netbeans.modules.java.source.usages.ExecutableFilesIndex;
import org.netbeans.modules.java.source.usages.Pair;
import org.netbeans.modules.parsing.api.ParserManager;
import org.netbeans.modules.parsing.api.ResultIterator;
import org.netbeans.modules.parsing.api.UserTask;

import org.openide.filesystems.URLMapper;
import org.openide.util.Exceptions;
import org.openide.util.Lookup;
import org.openide.util.Pair;
import org.openide.util.Parameters;
import org.openide.util.Utilities;


            }
            final List<Pair<FileObject,ClassPath>> fos = findAllResources(pkgName, cps);
            for (Pair<FileObject,ClassPath> pair : fos) {                
                FileObject root = pair.second().findOwnerRoot(pair.first());
                if (root == null)
                    continue;
                FileObject[] sourceRoots = SourceForBinaryQuery.findSourceRoots(root.toURL()).getRoots();                        
                ClassPath sourcePath = ClassPathSupport.createClassPath(sourceRoots);
                LinkedList<FileObject> folders = new LinkedList<FileObject>(sourcePath.findAllResources(pkgName));
                if (pkg) {
                    return folders.isEmpty() ? pair.first() : folders.get(0);
                } else {               
                    final boolean caseSensitive = isCaseSensitive ();
                    final String sourceFileName = getSourceFileName (className);
                    final Match matchSet = caseSensitive ? new CaseSensitiveMatch(sourceFileName) : new CaseInsensitiveMatch(sourceFileName);
                    folders.addFirst(pair.first());
                    for (FileObject folder : folders) {
                        for (FileObject child : folder.getChildren()) {
                            if (matchSet.apply(child)) {




import org.netbeans.modules.java.source.usages.ClassIndexManager;
import org.netbeans.modules.java.source.usages.ClassIndexManagerEvent;
import org.netbeans.modules.java.source.usages.ClassIndexManagerListener;
import org.netbeans.modules.java.source.usages.Pair;
import org.netbeans.spi.java.classpath.ClassPathImplementation;
import org.netbeans.spi.java.classpath.FilteringPathResourceImplementation;
import org.netbeans.spi.java.classpath.PathResourceImplementation;
import org.openide.util.Pair;
import org.openide.util.Parameters;
import org.openide.util.WeakListeners;


        @Override
        public List<PathResourceImplementation> apply(
                @NonNull final Pair<Boolean,List<? extends PathResourceImplementation>> resources) {
            final List<PathResourceImplementation> res = new ArrayList<PathResourceImplementation>(resources.second().size());
            for (PathResourceImplementation pr : resources.second()) {
                res.add(new FR(pr,resources.first()));
            }
            return res;
        }


        @Override
        public List<PathResourceImplementation> apply(Pair<Boolean, List<? extends PathResourceImplementation>> resources) {
            final List<PathResourceImplementation> res = new ArrayList<PathResourceImplementation>(resources.second().size());
            for (PathResourceImplementation pr : resources.second()) {
                res.add(new FR(pr,true));
            }
            return res;




import org.openide.util.Exceptions;
import org.openide.util.ImageUtilities;
import org.openide.util.NbBundle;
import org.openide.util.Pair;
import org.openide.util.Parameters;
import org.openide.util.TopologicalSortException;
import org.openide.util.Utilities;

            }
        }
        for (Pair<String,URL> relURLPair : sourceRelativeURLPairs) {
            final String ext = FileObjects.getExtension(relURLPair.first());
            final String withoutExt = FileObjects.stripExtension(relURLPair.first());
            final boolean dieIfNoRefFile = VirtualSourceProviderQuery.hasVirtualSource(ext);
            if (dieIfNoRefFile) {
                file = new File(classFolder, relURLPair.first() + '.' + FileObjects.RX);
            } else {
                file = new File(classFolder, withoutExt + '.' + FileObjects.RS);
            }

                    for (String className : readRSFile(file)) {
                        File f = new File(classFolder, FileObjects.convertPackage2Folder(className) + '.' + FileObjects.SIG);
                        if (!binaryName.equals(className)) {
                            if (javaContext.getFQNs().remove(className, relURLPair.second())) {
                                toDelete.add(Pair.<String, String>of(className, relURLPair.first()));
                                removedTypes.add(ElementHandleAccessor.getInstance().create(ElementKind.OTHER, className));
                                removedFiles.add(f);
                                fmTx.delete(f);

                fmTx.delete(file);
            }
            if (cont && (file = new File(classFolder, withoutExt + '.' + FileObjects.SIG)).exists()) {
                if (javaContext.getFQNs().remove(FileObjects.getBinaryName(file, classFolder), relURLPair.second())) {
                    String fileName = file.getName();
                    fileName = fileName.substring(0, fileName.lastIndexOf('.'));
                    final String[][] patterns = new String[][]{




import org.netbeans.modules.java.source.usages.ClassIndexImpl;
import org.netbeans.modules.java.source.usages.ClassIndexManager;
import org.netbeans.modules.java.source.usages.ClasspathInfoAccessor;
import org.netbeans.modules.java.source.usages.Pair;
import org.netbeans.modules.java.source.usages.SourceAnalyzerFactory;
import org.netbeans.modules.parsing.spi.indexing.Context;
import org.netbeans.modules.parsing.spi.indexing.Indexable;
import org.openide.filesystems.FileObject;
import org.openide.util.Lookup;
import org.openide.util.Pair;
import org.openide.util.lookup.Lookups;

//@NotThreadSafe




import org.netbeans.modules.java.source.usages.ClassNamesForFileOraculumImpl;
import org.netbeans.modules.java.source.usages.ClasspathInfoAccessor;
import org.netbeans.modules.java.source.usages.ExecutableFilesIndex;
import org.netbeans.modules.java.source.usages.Pair;
import org.netbeans.modules.parsing.lucene.support.LowMemoryWatcher;
import org.netbeans.modules.parsing.spi.indexing.Context;
import org.netbeans.modules.parsing.spi.indexing.Indexable;
import org.netbeans.modules.parsing.spi.indexing.SuspendStatus;
import org.openide.filesystems.FileUtil;
import org.openide.util.Exceptions;
import org.openide.util.Pair;

/**
 *

                    return null;
                }
                Pair<CompilationUnitTree, CompileTuple> unit = units.removeFirst();
                active = unit.second();
                if (finished.contains(active.indexable)) {
                    continue;
                }

                }
                Iterable<? extends TypeElement> types;
                s = System.nanoTime();
                types = jt.enterTrees(Collections.singletonList(unit.first()));
                total += System.nanoTime() - s;
                if (jfo2units.remove(active.jfo) != null) {
                    final Types ts = Types.instance(jt.getContext());

                                if (st.hasTag(TypeTag.CLASS)) {
                                    ClassSymbol c = st.tsym.outermostClass();
                                    Pair<CompilationUnitTree, CompileTuple> u = jfo2units.remove(c.sourcefile);
                                    if (u != null && !finished.contains(u.second().indexable) && !u.second().indexable.equals(activeIndexable)) {
                                        if (dependencies.add(u)) {
                                            scan((JCCompilationUnit)u.first());
                                        }
                                    }
                                }

                        }
                    }
                    ScanNested scanner = new ScanNested();
                    scanner.scan((JCCompilationUnit)unit.first());
                    if (!scanner.dependencies.isEmpty()) {
                        units.addFirst(unit);
                        for (Pair<CompilationUnitTree, CompileTuple> pair : scanner.dependencies) {

                javaContext.getFQNs().set(types, active.indexable.getURL());
                boolean[] main = new boolean[1];
                if (javaContext.getCheckSums().checkAndSet(active.indexable.getURL(), types, jt.getElements()) || context.isSupplementaryFilesIndexing()) {
                    javaContext.analyze(Collections.singleton(unit.first()), jt, unit.second(), addedTypes, main);
                } else {
                    final Set<ElementHandle<TypeElement>> aTypes = new HashSet<ElementHandle<TypeElement>>();
                    javaContext.analyze(Collections.singleton(unit.first()), jt, unit.second(), aTypes, main);
                    addedTypes.addAll(aTypes);
                    modifiedTypes.addAll(aTypes);
                }




import org.netbeans.api.annotations.common.NonNull;
import org.netbeans.api.java.platform.JavaPlatform;
import org.netbeans.api.java.platform.JavaPlatformManager;
import org.netbeans.modules.java.source.usages.Pair;
import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileUtil;
import org.openide.filesystems.URLMapper;
import org.openide.util.Exceptions;
import org.openide.util.Pair;
import org.openide.util.Utilities;



        }
        synchronized (this) {
            final Pair<File,String> res = mapJarToCtSym(f, root);
            return res.second() != null;
        }

    }

                if (f.isFile()) {
                    final Pair<File,String> resolved = mapJarToCtSym(f, root);
                    return new CachingArchive(
                            resolved.first(),
                            resolved.second(),
                            cacheFile);
                }
                else {




import org.netbeans.api.java.source.JavaSource;
import org.netbeans.api.lexer.TokenHierarchy;
import org.netbeans.modules.java.source.JavaFileFilterQuery;
import org.netbeans.modules.java.source.usages.Pair;
import org.netbeans.modules.parsing.api.Snapshot;
import org.openide.cookies.EditorCookie;
import org.openide.filesystems.FileObject;
import org.openide.loaders.DataObject;
import org.openide.loaders.DataObjectNotFoundException;
import org.openide.util.Exceptions;
import org.openide.util.Pair;

/**
 *

Lines 53-60 Link Here

(-)a/java.source/src/org/netbeans/modules/java/source/parsing/FindMethodRegionsVisitor.java (-2 / +1 lines)
53	import java.util.concurrent.atomic.AtomicBoolean;	53	import java.util.concurrent.atomic.AtomicBoolean;
54	import javax.swing.text.BadLocationException;	54	import javax.swing.text.BadLocationException;
55	import javax.swing.text.Document;	55	import javax.swing.text.Document;
56	import org.netbeans.modules.java.source.usages.Pair;	56	import org.openide.util.Pair;
57	import org.openide.util.Exceptions;
58		57
59	/**	58	/**
60	*	59	*




import org.netbeans.modules.java.source.tasklist.CompilerSettings;
import org.netbeans.modules.java.source.usages.ClassIndexImpl;
import org.netbeans.modules.java.source.usages.ClasspathInfoAccessor;
import org.netbeans.modules.java.source.usages.Pair;
import org.netbeans.modules.parsing.api.Snapshot;
import org.netbeans.modules.parsing.api.Source;
import org.netbeans.modules.parsing.api.Task;

import org.openide.modules.SpecificationVersion;
import org.openide.util.ChangeSupport;
import org.openide.util.Exceptions;
import org.openide.util.Pair;
import org.openide.util.WeakListeners;

/**

                    if (supportsReparse) {
                        final Pair<DocPositionRegion,MethodTree> _changedMethod = changedMethod.getAndSet(null);
                        if (_changedMethod != null && ciImpl != null) {
                            LOGGER.log(Level.FINE, "\t:trying partial reparse:\n{0}", _changedMethod.first().getText());                           //NOI18N
                            needsFullReparse = !reparseMethod(ciImpl, snapshot, _changedMethod.second(), _changedMethod.first().getText());
                            if (!needsFullReparse) {
                                ciImpl.setChangedMethod(_changedMethod);
                            }

                    int end = evt.affectedEndOffset();
                    synchronized (positions) {
                        for (Pair<DocPositionRegion,MethodTree> pe : positions) {
                            PositionRegion p = pe.first();
                            if (start > p.getStartOffset() && end < p.getEndOffset()) {
                                changedMethod = pe;
                                break;




import org.netbeans.modules.java.source.classpath.AptCacheForSourceQuery;
import org.netbeans.modules.java.source.indexing.JavaIndex;
import org.netbeans.modules.java.source.indexing.TransactionContext;
import org.netbeans.modules.java.source.usages.Pair;
import org.openide.util.Exceptions;
import org.openide.util.Pair;
import org.openide.util.Parameters;
import org.openide.util.Utilities;


    public Set<javax.tools.FileObject> getGeneratedSources(final URL forSource) {
        Pair<Set<javax.tools.FileObject>,Set<javax.tools.FileObject>> res = 
            generated.get(forSource);
        return res == null ? null : res.first();
    }
    
    public boolean canWrite() {

        }
        switch (type) {
            case SOURCE:
                insertInto.first().add(file);
                break;
            case RESOURCE:
                insertInto.second().add(file);
                break;
            default:
                throw new IllegalArgumentException();

                for (Map.Entry<URL,Pair<Set<javax.tools.FileObject>,Set<javax.tools.FileObject>>> entry : generated.entrySet()) {
                    final URL source = entry.getKey();
                    final Pair<Set<javax.tools.FileObject>,Set<javax.tools.FileObject>> gen = entry.getValue();
                    final Set<javax.tools.FileObject> genSources = gen.first();
                    final Set<javax.tools.FileObject> genResources =  gen.second();
                    commitSource(source, genSources, genResources);
                }
                writeResources();




import java.util.logging.Level;
import java.util.logging.Logger;
import org.netbeans.api.annotations.common.NonNull;
import org.openide.util.Pair;

/**
 *

        } else {
            LOG.log(Level.FINE, "Poped sibling: {0} size: {1}", new Object[] {removed, siblings.size()});     //NOI18N
        }
        return removed.first();
    }

    @Override

                Level.FINER,
                "Returns sibling: {0} in source root? {1}",    //NOI18N
                new Object[] {
                    result.first(),
                    result.second()
                });
            return result.first();
        }

        @Override


        @Override
        public boolean isInSourceRoot() {
            return siblings.peek().second();
        }
    }





import org.netbeans.api.annotations.common.NonNull;
import org.netbeans.api.annotations.common.NullAllowed;
import org.netbeans.modules.java.preprocessorbridge.spi.JavaFileFilterImplementation;
import org.netbeans.modules.java.source.usages.Pair;
import org.netbeans.modules.java.source.util.Iterators;
import org.openide.util.Pair;
import org.openide.util.Utilities;

/**

            @NonNull final Location location,
            final boolean readOnly) {
        if (location == StandardLocation.CLASS_OUTPUT) {
            return contentCache.first();
        } else if (location == StandardLocation.SOURCE_OUTPUT) {
            return contentCache.second();
        } else if (readOnly && location == StandardLocation.CLASS_PATH) {
            return contentCache.first();
        } else {
            throw new IllegalArgumentException("Unsupported Location: " + location);    //NOI18N
        }


    private void flushFiles(boolean inCommit) throws IOException {
        LOG.log(Level.FINE, "Flushing:{0}", getRootDir());
        doFlushFiles(contentCache.first(), inCommit);
        doFlushFiles(contentCache.second(), inCommit);
    }

    private void doFlushFiles(

            FileObjects.deleteRecursively(d);
        }
        deleted.clear();
        contentCache.first().clear();
        contentCache.second().clear();
    }

    @Override

                        (FileObjects.FileBase)FileObjects.fileFileObject(shadowFile, getRootFile(shadowFile, getPackage()), filter, encoding),
                        Boolean.TRUE);
            }
            return delegate.first();
        }
        
        public File getCurrentFile() {

            if (wasFlushed()) {
                return;
            }
            if (delegate != null && delegate.second() == Boolean.FALSE) {
                if (inCommit) {
                    shadowFile = this.f;
                    release();


        @Override
        public boolean delete() {
            if (delegate != null && delegate.second() == Boolean.TRUE) {
                return delegate.first().delete();
            } else {
                if (writer != null) {
                    writer.delete(toFile(this));

        @Override
        public InputStream openInputStream() throws IOException {
            if (delegate != null) {
                return delegate.first().openInputStream();
            } else {
                return new ByteArrayInputStream(content);
            }

        public OutputStream openOutputStream() throws IOException {
            modify();
            if (delegate != null) {
                return delegate.first().openOutputStream();
            } else {
                return new ByteArrayOutputStream() {
                    boolean closed;

        }

        private void modify() {
            if (delegate != null && delegate.second() == Boolean.FALSE) {
                delegate = null;
            }
        }




import org.netbeans.api.editor.guards.GuardedSectionManager;
import org.netbeans.api.java.lexer.JavaTokenId;
import org.netbeans.modules.java.source.transform.FieldGroupTree;
import org.netbeans.modules.java.source.usages.Pair;
import static org.netbeans.api.java.lexer.JavaTokenId.*;
import org.netbeans.api.lexer.Token;
import org.netbeans.api.lexer.TokenSequence;
import org.netbeans.modules.java.source.save.CasualDiff.LineInsertionType;
import org.openide.util.Pair;

/**
 * Estimates the position for given element or element set. Offsets are

                                    if (commentEndPos.isEmpty()) {
                                        wideEnd = seq.offset() + indexOf + 1;
                                    } else {
                                        commentEndPos.add(Pair.of(commentEndPos.getLast().first(), seq.offset() + indexOf + 1));
                                    }
                                }
                            }

                }
                maxLines = Math.max(maxLines, newlines);
                for (Pair<Integer, Integer> comment : commentEndPos) {
                    if (comment.first() < maxLines || comment.first() == 0) {
                        wideEnd = comment.second();
                    } else {
                        break;
                    }




import org.netbeans.modules.java.source.JavaSourceAccessor;
import org.netbeans.modules.java.source.parsing.FileObjects;
import org.netbeans.modules.java.source.parsing.JavacParser;
import org.netbeans.modules.java.source.usages.Pair;
import org.netbeans.modules.parsing.api.Embedding;
import org.netbeans.modules.parsing.api.ParserManager;
import org.netbeans.modules.parsing.api.ResultIterator;

import org.netbeans.modules.parsing.spi.ParseException;
import org.netbeans.modules.parsing.spi.Parser;
import org.netbeans.spi.java.classpath.support.ClassPathSupport;
import org.openide.util.Pair;

/**
 *

                            tokenText = javadocTokens.token().text().toString();
                            if (tokenText.endsWith(">")) { //NOI18N
                                if (P_TAG.equalsIgnoreCase(tokenText)) {
                                    if (currWSOffset >= 0 && (toAdd == null || toAdd.first() < currWSOffset)) {
                                        marks.add(Pair.of(currWSOffset, 1));
                                    }
                                    lastAddedNLOffset = javadocTokens.offset() + javadocTokens.token().length() - offset;

                                    afterText = false;
                                } else if (PRE_TAG.equalsIgnoreCase(tokenText)
                                        || CODE_TAG.equalsIgnoreCase(tokenText)) {
                                    if (currWSOffset >= 0 && state == 0 && (toAdd == null || toAdd.first() < currWSOffset)) {
                                        marks.add(Pair.of(currWSOffset, 1));
                                    }
                                    marks.add(Pair.of(javadocTokens.offset() - offset, 5));

                                    marks.add(Pair.of(currWSOffset >= 0 ? currWSOffset : javadocTokens.offset() - offset, 6));
                                } else {
                                    if (currWSOffset >= 0 && lastNLOffset >= currWSOffset
                                            && lastAddedNLOffset < currWSOffset && (toAdd == null || toAdd.first() < currWSOffset)) {
                                        marks.add(Pair.of(currWSOffset, 1));
                                    }
                                    nlAdd = Pair.of(javadocTokens.offset() + javadocTokens.token().length() - offset, 1);

            Iterator<Pair<Integer, Integer>> it = marks.iterator();
            if (it.hasNext()) {
                Pair<Integer, Integer> next = it.next();
                checkOffset = next.first();
                actionType = next.second();
            } else {
                checkOffset = Integer.MAX_VALUE;
                actionType = -1;

                        align = -1;
                        if (it.hasNext()) {
                            Pair<Integer, Integer> next = it.next();
                            checkOffset = next.first();
                            actionType = next.second();
                        } else {
                            checkOffset = Integer.MAX_VALUE;
                            actionType = -1;

                            }
                            if (it.hasNext()) {
                                Pair<Integer, Integer> next = it.next();
                                checkOffset = next.first();
                                actionType = next.second();
                            } else {
                                checkOffset = Integer.MAX_VALUE;
                                actionType = -1;




import org.openide.filesystems.FileUtil;
import org.openide.filesystems.URLMapper;
import org.openide.util.Exceptions;
import org.openide.util.Pair;
import org.openide.util.Parameters;
import org.openide.util.Utilities;


            final PrintWriter out = new PrintWriter(new OutputStreamWriter(new FileOutputStream(file),"UTF-8"));   //NOI18N
            try {
                for (Pair<ElementHandle<TypeElement>,Long> pair : state) {
                    StringBuilder sb = new StringBuilder(pair.first().getBinaryName());
                    sb.append('='); //NOI18N
                    sb.append(pair.second().longValue());
                    out.println(sb.toString());
                }
            } finally {

        if (timeStamps == null) {
            f.delete();
        } else {
            timeStamps.first().keySet().removeAll(timeStamps.second());
            final BufferedWriter out = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(f), "UTF-8")); //NOI18N
            try {
                // write data
                for(LongHashMap.Entry<String> entry : timeStamps.first().entrySet()) {
                    out.write(entry.getKey());
                    out.write('='); //NOI18N
                    out.write(Long.toString(entry.getValue()));

    }

    private boolean timeStampsEmpty() {
        return timeStamps == null || timeStamps.second().isEmpty();
    }

    private boolean isUpToDate(final String resourceName, final long timeStamp) throws IOException {
        final Pair<LongHashMap<String>,Set<String>> ts = getTimeStamps();
        long oldTime = ts.first().put(resourceName,timeStamp);
        ts.second().remove(resourceName);
        return oldTime == timeStamp;
    }


            if (newE == null) {
                newE = newIt.next();
            }
            int ni = oldE.first().getBinaryName().compareTo(newE.first().getBinaryName());
            if (ni == 0) {
                if (oldE.second().longValue() == 0 || oldE.second().longValue() != newE.second().longValue()) {
                    changed.add(oldE.first());
                }
                oldE = newE = null;
            }
            else if (ni < 0) {
                removed.add(oldE.first());
                oldE = null;
            }
            else if (ni > 0) {
                added.add(newE.first());
                newE = null;
            }
        }
        if (oldE != null) {
            removed.add(oldE.first());
        }
        while (oldIt.hasNext()) {
            removed.add(oldIt.next().first());
        }
        if (newE != null) {
            added.add(newE.first());
        }
        while (newIt.hasNext()) {
            added.add(newIt.next().first());
        }
        return new Changes(true, added, removed, changed, preBuildArgs);
    }

                public int compare(
                        final Pair<ElementHandle<TypeElement>,Long> o1,
                        final Pair<ElementHandle<TypeElement>,Long> o2) {
                    return o1.first().getBinaryName().compareTo(o2.first().getBinaryName());
                }
            };


                    return false;
                }
            }
            for (String deleted : getTimeStamps().second()) {
                delete(deleted);
                markChanged();
            }

        DeletedRootProcessor(@NonNull final Context ctx) throws IOException {
            super(ctx);
            final Pair<LongHashMap<String>, Set<String>> ts = getTimeStamps();
            if (!ts.first().isEmpty()) {
                markChanged();
            }
        }

Lines 67-72 Link Here

(-)a/java.source/src/org/netbeans/modules/java/source/usages/ClassIndexImpl.java (+1 lines)
67	import org.netbeans.modules.parsing.lucene.support.Convertor;	67	import org.netbeans.modules.parsing.lucene.support.Convertor;
68	import org.openide.filesystems.FileObject;	68	import org.openide.filesystems.FileObject;
69	import org.openide.util.Exceptions;	69	import org.openide.util.Exceptions;
		70	import org.openide.util.Pair;
70	import org.openide.util.Utilities;	71	import org.openide.util.Utilities;
71		72
72	/** Should probably final class with private constructor.	73	/** Should probably final class with private constructor.




import org.netbeans.modules.java.source.indexing.TransactionContext;
import org.openide.filesystems.FileUtil;
import org.openide.util.Exceptions;
import org.openide.util.Pair;

/**
 *

                        return;
                    }
                    Pair<ClassIndexImpl,Boolean> pair = getClassIndex(root, beforeCreateAllowed, false);
                    index[0] = pair.first();
                    if (index[0] != null) {
                        return;
                    }
                    URL translatedRoot = AptCacheForSourceQuery.getSourceFolder(root);
                    if (translatedRoot != null) {
                        pair = getClassIndex(translatedRoot, beforeCreateAllowed, false);
                        index[0] = pair.first();
                        if (index[0] != null) {
                            return;
                        }

                return null;
            }
            Pair<ClassIndexImpl,Boolean> pair = getClassIndex (root, true, true);
            ClassIndexImpl qi = pair.first();
            if (qi == null) {
                qi = getUsagesQuery(root, true);
                if (qi == null) {

                this.instances.put(root,qi);
                this.transientInstances.remove(root);
                markAddedRoot(root);
            } else if (pair.second()) {
                markAddedRoot(root);
            }
            return qi;




import org.netbeans.modules.parsing.lucene.support.Queries;
import org.openide.filesystems.FileObject;
import org.openide.util.Exceptions;
import org.openide.util.Pair;

/**
 *

    private static class DocumentConvertor implements Convertor<Pair<Pair<String,String>,Object[]>,Document> {
        @Override
        public Document convert(Pair<Pair<String, String>, Object[]> entry) {
            final Pair<String,String> pair = entry.first();
            final String cn = pair.first();
            final String srcName = pair.second();
            final Object[] data = entry.second();
            final List<String> cr = (List<String>) data[0];
            final String fids = (String) data[1];
            final String ids = (String) data[2];


        @Override
        public Query convert(Pair<String, String> p) {
            final String resourceName = p.first();
            final String sourceName = p.second();
            return fileBased ? createClassesInFileQuery(resourceName,sourceName) : createClassWithEnclosedQuery(resourceName, sourceName);
        }
        

        
        private static Query binaryNameSourceNamePairQuery (final Pair<String,String> binaryNameSourceNamePair) {
            assert binaryNameSourceNamePair != null;
            final String binaryName = binaryNameSourceNamePair.first();
            final String sourceName = binaryNameSourceNamePair.second();
            final Query query = binaryNameQuery(binaryName);
            if (sourceName != null) {
                assert query instanceof BooleanQuery : "The DocumentUtil.binaryNameQuery was incompatibly changed!";        //NOI18N




/*
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 *
 * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
 *
 * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
 * Other names may be trademarks of their respective owners.
 *
 * The contents of this file are subject to the terms of either the GNU
 * General Public License Version 2 only ("GPL") or the Common
 * Development and Distribution License("CDDL") (collectively, the
 * "License"). You may not use this file except in compliance with the
 * License. You can obtain a copy of the License at
 * http://www.netbeans.org/cddl-gplv2.html
 * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
 * specific language governing permissions and limitations under the
 * License.  When distributing the software, include this License Header
 * Notice in each file and include the License file at
 * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
 * particular file as subject to the "Classpath" exception as provided
 * by Oracle in the GPL Version 2 section of the License file that
 * accompanied this code. If applicable, add the following below the
 * License Header, with the fields enclosed by brackets [] replaced by
 * your own identifying information:
 * "Portions Copyrighted [year] [name of copyright owner]"
 *
 * Contributor(s):
 *
 * Portions Copyrighted 2007 Sun Microsystems, Inc.
 */
package org.netbeans.modules.java.source.usages;

/**
 *
 * @author Tomas Zezula
 */
public final class Pair<P,K> {

    public final P first;
    public final K second;

    private Pair (P first, K second) {
        this.first = first;
        this.second = second;
    }

    
    public static <P,K> Pair<P,K> of (P first, K second) {
        return new Pair<P,K> (first,second);
    }
    
    
    @Override
    public int hashCode () {
        int hashCode  = 0;
        hashCode ^= first == null ? 0 : first.hashCode();
        hashCode ^= second == null ? 0: second.hashCode();
        return hashCode;
    }
    
    @Override
    public boolean equals (final Object other) {
        if (other instanceof Pair) {
            Pair otherPair = (Pair) other;
            return (this.first == null ? otherPair.first == null : this.first.equals(otherPair.first)) &&
                   (this.second == null ? otherPair.second == null : this.second.equals(otherPair.second));
        }
        return false;
    }
    
    @Override
    public String toString () {
        return String.format("Pair[%s,%s]", first,second);
    }
}




import org.openide.filesystems.FileUtil;
import org.openide.filesystems.URLMapper;
import org.openide.util.Exceptions;
import org.openide.util.Pair;
import org.openide.util.Parameters;

/**

                                QueryUtil.createPackageUsagesQuery(binaryName,usageType,Occur.SHOULD),
                                scope);
                        if (q!=null) {
                            index.query(result, ctu.first(), DocumentUtil.declaredTypesFieldSelector(), cancel.get(), q);
                            if (ctu.second() != null) {
                                ctu.second().query(result, convertor, DocumentUtil.declaredTypesFieldSelector(), cancel.get(), q);
                            }
                        }
                        return null;

                                    QueryUtil.createUsagesQuery(binaryName, usageType, Occur.SHOULD),
                                    scope);
                            if (usagesQuery != null) {
                                index.query(result, ctu.first(), DocumentUtil.declaredTypesFieldSelector(), cancel.get(), usagesQuery);
                                if (ctu.second() != null) {
                                    ctu.second().query(result, convertor, DocumentUtil.declaredTypesFieldSelector(), cancel.get(), usagesQuery);
                                }
                            }
                            return null;

                            DocumentUtil.translateQueryKind(kind)),
                        scope);
                    if (query != null) {
                        index.query(result, ctu.first(), DocumentUtil.declaredTypesFieldSelector(), cancel.get(), query);
                        if (ctu.second() != null) {
                            ctu.second().query(result, convertor, DocumentUtil.declaredTypesFieldSelector(), cancel.get(), query);
                        }
                    }
                    return null;

                        };
                    index.queryDocTerms(
                            result,
                            ctu.first(),
                            t2s,
                            DocumentUtil.declaredTypesFieldSelector(),
                            cancel.get(),
                            query);
                    if (ctu.second() != null) {
                        ctu.second().queryDocTerms(
                            result,
                            convertor,
                            t2s,

                        collectInto = result;
                    }
                    final Pair<StoppableConvertor<Term,String>,Term> filter = QueryUtil.createPackageFilter(prefix,directOnly);
                    index.queryTerms(collectInto, filter.second(), filter.first(), cancel.get());
                    if (cacheOp) {
                        synchronized (PersistentClassIndex.this) {
                            if (rootPkgCache == null) {

                final Pair<Index,Set<String>> data = updateDirty();
                if (data != null) {
                    return Pair.<Convertor<? super Document, T>,Index>of(
                            new FilterConvertor<T>(data.second(), delegate),
                            data.first());
                }
            } catch (IOException ioe) {
                Exceptions.printStackTrace(ioe);

Lines 59-64 Link Here

(-)a/java.source/src/org/netbeans/modules/java/source/usages/QueryUtil.java (+1 lines)
59	import org.netbeans.modules.java.source.usages.ClassIndexImpl.UsageType;	59	import org.netbeans.modules.java.source.usages.ClassIndexImpl.UsageType;
60	import org.netbeans.modules.parsing.lucene.support.Queries;	60	import org.netbeans.modules.parsing.lucene.support.Queries;
61	import org.netbeans.modules.parsing.lucene.support.StoppableConvertor;	61	import org.netbeans.modules.parsing.lucene.support.StoppableConvertor;
		62	import org.openide.util.Pair;
62	import org.openide.util.Parameters;	63	import org.openide.util.Parameters;
63		64
64	/**	65	/**




import org.openide.filesystems.FileUtil;
import org.openide.filesystems.URLMapper;
import org.openide.util.Exceptions;
import org.openide.util.Pair;
import org.openide.util.Parameters;

/**

                    final String classNameType = className + DocumentUtil.encodeKind(ElementKind.CLASS);
                    final Pair<String,String> name = Pair.<String,String>of(classNameType, null);
                    for (Pair<Symbol,ClassIndexImpl.UsageType> usage : packageAnnotations) {
                        addUsage(usage.first(), name, p, usage.second());
                    }
                    for (CharSequence ident : packageAnnotationIdents) {
                        addIdent(name, ident, p, false);

                                crossedTopLevel = true;
                            }
                        } else {
                            resourceName = activeClass.peek().second();
                        }
                        name = Pair.<String,String>of(classNameType, resourceName);
                        nameFrom = 2;

                if (className != null) {
                    if (topLevel) {
                        if (topLevels != null) {
                            topLevels.add (Pair.<String,String>of(className, name.second()));
                        }
                        try {
                            addAndClearImports(name, p);

        private UsagesData<String> getData (@NonNull final Pair<String,String>owner, @NonNull final Map<Pair<String,String>, UsagesData<String>> map) {
            UsagesData<String> data = map.get(owner);
            if (data == null) {
                if (owner.first().charAt(owner.first().length()-2) == '.') {    //NOI18N
                    throw new IllegalArgumentException(owner.first());
                }
                data = new UsagesData<String> (CONVERTOR);
                map.put(owner,data);




import org.openide.util.Lookup;
import org.openide.util.LookupEvent;
import org.openide.util.LookupListener;
import org.openide.util.Pair;
import org.openide.util.Parameters;
import org.openide.util.Utilities;
import org.openide.util.WeakListeners;

                   m.put(ext, Pair.of(prov, l));
               }
               else {
                   l = p.second();
               }
               try {
                   final File file = Utilities.toFile(indexable.getURL().toURI());

        
        final R r = new R (root, file2indexables);
        for (Pair<VirtualSourceProvider,List<File>> p : m.values()) {
            final VirtualSourceProvider prov = p.first();
            final List<File> tf = p.second();
            r.setProvider(prov);
            prov.translate(tf, root,r);
        }

Lines 106-112 Link Here

(-)a/java.source/test/unit/src/org/netbeans/api/java/source/JavaSourceTest.java (-1 / +1 lines)
106	import org.netbeans.modules.java.source.parsing.DocPositionRegion;	106	import org.netbeans.modules.java.source.parsing.DocPositionRegion;
107	import org.netbeans.modules.java.source.parsing.JavaFileObjectProvider;	107	import org.netbeans.modules.java.source.parsing.JavaFileObjectProvider;
108	import org.netbeans.modules.java.source.parsing.SourceFileObject;	108	import org.netbeans.modules.java.source.parsing.SourceFileObject;
109	import org.netbeans.modules.java.source.usages.Pair;
110	import org.netbeans.modules.parsing.lucene.IndexFactory;	109	import org.netbeans.modules.parsing.lucene.IndexFactory;
111	import org.netbeans.modules.parsing.lucene.support.Convertor;	110	import org.netbeans.modules.parsing.lucene.support.Convertor;
112	import org.netbeans.modules.parsing.lucene.support.Index;	111	import org.netbeans.modules.parsing.lucene.support.Index;
Lines 140-145 Link Here
140	import org.netbeans.modules.parsing.spi.TaskIndexingMode;	139	import org.netbeans.modules.parsing.spi.TaskIndexingMode;
141	import org.netbeans.spi.java.classpath.ClassPathProvider;	140	import org.netbeans.spi.java.classpath.ClassPathProvider;
142	import org.openide.util.Exceptions;	141	import org.openide.util.Exceptions;
		142	import org.openide.util.Pair;
143	/**	143	/**
144	*	144	*
145	* @author Tomas Zezula	145	* @author Tomas Zezula




import org.netbeans.modules.java.platform.JavaPlatformProvider;
import org.netbeans.modules.java.source.ElementHandleAccessor;
import org.netbeans.modules.java.source.parsing.FileObjects;
import org.netbeans.modules.java.source.usages.Pair;
import org.netbeans.spi.java.classpath.support.ClassPathSupport;
import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileUtil;
import org.openide.modules.SpecificationVersion;
import org.openide.util.Pair;
import org.openide.util.Utilities;

/**

                public int compare(
                        Pair<ElementHandle<TypeElement>, SourceLevelQuery.Profile> o1,
                        Pair<ElementHandle<TypeElement>, SourceLevelQuery.Profile> o2) {
                    return o1.first().getBinaryName().compareTo(o2.first().getBinaryName());
                }
            });
        }



            JP(Pair<File,URL> p) {
                this.home = FileUtil.toFileObject(p.first());
                this.boot = ClassPathSupport.createClassPath(p.second());
            }






import javax.tools.StandardLocation;
import org.netbeans.api.java.classpath.ClassPath;
import org.netbeans.junit.NbTestCase;
import org.netbeans.modules.java.source.usages.Pair;
import org.netbeans.spi.java.classpath.support.ClassPathSupport;
import org.openide.filesystems.FileUtil;
import org.openide.util.Pair;
import org.openide.util.Utilities;

/**

        final CachingArchiveProvider provider = CachingArchiveProvider.getDefault();
        final CachingFileManager manager = new CachingFileManager(provider, cp, false, true);
        for (Pair<Pair<String,String>,URI> testCase : testCases) {
            final Pair<String,String> name = testCase.first();
            final URI expectedURI = testCase.second();
            FileObject fo = manager.getFileForInput(StandardLocation.CLASS_PATH, name.first(), name.second());
            if (expectedURI == null) {
                assertNull(
                    String.format("Lookup: %s/%s expected: null",
                    name.first(),
                    name.second()),
                    fo);
            } else {
                assertEquals(
                    String.format("Lookup: %s/%s expected: %s",
                    name.first(),
                    name.second(),
                    expectedURI),
                    expectedURI,
                    fo.toUri());

Lines 76-81 Link Here

(-)a/java.source/test/unit/src/org/netbeans/modules/java/source/usages/BinaryAnalyserTest.java (+1 lines)
76	import org.openide.filesystems.FileObject;	76	import org.openide.filesystems.FileObject;
77	import org.openide.filesystems.FileUtil;	77	import org.openide.filesystems.FileUtil;
78	import org.openide.util.Exceptions;	78	import org.openide.util.Exceptions;
		79	import org.openide.util.Pair;
79	import org.openide.util.Utilities;	80	import org.openide.util.Utilities;
80		81
81	/**	82	/**

Lines 71-76 Link Here

(-)a/java.source/test/unit/src/org/netbeans/modules/java/source/usages/LucenePerformanceTest.java (-1 / +2 lines)
71	import org.netbeans.modules.parsing.lucene.support.IndexManagerTestUtilities;	71	import org.netbeans.modules.parsing.lucene.support.IndexManagerTestUtilities;
72	import org.netbeans.modules.parsing.lucene.support.Queries;	72	import org.netbeans.modules.parsing.lucene.support.Queries;
73	import org.netbeans.modules.parsing.lucene.support.StoppableConvertor;	73	import org.netbeans.modules.parsing.lucene.support.StoppableConvertor;
		74	import org.openide.util.Pair;
74		75
75	/**	76	/**
76	*	77	*
Lines 115-121 Link Here
115	Set<String> result = new HashSet<String>();	116	Set<String> result = new HashSet<String>();
116	startTime = System.currentTimeMillis();	117	startTime = System.currentTimeMillis();
117	final Pair<StoppableConvertor<Term,String>,Term> filter = QueryUtil.createPackageFilter("", true);	118	final Pair<StoppableConvertor<Term,String>,Term> filter = QueryUtil.createPackageFilter("", true);
118	index.queryTerms(result, filter.second, filter.first, null);	119	index.queryTerms(result, filter.second(), filter.first(), null);
119	endTime = System.currentTimeMillis();	120	endTime = System.currentTimeMillis();
120	delta = (endTime-startTime);	121	delta = (endTime-startTime);
121	System.out.println("Packages: " + delta);	122	System.out.println("Packages: " + delta);

Lines 216-222 Link Here

(-)a/java.sourceui/nbproject/project.xml (-1 / +1 lines)
216	<build-prerequisite/>	216	<build-prerequisite/>
217	<compile-dependency/>	217	<compile-dependency/>
218	<run-dependency>	218	<run-dependency>
219	<specification-version>8.0</specification-version>	219	<specification-version>8.32</specification-version>
220	</run-dependency>	220	</run-dependency>
221	</dependency>	221	</dependency>
222	<dependency>	222	<dependency>




import org.netbeans.modules.java.preprocessorbridge.api.JavaSourceUtil;
import org.netbeans.modules.java.source.JavadocHelper;
import org.netbeans.modules.java.source.parsing.FileObjects;
import org.netbeans.modules.java.source.usages.Pair;
import org.netbeans.spi.java.classpath.support.ClassPathSupport;
import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileStateInvalidException;
import org.openide.filesystems.FileUtil;
import org.openide.util.Exceptions;
import org.openide.util.NbBundle;
import org.openide.util.Pair;
import org.openide.util.RequestProcessor;
import org.openide.xml.XMLUtil;


        this.cpInfo = compilationInfo.getClasspathInfo();
        this.handle = element == null ? null : ElementHandle.create(element);
        this.cancel = cancel;
        Doc doc = context.second().javaDocFor(element);
        boolean localized = false;
        StringBuilder content = new StringBuilder();
        JavadocHelper.TextStream page = null;

                    c.toPhase(Phase.RESOLVED);
                    final Element element = handle.resolve(c);
                    Pair<Trees,ElementUtilities> context = Pair.of(c.getTrees(), c.getElementUtilities());
                    Doc doc = context.second().javaDocFor(element);
                    JavadocHelper.TextStream page = JavadocHelper.getJavadoc(element, cancel);
                    return prepareContent(contentFin, doc,localizedFin, page, cancel, false, context).get();
                }

        StringBuilder sb = new StringBuilder();
        ClassDoc cls = peDoc.containingClass();
        if (cls != null) {
            Element e = ctx.second().elementFor(cls);
            if (e != null) {
                switch(e.getEnclosingElement().getKind()) {
                    case ANNOTATION_TYPE:

            PackageDoc pkg = peDoc.containingPackage();
            if (pkg != null) {
                sb.append("<font size='+0'><b>"); //NOI18N
                createLink(sb, ctx.second().elementFor(pkg), makeNameLineBreakable(pkg.name()));
                sb.append("</b></font>"); //NOI18N)
            }
        }

                    sb.append('('); //NOI18N
                    for (int i = 0; i < pairs.length; i++) {
                        AnnotationTypeElementDoc ated = pairs[i].element();
                        createLink(sb, ctx.second().elementFor(ated), ated.name());
                        sb.append('='); //NOI18N
                        appendAnnotationValue(sb, pairs[i].value(), ctx);
                        if (i < pairs.length - 1)

            if (length > 1)
                sb.append('}'); //NOI18N
        } else if (value instanceof Doc) {
            createLink(sb, ctx.second().elementFor((Doc)value), ((Doc)value).name());
        } else {
            sb.append(value.toString());
        }

                thr.append("<code>"); //NOI18N
                Type exType = throwsTag.exceptionType();
                if (exType != null) {
                    createLink(thr, ctx.second().elementFor(exType.asClassDoc()), exType.simpleTypeName());
                } else {
                    thr.append(throwsTag.exceptionName());
                }

                String label = stag.label();
                if (memberName != null) {
                    if (refClass != null) {
                        createLink(see, ctx.second().elementFor(stag.referencedMember()), "<code>" + (label != null && label.length() > 0 ? label : (refClass.simpleTypeName() + "." + memberName)) + "</code>"); //NOI18N
                    } else {
                        see.append(className);
                        see.append('.'); //NOI18N

                    see.append(", "); //NOI18N
                } else if (className != null) {
                    if (refClass != null) {
                        createLink(see, ctx.second().elementFor(refClass), "<code>" + (label != null && label.length() > 0 ? label : refClass.simpleTypeName()) + "</code>"); //NOI18N
                    } else if (refPackage != null) {
                        createLink(see, ctx.second().elementFor(refPackage), "<code>" + (label != null && label.length() > 0 ? label : refPackage.name()) + "</code>"); //NOI18N
                    } else {
                        see.append(className);
                    }

                thr.append("<code>"); //NOI18N
                Type exType = ((ThrowsTag)tag).exceptionType();
                if (exType != null)
                    createLink(thr, ctx.second().elementFor(exType.asClassDoc()), exType.simpleTypeName());
                else
                    thr.append(((ThrowsTag)tag).exceptionName());
                thr.append("</code>"); //NOI18N

                String label = stag.label();
                if (memberName != null) {
                    if (refClass != null) {
                        createLink(see, ctx.second().elementFor(stag.referencedMember()), "<code>" + (label != null && label.length() > 0 ? label : (refClass.simpleTypeName() + "." + memberName)) + "</code>"); //NOI18N
                    } else {
                        see.append(className);
                        see.append('.'); //NOI18N

                    see.append(", "); //NOI18N
                } else if (className != null) {
                    if (refClass != null) {
                        createLink(see, ctx.second().elementFor(refClass), "<code>" + (label != null && label.length() > 0 ? label : refClass.simpleTypeName()) + "</code>"); //NOI18N
                    } else if (refPackage != null) {
                        createLink(see, ctx.second().elementFor(refPackage), "<code>" + (label != null && label.length() > 0 ? label : refPackage.name()) + "</code>"); //NOI18N
                    } else {
                        see.append(className);
                    }

                    boolean plain = LINKPLAIN_TAG.equals(stag.name());
                    if (memberName != null) {
                        if (refClass != null) {
                            createLink(sb, ctx.second().elementFor(stag.referencedMember()), (plain ? "" : "<code>") + (label != null && label.length() > 0 ? label : (refClass.simpleTypeName() + "." + memberName)) + (plain ? "" : "</code>")); //NOI18N
                        } else {
                            sb.append(stag.referencedClassName());
                            sb.append('.'); //NOI18N

                        }
                    } else {
                        if (refClass != null) {
                            createLink(sb, ctx.second().elementFor(refClass), (plain ? "" : "<code>") + (label != null && label.length() > 0 ? label : refClass.simpleTypeName()) + (plain ? "" : "</code>")); //NOI18N
                        } else if (refPackage != null) {
                            createLink(sb, ctx.second().elementFor(refPackage), (plain ? "" : "<code>") + (label != null && label.length() > 0 ? label : refPackage.name()) + (plain ? "" : "</code>")); //NOI18N
                        } else {
                            String className = stag.referencedClassName();
                            sb.append(className != null ? className : stag.text());

                String tName = cd != null ? cd.name() : type.simpleTypeName();
                if (cd != null && cd.isAnnotationType() && annotation)
                    tName = "@" + tName; //NOI18N
                len += createLink(sb, ctx.second().elementFor(type.asClassDoc()), tName);
                ParameterizedType pt = type.asParameterizedType();
                if (pt != null) {
                    Type[] targs = pt.typeArguments();

            for (ClassDoc ifaceDoc : cdoc.interfaces()) {
                for (MethodDoc methodDoc : ifaceDoc.methods(false)) {
                    if (mdoc.overrides(methodDoc)) {
                        Element e = ctx.second().elementFor(methodDoc);
                        boolean isLocalized = false;
                        if (e != null) {
                            inheritedPage = JavadocHelper.getJavadoc(e, cancel);

                                docURL = inheritedPage.getLocation();
                            }
                            if (!(isLocalized = isLocalized(docURL, e)))
                                ctx.first().getTree(e);
                        }
                        if (!isLocalized) {
                            List<Tag> inheritedInlineTags = null;

            if (superclass != null) { //NOI18N
                for (MethodDoc methodDoc : superclass.methods(false)) {
                    if (mdoc.overrides(methodDoc)) {
                        Element e = ctx.second().elementFor(methodDoc);
                        boolean isLocalized = false;
                        if (e != null) {
                            inheritedPage = JavadocHelper.getJavadoc(e, cancel);

                                docURL = inheritedPage.getLocation();
                            }
                            if (!(isLocalized = isLocalized(docURL, e)))
                                ctx.first().getTree(e);
                        }
                        if (!isLocalized) {
                            List<Tag> inheritedInlineTags = null;

Lines 262-268 Link Here

(-)a/javascript.editing/nbproject/project.xml (-1 / +1 lines)
262	<build-prerequisite/>	262	<build-prerequisite/>
263	<compile-dependency/>	263	<compile-dependency/>
264	<run-dependency>	264	<run-dependency>
265	<specification-version>8.0</specification-version>	265	<specification-version>8.32</specification-version>
266	</run-dependency>	266	</run-dependency>
267	</dependency>	267	</dependency>
268	<dependency>	268	<dependency>




import org.openide.util.Exceptions;
import org.openide.util.ImageUtilities;
import org.openide.util.NbBundle;
import org.openide.util.Pair;

/**
 * Code completion handler for JavaScript

            matches = index.getElements(prefix, fqn, kind, result);
        } else {
            Pair<Set<IndexedElement>, Boolean> names = index.getAllNamesTruncated(prefix, kind, result);
            matches = names.first();
            boolean isTruncated = names.second();
            if (isTruncated) {
                request.completionResult.setTruncated(true);
                includeNonFqn = false;

//                    return true;
//                } else {
                Pair<Set<IndexedElement>, Boolean> names = index.getAllNamesTruncated(prefix, kind, result);
                elements = names.first();
                boolean isTruncated = names.second();
                if (isTruncated) {
                    request.completionResult.setTruncated(true);
                }


                if (token.id() == JsTokenId.NEW) {
                    Pair<Set<IndexedElement>, Boolean> constructors = index.getConstructors(prefix, kind);
                    Set<IndexedElement> elements = constructors.first();
                    if (constructors.second()) {
                        request.completionResult.setTruncated(true);
                    }
                    String lhs = request.call.getLhs();




import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileStateInvalidException;
import org.openide.util.Exceptions;
import org.openide.util.Pair;

/**
 *

    @SuppressWarnings("unchecked")
    public Set<IndexedElement> getAllNames(final String name, QuerySupport.Kind kind, JsParseResult context) {
        // TODO - search by the FIELD_CLASS thingy
        return getUnknownFunctions(name, kind, false, context, true, true).first();
    }

    @SuppressWarnings("unchecked")

                    elements.add(element);
                    
                    if (elements.size() == MAX_SEARCH_ITEMS) {
                        return Pair.<Set<IndexedElement>,Boolean>of(elements, true);
                    }
                }
            }
        }
        
        return Pair.<Set<IndexedElement>,Boolean>of(elements, false);
    }
    
    private Set<IndexedElement> getByFqn(




/*
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 *
 * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
 *
 * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
 * Other names may be trademarks of their respective owners.
 *
 * The contents of this file are subject to the terms of either the GNU
 * General Public License Version 2 only ("GPL") or the Common
 * Development and Distribution License("CDDL") (collectively, the
 * "License"). You may not use this file except in compliance with the
 * License. You can obtain a copy of the License at
 * http://www.netbeans.org/cddl-gplv2.html
 * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
 * specific language governing permissions and limitations under the
 * License.  When distributing the software, include this License Header
 * Notice in each file and include the License file at
 * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
 * particular file as subject to the "Classpath" exception as provided
 * by Oracle in the GPL Version 2 section of the License file that
 * accompanied this code. If applicable, add the following below the
 * License Header, with the fields enclosed by brackets [] replaced by
 * your own identifying information:
 * "Portions Copyrighted [year] [name of copyright owner]"
 *
 * Contributor(s):
 *
 * The Original Software is NetBeans. The Initial Developer of the Original
 * Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
 * Microsystems, Inc. All Rights Reserved.
 *
 * If you wish your version of this file to be governed by only the CDDL
 * or only the GPL Version 2, indicate your decision by adding
 * "[Contributor] elects to include this software in this distribution
 * under the [CDDL or GPL Version 2] license." If you do not indicate a
 * single choice of license, a recipient has the option to distribute
 * your version of this file under either the CDDL, the GPL Version 2 or
 * to extend the choice of license to its licensees as provided above.
 * However, if you add GPL Version 2 code and therefore, elected the GPL
 * Version 2 license, then the option applies only if the new code is
 * made subject to such option by the copyright holder.
 */
package org.netbeans.modules.javascript.editing;

/**
 *
 * @author Jan Lahoda
 */
public final class Pair<A, B> {

    private final A a;
    private final B b;

    public Pair(A a, B b) {
        this.a = a;
        this.b = b;
    }

    public A getA() {
        return a;
    }

    public B getB() {
        return b;
    }

    public static <A,B> Pair<A,B> of(A a, B b) {
      return new Pair<A, B>(a, b);
    } 
}

Lines 189-195 Link Here

(-)a/jumpto/nbproject/project.xml (-1 / +1 lines)
189	<build-prerequisite/>	189	<build-prerequisite/>
190	<compile-dependency/>	190	<compile-dependency/>
191	<run-dependency>	191	<run-dependency>
192	<specification-version>8.0</specification-version>	192	<specification-version>8.32</specification-version>
193	</run-dependency>	193	</run-dependency>
194	</dependency>	194	</dependency>
195	<dependency>	195	<dependency>

Lines 48-53 Link Here

(-)a/jumpto/src/org/netbeans/modules/jumpto/common/Models.java (+1 lines)
48	import javax.swing.AbstractListModel;	48	import javax.swing.AbstractListModel;
49	import javax.swing.ListModel;	49	import javax.swing.ListModel;
50	import org.netbeans.api.annotations.common.NonNull;	50	import org.netbeans.api.annotations.common.NonNull;
		51	import org.openide.util.Pair;
51		52
52	/**	53	/**
53	* (copied from org.netbeans.modules.java.source.util.Models	54	* (copied from org.netbeans.modules.java.source.util.Models




/*
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 *
 * Copyright 2012 Oracle and/or its affiliates. All rights reserved.
 *
 * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
 * Other names may be trademarks of their respective owners.
 *
 * The contents of this file are subject to the terms of either the GNU
 * General Public License Version 2 only ("GPL") or the Common
 * Development and Distribution License("CDDL") (collectively, the
 * "License"). You may not use this file except in compliance with the
 * License. You can obtain a copy of the License at
 * http://www.netbeans.org/cddl-gplv2.html
 * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
 * specific language governing permissions and limitations under the
 * License.  When distributing the software, include this License Header
 * Notice in each file and include the License file at
 * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
 * particular file as subject to the "Classpath" exception as provided
 * by Oracle in the GPL Version 2 section of the License file that
 * accompanied this code. If applicable, add the following below the
 * License Header, with the fields enclosed by brackets [] replaced by
 * your own identifying information:
 * "Portions Copyrighted [year] [name of copyright owner]"
 *
 * If you wish your version of this file to be governed by only the CDDL
 * or only the GPL Version 2, indicate your decision by adding
 * "[Contributor] elects to include this software in this distribution
 * under the [CDDL or GPL Version 2] license." If you do not indicate a
 * single choice of license, a recipient has the option to distribute
 * your version of this file under either the CDDL, the GPL Version 2 or
 * to extend the choice of license to its licensees as provided above.
 * However, if you add GPL Version 2 code and therefore, elected the GPL
 * Version 2 license, then the option applies only if the new code is
 * made subject to such option by the copyright holder.
 *
 * Contributor(s):
 *
 * Portions Copyrighted 2012 Sun Microsystems, Inc.
 */
package org.netbeans.modules.jumpto.common;

import org.netbeans.api.annotations.common.NonNull;
import org.netbeans.api.annotations.common.NullAllowed;

/**
 *
 * @author Tomas Zezula
 */
public final class Pair<F,S> {

    public final F first;
    public final S second;


    private Pair(
        @NullAllowed final F first,
        @NullAllowed final S second) {
        this.first = first;
        this.second = second;
    }

    @Override
    public String toString() {
        return String.format(
            "Pair[%s,%s]",  //NOI18N
            first,
            second);
    }

    @Override
    public int hashCode() {
        int res = 17;
        res = res * 31 + (first == null ? 0 : first.hashCode());
        res = res * 31 + (second == null ? 0 : second.hashCode());
        return res;
    }

    @Override
    public boolean equals(@NullAllowed final Object other) {
        if (other == this) {
            return true;
        }
        if (!(other instanceof Pair)) {
            return false;
        }
        final Pair<?,?> otherPair = (Pair<?,?>) other;
        return first == null ? otherPair.first == null : first.equals(otherPair.first) &&
            second == null ? otherPair.second == null : second.equals(otherPair.second);
    }


    @NonNull
    public static <F,S> Pair<F,S> of(
        @NullAllowed final F first,
        @NullAllowed final S second) {
        return new Pair<F,S>(first,second);
    }

}




import org.netbeans.modules.jumpto.common.Factory;
import org.netbeans.modules.jumpto.type.GoToTypeAction;
import org.netbeans.modules.jumpto.common.Models;
import org.netbeans.modules.jumpto.common.Pair;
import org.netbeans.modules.parsing.spi.indexing.support.IndexResult;
import org.netbeans.modules.parsing.spi.indexing.support.QuerySupport;
import org.netbeans.spi.jumpto.file.FileDescriptor;

import org.openide.util.ImageUtilities;
import org.openide.util.Lookup;
import org.openide.util.NbBundle;
import org.openide.util.Pair;
import org.openide.util.Parameters;
import org.openide.util.RequestProcessor;
import org.openide.util.Utilities;

                    new Factory<FileDescriptor, Pair<FileDescriptor,Runnable>>() {
                        @Override
                        public FileDescriptor create(@NonNull final Pair<FileDescriptor,Runnable> param) {
                            return new AsyncFileDescriptor(param.first(), param.second());
                        }
                    });


Lines 287-293 Link Here

(-)a/maven.hints/nbproject/project.xml (-1 / +1 lines)
287	<build-prerequisite/>	287	<build-prerequisite/>
288	<compile-dependency/>	288	<compile-dependency/>
289	<run-dependency>	289	<run-dependency>
290	<specification-version>8.0</specification-version>	290	<specification-version>8.32</specification-version>
291	</run-dependency>	291	</run-dependency>
292	</dependency>	292	</dependency>
293	<dependency>	293	<dependency>




/*
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 *
 * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
 *
 * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
 * Other names may be trademarks of their respective owners.
 *
 * The contents of this file are subject to the terms of either the GNU
 * General Public License Version 2 only ("GPL") or the Common
 * Development and Distribution License("CDDL") (collectively, the
 * "License"). You may not use this file except in compliance with the
 * License. You can obtain a copy of the License at
 * http://www.netbeans.org/cddl-gplv2.html
 * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
 * specific language governing permissions and limitations under the
 * License.  When distributing the software, include this License Header
 * Notice in each file and include the License file at
 * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
 * particular file as subject to the "Classpath" exception as provided
 * by Oracle in the GPL Version 2 section of the License file that
 * accompanied this code. If applicable, add the following below the
 * License Header, with the fields enclosed by brackets [] replaced by
 * your own identifying information:
 * "Portions Copyrighted [year] [name of copyright owner]"
 *
 * Contributor(s):
 *
 * The Original Software is NetBeans. The Initial Developer of the Original
 * Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
 * Microsystems, Inc. All Rights Reserved.
 *
 * If you wish your version of this file to be governed by only the CDDL
 * or only the GPL Version 2, indicate your decision by adding
 * "[Contributor] elects to include this software in this distribution
 * under the [CDDL or GPL Version 2] license." If you do not indicate a
 * single choice of license, a recipient has the option to distribute
 * your version of this file under either the CDDL, the GPL Version 2 or
 * to extend the choice of license to its licensees as provided above.
 * However, if you add GPL Version 2 code and therefore, elected the GPL
 * Version 2 license, then the option applies only if the new code is
 * made subject to such option by the copyright holder.
 */

package org.netbeans.modules.maven.hints.pom;

/**
 *
 * @author Jan Lahoda
 */
public final class Pair<A, B> {

    private A a;
    private B b;

    public Pair(A a, B b) {
        this.a = a;
        this.b = b;
    }

    public A getA() {
        return a;
    }

    public B getB() {
        return b;
    }
    
     @Override
     public String toString() {
         return "[" + String.valueOf(a) + "/" + String.valueOf(b) + "]";
     }
}




import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileUtil;
import org.openide.loaders.DataObject;
import org.openide.util.Pair;

/** Manages rules read from the system filesystem.
 *

                    r = instantiateRule(o);
                }
                if ( r != null ) {
                    rules.add( Pair.<POMErrorFixBase,FileObject>of( r, o ) );
                }
            }
        }

        dir2node.put(rootFolder, rootNode);

        for( Pair<POMErrorFixBase,FileObject> pair : rules ) {
            POMErrorFixBase rule = pair.first();
            FileObject fo = pair.second();

                Object nonGuiObject = fo.getAttribute(NON_GUI);
                boolean toGui = true;

Lines 3-6 Link Here

(-)a/maven.j2ee/manifest.mf (-1 / +1 lines)
3	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/maven/j2ee/Bundle.properties	3	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/maven/j2ee/Bundle.properties
4	OpenIDE-Module-Layer: org/netbeans/modules/maven/j2ee/layer.xml	4	OpenIDE-Module-Layer: org/netbeans/modules/maven/j2ee/layer.xml
5	AutoUpdate-Show-In-Client: false	5	AutoUpdate-Show-In-Client: false
6	OpenIDE-Module-Specification-Version: 1.34	6	OpenIDE-Module-Specification-Version: 1.35

Lines 324-330 Link Here

(-)a/maven.j2ee/nbproject/project.xml (-1 / +1 lines)
324	<build-prerequisite/>	324	<build-prerequisite/>
325	<compile-dependency/>	325	<compile-dependency/>
326	<run-dependency>	326	<run-dependency>
327	<specification-version>1.27</specification-version>	327	<specification-version>1.28</specification-version>
328	</run-dependency>	328	</run-dependency>
329	</dependency>	329	</dependency>
330	<dependency>	330	<dependency>




    <apidef name="actions">Actions API</apidef>
</apidefs>
<changes>
    <change id="pair">
        <api name="util"/>
        <summary>Added a type safe Pair of 2 elements</summary>
        <version major="8" minor="32"/>
        <date year="2013" month="5" day="1"/>
        <author login="tzezula"/>
        <compatibility addition="yes" binary="compatible" source="compatible"/>
        <description>
            <p>
                Added a type safe Pair of 2 elements.
            </p>
        </description>
        <class package="org.openide.util" name="Pair"/>
        <issue number="228994"/>
    </change>
    <change id="automatic-uqe">
        <api name="util"/>
        <summary>Automatic support for UserQuestionException</summary>

Lines 1-5 Link Here

(-)a/openide.util/manifest.mf (-1 / +1 lines)
1	Manifest-Version: 1.0	1	Manifest-Version: 1.0
2	OpenIDE-Module: org.openide.util	2	OpenIDE-Module: org.openide.util
3	OpenIDE-Module-Localizing-Bundle: org/openide/util/Bundle.properties	3	OpenIDE-Module-Localizing-Bundle: org/openide/util/Bundle.properties
4	OpenIDE-Module-Specification-Version: 8.31	4	OpenIDE-Module-Specification-Version: 8.32
5		5




/*
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 *
 * Copyright 2013 Oracle and/or its affiliates. All rights reserved.
 *
 * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
 * Other names may be trademarks of their respective owners.
 *
 * The contents of this file are subject to the terms of either the GNU
 * General Public License Version 2 only ("GPL") or the Common
 * Development and Distribution License("CDDL") (collectively, the
 * "License"). You may not use this file except in compliance with the
 * License. You can obtain a copy of the License at
 * http://www.netbeans.org/cddl-gplv2.html
 * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
 * specific language governing permissions and limitations under the
 * License.  When distributing the software, include this License Header
 * Notice in each file and include the License file at
 * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
 * particular file as subject to the "Classpath" exception as provided
 * by Oracle in the GPL Version 2 section of the License file that
 * accompanied this code. If applicable, add the following below the
 * License Header, with the fields enclosed by brackets [] replaced by
 * your own identifying information:
 * "Portions Copyrighted [year] [name of copyright owner]"
 *
 * If you wish your version of this file to be governed by only the CDDL
 * or only the GPL Version 2, indicate your decision by adding
 * "[Contributor] elects to include this software in this distribution
 * under the [CDDL or GPL Version 2] license." If you do not indicate a
 * single choice of license, a recipient has the option to distribute
 * your version of this file under either the CDDL, the GPL Version 2 or
 * to extend the choice of license to its licensees as provided above.
 * However, if you add GPL Version 2 code and therefore, elected the GPL
 * Version 2 license, then the option applies only if the new code is
 * made subject to such option by the copyright holder.
 *
 * Contributor(s):
 *
 * Portions Copyrighted 2013 Sun Microsystems, Inc.
 */
package org.openide.util;

/**
 * A type safe pair of two object.
 * @author Tomas Zezula
 * @since 8.32
 */
public final class Pair<First,Second> {

    private final First first;
    private final Second second;


    private Pair(final First first, final Second second) {
        this.first = first;
        this.second = second;
    }

    /**
     * Returns the first element of the {@link Pair}.
     * @return the first element.
     */
    public First first() {
        return first;
    }

    /**
     * Returns the second element of the {@link Pair}.
     * @return the second element.
     */
    public Second second() {
        return second;
    }

    @Override
    public String toString () {
        return String.format("Pair[%s,%s]", first,second);  //NOI18N
    }

    @Override
    public boolean equals(final Object other) {
        if (other == this) {
            return true;
        }
        if (!(other instanceof Pair)) {
            return false;
        }
        final Pair<?,?> otherPair = (Pair<?,?>) other;
        return (first == null ? otherPair.first == null : first.equals(otherPair.first)) &&
            (second == null ? otherPair.second == null : second.equals(otherPair.second));
    }

    @Override
    public int hashCode() {
        int res = 17;
        res = res * 31 + (first == null ? 0 : first.hashCode());
        res = res * 31 + (second == null ? 0 : second.hashCode());
        return res;
    }


    /**
     * Creates a new Pair.
     * @param <First>   the type of the first element
     * @param <Second>  the type of the second element
     * @param first     the first element
     * @param second    the second element
     * @return  the new {@link Pair} of the first and second elements.
     */
    public static <First,Second> Pair<First,Second> of (final First first, final Second second) {
        return new Pair<First, Second>(first, second);
    }
}




/*
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 *
 * Copyright 2013 Oracle and/or its affiliates. All rights reserved.
 *
 * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
 * Other names may be trademarks of their respective owners.
 *
 * The contents of this file are subject to the terms of either the GNU
 * General Public License Version 2 only ("GPL") or the Common
 * Development and Distribution License("CDDL") (collectively, the
 * "License"). You may not use this file except in compliance with the
 * License. You can obtain a copy of the License at
 * http://www.netbeans.org/cddl-gplv2.html
 * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
 * specific language governing permissions and limitations under the
 * License.  When distributing the software, include this License Header
 * Notice in each file and include the License file at
 * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
 * particular file as subject to the "Classpath" exception as provided
 * by Oracle in the GPL Version 2 section of the License file that
 * accompanied this code. If applicable, add the following below the
 * License Header, with the fields enclosed by brackets [] replaced by
 * your own identifying information:
 * "Portions Copyrighted [year] [name of copyright owner]"
 *
 * If you wish your version of this file to be governed by only the CDDL
 * or only the GPL Version 2, indicate your decision by adding
 * "[Contributor] elects to include this software in this distribution
 * under the [CDDL or GPL Version 2] license." If you do not indicate a
 * single choice of license, a recipient has the option to distribute
 * your version of this file under either the CDDL, the GPL Version 2 or
 * to extend the choice of license to its licensees as provided above.
 * However, if you add GPL Version 2 code and therefore, elected the GPL
 * Version 2 license, then the option applies only if the new code is
 * made subject to such option by the copyright holder.
 *
 * Contributor(s):
 *
 * Portions Copyrighted 2013 Sun Microsystems, Inc.
 */
package org.openide.util;

import org.netbeans.junit.NbTestCase;

/**
 *
 * @author Tomas Zezula
 */
public class PairTest extends NbTestCase {

    public PairTest(String name) {
        super(name);
    }


    public void testPairs() {
        final Pair<Integer,Integer> p1a = Pair.of(1, 1);
        final Pair<Integer,Integer> p1b = Pair.of(1, 1);
        final Pair<Integer,Integer> p2 = Pair.of(1, 2);
        final Pair<Integer,Integer> p3 = Pair.of(2, 1);
        final Pair<Integer,Integer> p4 = Pair.of(null, 1);
        final Pair<Integer,Integer> p5 = Pair.of(1, null);
        final Pair<Integer,Integer> p6 = Pair.of(null, null);
        assertTrue(p1a.equals(p1a));
        assertTrue(p1a.equals(p1b));
        assertFalse(p1a.equals(p2));
        assertFalse(p1a.equals(p3));
        assertFalse(p1a.equals(p4));
        assertFalse(p1a.equals(p5));
        assertFalse(p1a.equals(p6));
        assertEquals(p1a.hashCode(), p1b.hashCode());
        assertEquals(p4.hashCode(), p4.hashCode());
        assertEquals(p5.hashCode(), p5.hashCode());
        assertEquals(p6.hashCode(), p6.hashCode());
        assertFalse(p4.hashCode() == p5.hashCode());
    }

}

Lines 218-224 Link Here

(-)a/parsing.api/nbproject/project.xml (-1 / +1 lines)
218	<build-prerequisite/>	218	<build-prerequisite/>
219	<compile-dependency/>	219	<compile-dependency/>
220	<run-dependency>	220	<run-dependency>
221	<specification-version>8.25</specification-version>	221	<specification-version>8.32</specification-version>
222	</run-dependency>	222	</run-dependency>
223	</dependency>	223	</dependency>
224	<dependency>	224	<dependency>

Lines 63-69 Link Here

(-)a/parsing.api/src/org/netbeans/modules/parsing/impl/SourceCache.java (-1 / +1 lines)
63	import org.netbeans.modules.parsing.api.Snapshot;	63	import org.netbeans.modules.parsing.api.Snapshot;
64	import org.netbeans.modules.parsing.api.Source;	64	import org.netbeans.modules.parsing.api.Source;
65	import org.netbeans.modules.parsing.api.Task;	65	import org.netbeans.modules.parsing.api.Task;
66	import org.netbeans.modules.parsing.impl.indexing.Pair;
67	import org.netbeans.modules.parsing.spi.EmbeddingProvider;	66	import org.netbeans.modules.parsing.spi.EmbeddingProvider;
68	import org.netbeans.modules.parsing.spi.ParseException;	67	import org.netbeans.modules.parsing.spi.ParseException;
69	import org.netbeans.modules.parsing.spi.Parser;	68	import org.netbeans.modules.parsing.spi.Parser;
Lines 76-81 Link Here
76	import org.netbeans.modules.parsing.spi.Scheduler;	75	import org.netbeans.modules.parsing.spi.Scheduler;
77	import org.openide.filesystems.FileObject;	76	import org.openide.filesystems.FileObject;
78	import org.openide.util.Lookup;	77	import org.openide.util.Lookup;
		78	import org.openide.util.Pair;
79		79
80		80
81	/**	81	/**




import org.netbeans.modules.parsing.api.Task;
import org.netbeans.modules.parsing.api.UserTask;
import org.netbeans.modules.parsing.api.indexing.IndexingManager;
import org.netbeans.modules.parsing.impl.indexing.Pair;
import org.netbeans.modules.parsing.impl.indexing.RepositoryUpdater;
import org.netbeans.modules.parsing.impl.indexing.Util;
import org.netbeans.modules.parsing.spi.*;
import org.netbeans.modules.parsing.spi.Parser.Result;
import org.openide.util.Exceptions;
import org.openide.util.Mutex;
import org.openide.util.Pair;
import org.openide.util.Parameters;
import org.openide.util.RequestProcessor;


        Parameters.notNull("cache", cache);   //NOI18N
        List<Request> _requests = new ArrayList<Request> ();
        for (Pair<SchedulerTask,Class<? extends Scheduler>> task : tasks) {
            final String taskClassName = task.first().getClass().getName();
            if (excludedTasks != null && excludedTasks.matcher(taskClassName).matches()) {
                if (includedTasks == null || !includedTasks.matcher(taskClassName).matches())
                    continue;
            }
            _requests.add (new Request (task.first(), cache, bridge ? ReschedulePolicy.ON_CHANGE : ReschedulePolicy.CANCELED, task.second()));
        }
        return _requests;
    }




import org.netbeans.modules.masterfs.providers.ProvidedExtensions;
import org.netbeans.modules.parsing.api.Source;
import org.netbeans.modules.parsing.impl.event.EventSupport;
import org.netbeans.modules.parsing.impl.indexing.Pair;
import org.netbeans.modules.parsing.impl.indexing.RepositoryUpdater;
import org.netbeans.modules.parsing.spi.Parser;
import org.netbeans.modules.parsing.spi.ParserResultTask;
import org.netbeans.modules.parsing.spi.Scheduler;
import org.netbeans.modules.parsing.spi.SchedulerTask;
import org.openide.util.Pair;
import org.openide.util.Parameters;

/**




import org.openide.filesystems.FileUtil;
import org.openide.util.EditableProperties;
import org.openide.util.Exceptions;
import org.openide.util.Pair;
import org.openide.util.Parameters;
import org.openide.util.RequestProcessor;


    @NonNull
    private static String generate(Pair<Long,Map<Pair<String,Integer>,Integer>> data) {
        final StringBuilder sb = new StringBuilder();
        for (Map.Entry<Pair<String,Integer>,Integer> r : data.second().entrySet()) {
            final Pair<String,Integer> key = r.getKey();
            assert key.first().indexOf(SEPARATOR) < 0;
            sb.append(key.first());
            sb.append(SEPARATOR);
            sb.append(key.second());
            sb.append(SEPARATOR);
            sb.append(r.getValue());
            sb.append(SEPARATOR);
        }
        sb.append(data.first());
        return sb.toString();
    }





import org.netbeans.modules.parsing.lucene.support.DocumentIndexCache;
import org.netbeans.modules.parsing.lucene.support.IndexDocument;
import org.netbeans.modules.parsing.spi.indexing.Indexable;
import org.openide.util.Pair;
import org.openide.util.Parameters;
import org.openide.util.Utilities;


                    MessageFormat.format(
                        "{0} : Attached at: {1} by: {2}, Detached at: {3} by: {4}",   //NOI18N
                        reason,
                        attach == null ? null : attach.first(),
                        attach == null ? null : Arrays.asList(attach.second()),
                        detach == null ? null : detach.first(),
                        detach == null ? null : Arrays.asList(detach.second())));
            }
            
        }




import java.util.logging.Logger;
import org.netbeans.modules.parsing.impl.indexing.RepositoryUpdater.Work;
import org.openide.filesystems.FileEvent;
import org.openide.util.Pair;

/**
 *

        if (myChanges != null) {
            for (Map<String,Pair<FileOp,Work>> changesInRoot : myChanges.values()) {
                for (Pair<FileOp,Work> desc : changesInRoot.values()) {
                    if (desc.first() == FileOp.DELETE) {
                        if (!seenDelete.containsKey(desc.second())) {
                            first.add(desc.second());
                            seenDelete.put(desc.second(), desc.second());
                        }
                    }
                    else {
                        rest.add(desc.second());
                    }
                }
            }

Lines 65-70 Link Here

(-)a/parsing.api/src/org/netbeans/modules/parsing/impl/indexing/FileObjectCrawler.java (+1 lines)
65	import org.netbeans.modules.parsing.spi.indexing.Indexable;	65	import org.netbeans.modules.parsing.spi.indexing.Indexable;
66	import org.openide.filesystems.FileObject;	66	import org.openide.filesystems.FileObject;
67	import org.openide.filesystems.FileUtil;	67	import org.openide.filesystems.FileUtil;
		68	import org.openide.util.Pair;
68		69
69	/**	70	/**
70	*	71	*

Lines 52-57 Link Here

(-)a/parsing.api/src/org/netbeans/modules/parsing/impl/indexing/IndexBinaryWorkPool.java (+1 lines)
52	import java.util.logging.Logger;	52	import java.util.logging.Logger;
53	import org.netbeans.api.annotations.common.NonNull;	53	import org.netbeans.api.annotations.common.NonNull;
54	import org.openide.util.Exceptions;	54	import org.openide.util.Exceptions;
		55	import org.openide.util.Pair;
55	import org.openide.util.RequestProcessor;	56	import org.openide.util.RequestProcessor;
56		57
57	/**	58	/**




import org.netbeans.api.java.classpath.ClassPath;
import org.openide.filesystems.FileObject;
import org.openide.util.NbBundle;
import org.openide.util.Pair;
import org.openide.util.Parameters;
import org.openide.util.RequestProcessor;
import org.openide.util.Utilities;

                return;
            }
            
            LOG.log(Level.WARNING, "Excessive indexing rate detected: " + dataSize(found.first(), found.second()) + " in " + minutes + "mins, treshold is " + treshold +
                    ". Dumping suspicious contexts");
            int index;
            
             for (index = found.first(); index != found.second(); index = (index + 1) % times.length) {
                contexts[index].log(false, false);
            }
            LOG.log(Level.WARNING, "=== End excessive indexing");




/*
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 *
 * Copyright 2010 Oracle and/or its affiliates. All rights reserved.
 *
 * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
 * Other names may be trademarks of their respective owners.
 *
 * The contents of this file are subject to the terms of either the GNU
 * General Public License Version 2 only ("GPL") or the Common
 * Development and Distribution License("CDDL") (collectively, the
 * "License"). You may not use this file except in compliance with the
 * License. You can obtain a copy of the License at
 * http://www.netbeans.org/cddl-gplv2.html
 * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
 * specific language governing permissions and limitations under the
 * License.  When distributing the software, include this License Header
 * Notice in each file and include the License file at
 * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
 * particular file as subject to the "Classpath" exception as provided
 * by Oracle in the GPL Version 2 section of the License file that
 * accompanied this code. If applicable, add the following below the
 * License Header, with the fields enclosed by brackets [] replaced by
 * your own identifying information:
 * "Portions Copyrighted [year] [name of copyright owner]"
 *
 * If you wish your version of this file to be governed by only the CDDL
 * or only the GPL Version 2, indicate your decision by adding
 * "[Contributor] elects to include this software in this distribution
 * under the [CDDL or GPL Version 2] license." If you do not indicate a
 * single choice of license, a recipient has the option to distribute
 * your version of this file under either the CDDL, the GPL Version 2 or
 * to extend the choice of license to its licensees as provided above.
 * However, if you add GPL Version 2 code and therefore, elected the GPL
 * Version 2 license, then the option applies only if the new code is
 * made subject to such option by the copyright holder.
 *
 * Contributor(s):
 *
 * Portions Copyrighted 2009 Sun Microsystems, Inc.
 */

package org.netbeans.modules.parsing.impl.indexing;

/**
 *
 * @author Tomas Zezula
 */
public final class Pair<P,K> {

    public final P first;
    public final K second;

    private Pair (P first, K second) {
        this.first = first;
        this.second = second;
    }


    public static <P,K> Pair<P,K> of (P first, K second) {
        return new Pair<P,K> (first,second);
    }


    @Override
    public int hashCode () {
        int hashCode  = 0;
        hashCode ^= first == null ? 0 : first.hashCode();
        hashCode ^= second == null ? 0: second.hashCode();
        return hashCode;
    }

    @Override
    public boolean equals (final Object other) {
        if (other instanceof Pair) {
            Pair otherPair = (Pair) other;
            return (this.first == null ? otherPair.first == null : this.first.equals(otherPair.first)) &&
                   (this.second == null ? otherPair.second == null : this.second.equals(otherPair.second));
        }
        return false;
    }

    @Override
    public String toString () {
        return String.format("Pair[%s,%s]", first,second);
    }
}




import org.openide.util.Lookup;
import org.openide.util.Mutex.ExceptionAction;
import org.openide.util.NbBundle;
import org.openide.util.Pair;
import org.openide.util.Parameters;
import org.openide.util.RequestProcessor;
import org.openide.util.TopologicalSortException;

        if (fo != null && fo.isValid()) {
            if (source == null || source.booleanValue()) {
                root = getOwningSourceRoot(fo);
                if (root != null && visibilitySupport.isVisible(fo, root.second())) {
                    if (root.second() == null) {
                        LOGGER.log(
                            Level.INFO,
                            "Ignoring event from non existing FileObject {0}",  //NOI18N
                            root.first());
                        return;
                    }
                    boolean sourcForBinaryRoot = sourcesForBinaryRoots.contains(root.first());
                    ClassPath.Entry entry = sourcForBinaryRoot ? null : getClassPathEntry(root.second());
                    if (entry == null || entry.includes(fo)) {
                        Work wrk;
                        if (fo.equals(root.second())) {
                            if (scannedRoots2Dependencies.get(root.first()) == EMPTY_DEPS) {
                                //For first time seeing valid root do roots work to recalculate dependencies
                                wrk = new RootsWork(
                                    scannedRoots2Dependencies,

                                    false,
                                    scannedRoots2DependenciesLamport,
                                    suspendSupport.getSuspendStatus(),
                                    LogContext.create(LogContext.EventType.FILE, null).addRoots(Collections.singleton(root.first())));
                            } else {
                                //Already seen files work is enough
                                final FileObject[] children = fo.getChildren();

                                if (children.length > 0) {
                                    wrk = new FileListWork(
                                        scannedRoots2Dependencies,
                                        root.first(),
                                        c,
                                        false,
                                        false,

                                        true,
                                        suspendSupport.getSuspendStatus(),
                                        LogContext.create(LogContext.EventType.FILE, null).
                                            withRoot(root.first()).
                                            addFileObjects(c));
                                } else {
                                    //If no children nothing needs to be done - save some CPU time

                            Collection<FileObject> c = Collections.singleton(fo);
                            wrk = new FileListWork(
                                scannedRoots2Dependencies,
                                root.first(),
                                c,
                                false,
                                false,

                                true,
                                suspendSupport.getSuspendStatus(),
                                LogContext.create(LogContext.EventType.FILE, null).
                                    withRoot(root.first()).
                                    addFileObjects(c));
                        }
                        if (wrk != null) {
                            eventQueue.record(FileEventLog.FileOp.CREATE, root.first(), FileUtil.getRelativePath(root.second(), fo), fe, wrk);
                        }
                        processed = true;
                    }


            if (!processed && (source == null || !source.booleanValue())) {
                root = getOwningBinaryRoot(fo);
                if (root != null && visibilitySupport.isVisible(fo, root.second())) {
                    final Work wrk = new BinaryWork(
                        root.first(),
                        suspendSupport.getSuspendStatus(),
                        LogContext.create(LogContext.EventType.FILE, null).
                            withRoot(root.first()).
                            addFileObjects(Collections.singleton(fo)));
                    eventQueue.record(FileEventLog.FileOp.CREATE, root.first(), null, fe, wrk);
                    processed = true;
                }
            }

        if (fo != null && fo.isValid()) {
            if (source == null || source.booleanValue()) {
                root = getOwningSourceRoot (fo);
                if (root != null && visibilitySupport.isVisible(fo,root.second())) {
                    if (root.second() == null) {
                        LOGGER.log(
                            Level.INFO,
                            "Ignoring event from non existing FileObject {0}",  //NOI18N
                            root.first());
                        return;
                    }
                    boolean sourceForBinaryRoot = sourcesForBinaryRoots.contains(root.first());
                    ClassPath.Entry entry = sourceForBinaryRoot ? null : getClassPathEntry(root.second());
                    if (entry == null || entry.includes(fo)) {
                        final Work wrk = new FileListWork(
                            scannedRoots2Dependencies,
                            root.first(),
                            Collections.singleton(fo),
                            false,
                            false,

                            true,
                            suspendSupport.getSuspendStatus(),
                            LogContext.create(LogContext.EventType.FILE, null).
                                withRoot(root.first()).
                                addFiles(Collections.singleton(fo.toURL())));
                        eventQueue.record(FileEventLog.FileOp.CREATE, root.first(), FileUtil.getRelativePath(root.second(), fo), fe, wrk);
                        processed = true;
                    }
                }


            if (!processed && (source == null || !source.booleanValue())) {
                root = getOwningBinaryRoot(fo);
                if (root != null && visibilitySupport.isVisible(fo,root.second())) {
                    final Work wrk = new BinaryWork(
                        root.first(),
                        suspendSupport.getSuspendStatus(),
                        LogContext.create(LogContext.EventType.FILE, null).
                            withRoot(root.first()).
                            addFiles(Collections.singleton(fo.toURL())));
                    eventQueue.record(FileEventLog.FileOp.CREATE, root.first(), null, fe, wrk);
                    processed = true;
                }
            }

        if (fo != null) {
            if (source == null || source.booleanValue()) {
                root = getOwningSourceRoot (fo);
                if (root != null && fo.isData() && visibilitySupport.isVisible(fo, root.second())) {
                    String relativePath = null;
                    try {
                    //Root may be deleted -> no root.second available
                        if (root.second() != null) {
                            relativePath = FileUtil.getRelativePath(root.second(), fo);
                        } else {
                            relativePath = root.first().toURI().relativize(fo.getURL().toURI()).getPath();
                        }
                        assert relativePath != null : "FileObject not under root: f=" + fo + ", root=" + root; //NOI18N
                        final Work wrk = new DeleteWork(
                            root.first(),
                            Collections.singleton(relativePath),
                            suspendSupport.getSuspendStatus(),
                            LogContext.create(LogContext.EventType.FILE, null).
                                withRoot(root.first()).
                                addFiles(Collections.singleton(fo.toURL())));
                        eventQueue.record(FileEventLog.FileOp.DELETE, root.first(), relativePath, fe, wrk);
                        processed = true;
                    } catch (FileStateInvalidException fse) {
                        Exceptions.printStackTrace(fse);


            if (!processed && (source == null || !source.booleanValue())) {
                root = getOwningBinaryRoot(fo);
                if (root != null && visibilitySupport.isVisible(fo, root.second())) {
                    final Work wrk = new BinaryWork(
                        root.first(),
                        suspendSupport.getSuspendStatus(),
                        LogContext.create(LogContext.EventType.FILE, null).
                            withRoot(root.first()).
                            addFiles(Collections.singleton(fo.toURL())));
                    eventQueue.record(FileEventLog.FileOp.DELETE, root.first(), null, fe, wrk);
                    processed = true;
                }
            }

            if (source == null || source.booleanValue()) {
                root = getOwningSourceRoot(newFile);
                if (root != null) {
                    if (root.second() == null) {
                        LOGGER.log(
                            Level.INFO,
                            "Ignoring event from non existing FileObject {0}",  //NOI18N
                            root.first());
                        return;
                    }
                    FileObject rootFo = root.second();
                    if (rootFo.equals(newFile)) {
                        //Root renamed do nothing, will be fired as ClassPath change.
                        return;

                    String oldFilePath =  ownerPath.length() == 0 ? oldNameExt : ownerPath + "/" + oldNameExt; //NOI18N
                    if (newFile.isData()) {
                        final Work work = new DeleteWork(
                            root.first(),
                            Collections.singleton(oldFilePath),
                            suspendSupport.getSuspendStatus(),
                            LogContext.create(LogContext.EventType.FILE, null).
                                withRoot(root.first()).
                                addFilePaths(Collections.singleton(oldFilePath)));
                        eventQueue.record(FileEventLog.FileOp.DELETE, root.first(), oldFilePath, fe, work);
                    } else {
                        Set<String> oldFilePaths = new HashSet<String>();
                        collectFilePaths(newFile, oldFilePath, oldFilePaths);
                        for (String path : oldFilePaths) {
                            final Work work = new DeleteWork(
                                root.first(),
                                oldFilePaths,
                                suspendSupport.getSuspendStatus(),
                                LogContext.create(LogContext.EventType.FILE, null).
                                    withRoot(root.first()).
                                    addFilePaths(oldFilePaths));
                            eventQueue.record(FileEventLog.FileOp.DELETE, root.first(), path, fe, work);
                        }
                    }

                    if (visibilitySupport.isVisible(newFile,root.second())) {
                        final boolean sourceForBinaryRoot = sourcesForBinaryRoots.contains(root.first());
                        ClassPath.Entry entry = sourceForBinaryRoot ? null : getClassPathEntry(rootFo);
                        if (entry == null || entry.includes(newFile)) {
                            final FileListWork flw = new FileListWork(
                                scannedRoots2Dependencies,
                                root.first(),
                                Collections.singleton(newFile),
                                false,
                                false,

                                true,
                                suspendSupport.getSuspendStatus(),
                                LogContext.create(LogContext.EventType.FILE, null).
                                    withRoot(root.first()).
                                    addFileObjects(Collections.singleton(newFile)));
                            eventQueue.record(FileEventLog.FileOp.CREATE, root.first(), FileUtil.getRelativePath(rootFo, newFile), fe,flw);
                        }
                    }
                    processed = true;


                    eventQueue.record(
                            FileEventLog.FileOp.CREATE,
                            root.first(),
                            null,
                            fe,
                            new BinaryWork(root.first(),
                                suspendSupport.getSuspendStatus(),
                                LogContext.create(LogContext.EventType.FILE, null).
                                    withRoot(root.first()).
                                    addRoots(Collections.singleton(root.first()))));
                    processed = true;
                }
            }

                Document doc = jtc.getDocument();
                Pair<URL, FileObject> root = getOwningSourceRoot(doc);
                if (root != null) {
                    if (root.second() == null) {
                        final FileObject file = Util.getFileObject(doc);
                        assert file == null || !file.isValid() : "Expecting both owningSourceRootUrl=" + root.first() + " and owningSourceRoot=" + root.second(); //NOI18N
                        return;
                    }                    
                    long version = DocumentUtilities.getDocumentVersion(doc);

                    if (reindex) {
                        // we have already seen the document and it's been modified since the last time
                        if (LOGGER.isLoggable(Level.FINE)) {
                            LOGGER.fine("Document modified (reindexing): " + FileUtil.getFileDisplayName(docFile) + " Owner: " + root.first()); //NOI18N
                        }

                        FileListWork job = jobs.get(root.first());
                        if (job == null) {
                            Collection<FileObject> c = Collections.singleton(docFile);
                            job = new FileListWork(
                                    scannedRoots2Dependencies,
                                    root.first(),
                                    c,
                                    false,
                                    openedInEditor,
                                    true,
                                    sourcesForBinaryRoots.contains(root.first()),
                                    true,
                                    suspendSupport.getSuspendStatus(),
                                    LogContext.create(LogContext.EventType.FILE, null).
                                        withRoot(root.first()).
                                        addFileObjects(c));
                            jobs.put(root.first(), job);
                        } else {
                            // XXX: strictly speaking we should set 'checkEditor' for each file separately
                            // and not for each job; in reality we normally do not end up here


        final Pair<URL, FileObject> root = getOwningSourceRoot(document);
        if (root != null) {
            if (root.second() == null) {
                LOGGER.log(
                    Level.INFO,
                    "Ignoring event from non existing FileObject {0}",  //NOI18N
                    root.first());
                return;
            }
            if (activeDocument == document) {

                    // An active document was modified, we've indexed that document berfore,
                    // so mark it dirty
                    if (LOGGER.isLoggable(Level.FINE)) {
                        LOGGER.fine("Active document modified (marking dirty): " + FileUtil.getFileDisplayName(docFile) + " Owner: " + root.first()); //NOI18N
                    }

                    Collection<? extends Indexable> dirty = Collections.singleton(SPIAccessor.getInstance().create(new FileObjectIndexable(root.second(), docFile)));
                    String mimeType = DocumentUtilities.getMimeType(document);

                    TransientUpdateSupport.setTransientUpdate(true);

                                @Override
                                public FileObject call() throws Exception {
                                    if (cache == null) {
                                        cache = CacheFolder.getDataFolder(root.first());
                                    }
                                    return cache;
                                }

                                final CustomIndexerFactory factory = info.getIndexerFactory();
                                final Context ctx = SPIAccessor.getInstance().createContext(
                                        indexFolderFactory,
                                        root.first(),
                                        factory.getIndexerName(),
                                        factory.getIndexVersion(),
                                        null,

                                final EmbeddingIndexerFactory factory = info.getIndexerFactory();
                                final Context ctx = SPIAccessor.getInstance().createContext(
                                        indexFolderFactory,
                                        root.first(),
                                        factory.getIndexerName(),
                                        factory.getIndexVersion(),
                                        null,

                    FileObject f = Util.getFileObject(document);
                    Collection<URL> c = Collections.singleton(f.getURL());
                    addIndexingJob(
                        root.first(),
                        c,
                        false,
                        true,

                        true,
                        true,
                        LogContext.create(LogContext.EventType.FILE, null).
                            withRoot(root.first()).
                            addFiles(c));
                } catch (FileStateInvalidException ex) {
                    LOGGER.log(Level.WARNING, null, ex);

                }
                logStartIndexer(factory.getIndexerName());
                try {
                    boolean vote = factory.scanStarted(value.second());
                    votes.put(factory,vote);
                } catch (Throwable t) {
                    if (t instanceof ThreadDeath) {

                    }
                    logStartIndexer(eif.getIndexerName());
                    try {
                        boolean vote = eif.scanStarted(value.second());
                        votes.put(eif, vote);
                    } catch (Throwable t) {
                        if (t instanceof ThreadDeath) {

                    parkWhileSuspended();
                    if (TEST_LOGGER.isLoggable(Level.FINEST)) {
                        TEST_LOGGER.log(Level.FINEST, "scanFinishing:{0}:{1}", 
                                new Object[] { entry.first().getIndexerName(), entry.second().getRootURI().toExternalForm() });
                    }
                    logStartIndexer(entry.first().getIndexerName());
                    SPIAccessor.getInstance().putProperty(entry.second(), ClusteredIndexables.DELETE, null);
                    SPIAccessor.getInstance().putProperty(entry.second(), ClusteredIndexables.INDEX, null);
                    cancelRequest.setResult(finished);
                    try {
                        entry.first().scanFinished(entry.second());
                    }  catch (Throwable t) {
                        if (t instanceof ThreadDeath) {
                            throw (ThreadDeath) t;

                    } finally {
                        cancelRequest.setResult(null);
                    }
                    logFinishIndexer(entry.first().getIndexerName());
                    if (TEST_LOGGER.isLoggable(Level.FINEST)) {
                        TEST_LOGGER.log(Level.FINEST, "scanFinished:{0}:{1}", 
                                new Object[] { entry.first().getIndexerName(), entry.second().getRootURI().toExternalForm() });
                    }
                }
            } finally {

                    boolean indexOk = true;
                    for(Pair<SourceIndexerFactory,Context> entry : ctxToFinish) {
                        indexOk &= storeChanges(
                                entry.first().getIndexerName(),
                                entry.second(),
                                isSteady(),
                                usedIterables.get(),
                                finished);
                    }
                    if (!indexOk) {
                        final Context ctx = ctxToFinish.iterator().next().second();
                        RepositoryUpdater.getDefault().addIndexingJob(
                            ctx.getRootURI(),
                            null,

            try {
                for (Pair<SourceIndexerFactory,Context> pair : contexts.values()) {
                    parkWhileSuspended();
                    SPIAccessor.getInstance().putProperty(pair.second(), ClusteredIndexables.DELETE, ci);
                    pair.first().filesDeleted(ci.getIndexablesFor(null), pair.second());
                }
            } finally {
                for(Pair<SourceIndexerFactory,Context> pair : contexts.values()) {
                    DocumentIndex index = SPIAccessor.getInstance().getIndexFactory(pair.second()).getIndex(pair.second().getIndexFolder());
                    if (index != null) {
                        usedIterables.offer(ci.getIndexablesFor(null));
                    }

                                        factory
                                    });
                        }
                        SPIAccessor.getInstance().setAllFilesJob(value.second(), allFiles);
                        List<Iterable<Indexable>> indexerIndexablesList = new LinkedList<Iterable<Indexable>>();
                        ClusteredIndexables usedCi = null;
                        for(String mimeType : cifInfo.getMimeTypes()) {

                        final CustomIndexer indexer = factory.createIndexer();
                        long tm1 = -1, tm2 = -1;
                        logStartIndexer(factory.getIndexerName());
                        SPIAccessor.getInstance().putProperty(value.second(), ClusteredIndexables.INDEX, usedCi);
                        try {
                            tm1 = System.currentTimeMillis();
                            SPIAccessor.getInstance().index(indexer, indexables, value.second());
                        } catch (ThreadDeath td) {
                            throw td;
                        } catch (Throwable t) {

                                        value = Pair.<SourceIndexerFactory,Context>of(factory,ctx);
                                        contexts.put(key,value);
                                    }
                                    SPIAccessor.getInstance().setAllFilesJob(value.second(), allFiles);
                                }
                            }
                        }

        protected final  boolean checkBinaryIndexers(
                @NullAllowed Pair<Long,Map<Pair<String,Integer>,Integer>> lastState,
                @NonNull Map<BinaryIndexerFactory, Context> contexts) throws IOException {
            if (lastState == null || lastState.first() == 0L) {
                //Nothing known about the last state
                return false;
            }
            if (contexts.size() != lastState.second().size()) {
                //Factories changed
                return false;
            }
            final Map<Pair<String,Integer>,Integer> copy = new HashMap<Pair<String,Integer>,Integer>(lastState.second());
            for (Map.Entry<BinaryIndexerFactory,Context> e : contexts.entrySet()) {
                final BinaryIndexerFactory bif = e.getKey();
                final Integer state = copy.remove(Pair.<String,Integer>of(bif.getIndexerName(),bif.getIndexVersion()));


                                            final EmbeddingIndexer indexer = indexerFactory.createIndexer(dirty, pr.getSnapshot());
                                            if (indexer != null) {
                                                SPIAccessor.getInstance().putProperty(value.second(), ClusteredIndexables.INDEX, usedCi);
                                                long st = System.currentTimeMillis();
                                                logStartIndexer(indexerName);
                                                try {
                                                    SPIAccessor.getInstance().index(indexer, dirty, pr, value.second());
                                                } catch (ThreadDeath td) {
                                                    throw td;
                                                } catch (Throwable t) {

                                        final Pair<String,Integer> indexerKey = Pair.<String,Integer>of(factory.getIndexerName(),factory.getIndexVersion());
                                        final Pair<SourceIndexerFactory, Context> ctx = transactionContexts.get(indexerKey);
                                        if (ctx != null) {
                                            SPIAccessor.getInstance().setAllFilesJob(ctx.second(), true);
                                            final CustomIndexer indexer = factory.createIndexer();
                                            if (LOGGER.isLoggable(Level.FINE)) {
                                                StringBuilder sb = printMimeTypes(cifInfo.getMimeTypes(), new StringBuilder());

                                                        sb
                                                    });
                                            }
                                            SPIAccessor.getInstance().putProperty(ctx.second(), ClusteredIndexables.INDEX, ci);
                                            long st = System.currentTimeMillis();
                                            logStartIndexer(factory.getIndexerName());
                                            try {
                                                SPIAccessor.getInstance().index(indexer, indexables, ctx.second());
                                            } catch (ThreadDeath td) {
                                                throw td;
                                            } catch (Throwable t) {

                    for(Pair<Object, Boolean> fileOrFileObject : suspectFilesOrFileObjects) {
                        Pair<FileObject, Boolean> fileObject = null;

                        if (fileOrFileObject.first() instanceof File) {
                            FileObject f = FileUtil.toFileObject((File) fileOrFileObject.first());
                            if (f != null) {
                                fileObject = Pair.<FileObject, Boolean>of(f, fileOrFileObject.second());
                            }
                        } else if (fileOrFileObject.first() instanceof FileObject) {
                            fileObject = Pair.<FileObject, Boolean>of((FileObject) fileOrFileObject.first(), fileOrFileObject.second());
                        } else {
                            LOGGER.fine("Not File or FileObject, ignoring: " + fileOrFileObject); //NOI18N
                        }

                                if (rootFile != null) {
                                    FileObject rootFo = FileUtil.toFileObject(rootFile);
                                    if (rootFo != null) {
                                        if (f.first() == rootFo || FileUtil.isParentOf(f.first(), rootFo)) {
                                            depCtx.newBinariesToScan.add(root);
                                            break;
                                        }

                                // check roots that own a suspect
                                FileObject rootFo = URLCache.getInstance().findFileObject(root, true);
                                if (rootFo != null) {
                                    if (f.first() == rootFo || FileUtil.isParentOf(rootFo, f.first())) {
                                        depCtx.newBinariesToScan.add(root);
                                        break;
                                    }

                            FileObject rootFo = URLCache.getInstance().findFileObject(root, true);
                            if (rootFo != null) {
                                for(Pair<FileObject, Boolean> f : suspects) {
                                    if (f.first() == rootFo || FileUtil.isParentOf(f.first(), rootFo)) {
                                        Pair<FileObject, Boolean> pair = sourceRootsToScan.get(root);
                                        if (pair == null) {
                                            pair = Pair.<FileObject, Boolean>of(rootFo, f.second());
                                        } else {
                                            pair = Pair.<FileObject, Boolean>of(rootFo, pair.second() || f.second());
                                        }
                                        sourceRootsToScan.put(root, pair);
                                        containers.add(f);

                            for(Iterator<Pair<FileObject, Boolean>> it = suspects.iterator(); it.hasNext(); ) {
                                Pair<FileObject, Boolean> f = it.next();
                                Pair<FileObject, Boolean> root = entry.getValue();
                                if (FileUtil.isParentOf(root.first(), f.first()) && (root.second() || !f.second())) { // second means fullRescan
                                    it.remove();
                                }
                            }


                        for(Map.Entry<URL, Pair<FileObject, Boolean>> entry : sourceRootsToScan.entrySet()) {
                            depCtx.newRootsToScan.add(entry.getKey());
                            if (entry.getValue().second()) {
                                depCtx.fullRescanSourceRoots.add(entry.getKey());
                            }
                        }

                        for(Pair<FileObject, Boolean> f : suspects) {
                            for(URL root : scannedRoots2Dependencies.keySet()) {
                                FileObject rootFo = URLCache.getInstance().findFileObject(root, true);
                                if (rootFo != null && (f.first() == rootFo || FileUtil.isParentOf(rootFo, f.first()))) {
                                    Map<URL, Set<FileObject>> map = f.second() ? fullRescanFiles : checkTimestampFiles;
                                    Set<FileObject> files = map.get(root);
                                    if (files == null) {
                                        files = new HashSet<FileObject>();
                                        map.put(root, files);
                                    }
                                    files.add(f.first());
                                    break;
                                }
                            }

            final long binaryScanStart = System.currentTimeMillis();
            final Pair<Boolean,Collection<? extends URL>> res = pool.execute();
            final long binaryScanEnd = System.currentTimeMillis();
            ctx.scannedBinaries.addAll(res.second());
            if (LOGGER.isLoggable(Level.INFO)) {
                LOGGER.log(
                    Level.INFO,

                    });
            }
            TEST_LOGGER.log(Level.FINEST, "scanBinary", ctx.newBinariesToScan);       //NOI18N
            return res.first();
        }

        protected final boolean scanBinary(URL root, BinaryIndexers binaryIndexers, AtomicInteger scannedRootsCnt) {

                    final Pair<Long,Map<Pair<String,Integer>,Integer>> lastState = ArchiveTimeStamps.getLastModified(file.getURL());
                    final boolean indexersUpToDate = checkBinaryIndexers(lastState, contexts);
                    currentLastModified = file.lastModified().getTime();
                    upToDate = indexersUpToDate && lastState.first() ==  currentLastModified;
                } else {
                    currentLastModified = -1L;
                    upToDate = false;

                        final Pair<String,Integer> indexerKey = Pair.<String,Integer>of(factory.getIndexerName(),factory.getIndexVersion());
                        final Pair<SourceIndexerFactory,Context> ctx = transactionContexts.get(indexerKey);
                        if (ctx != null) {
                            SPIAccessor.getInstance().index(indexer, Collections.<Indexable>emptySet(), ctx.second());
                        } else {
                            LOGGER.log(
                                Level.WARNING, "RefreshCifIndices ignored recently added factory: {0}", //NOI18N

                    }
                    sourceRoots.clear();
                    for(Map.Entry<URL, Pair<File, Boolean>> entry : binaryRoots.entrySet()) {
                        if (entry.getValue().second()) {
                            safeRemoveFileChangeListener(this.binariesListener, entry.getValue().first());
                        } else {
                            safeRemoveRecursiveListener(this.binariesListener, entry.getValue().first());
                        }
                    }
                    binaryRoots.clear();

                    if (binariesListener != null) {
                        Pair<File, Boolean> pair = binaryRoots.remove(root);
                        if (pair != null) {
                            if (pair.second()) {
                                safeRemoveFileChangeListener(binariesListener, pair.first());
                            } else {
                                safeRemoveRecursiveListener(binariesListener, pair.first());
                            }
                        }
                    }




import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileUtil;
import org.openide.util.Exceptions;
import org.openide.util.Pair;
import org.openide.util.Parameters;
import org.openide.util.RequestProcessor;


                    if (owner != null) {
                        final boolean visible = vq.isVisible(chf);
                        try {
                            final URI ownerURI = owner.first().toURI();
                            if (visible) {
                                Collection<URL> files = srcShownPerRoot.get(ownerURI);
                                if (files == null) {
                                    files = new ArrayList<URL>();
                                    srcShownPerRoot.put(ownerURI, files);
                                }
                                if (chf.equals(owner.second())) {
                                    for (FileObject cld : chf.getChildren()) {
                                        files.add(cld.toURL());
                                    }
                                } else {
                                    files.add(chf.toURL());
                                }
                            } else if (owner.second() != null) {
                                Set<String> files = srcHiddenPerRoot.get(ownerURI);
                                if (files == null) {
                                    files = new HashSet<String>();

                                if (chf.isFolder()) {
                                    TimeStamps ts = tsPerRoot.get(ownerURI);
                                    if (ts == null) {
                                        ts = TimeStamps.forRoot(owner.first(), false);
                                        tsPerRoot.put(ownerURI, ts);
                                    }
                                    files.addAll(ts.getEnclosedFiles(FileUtil.getRelativePath(owner.second(), chf)));
                                } else {
                                    files.add(FileUtil.getRelativePath(owner.second(), chf));
                                }
                            }
                        } catch (URISyntaxException e) {

                    owner = ru.getOwningBinaryRoot(chf);
                    if (owner != null) {
                        try {
                            final URI ownerURI = owner.first().toURI();
                            binChangedRoot.add(ownerURI);
                        } catch (URISyntaxException e) {
                            Exceptions.printStackTrace(e);




import org.netbeans.api.annotations.common.CheckForNull;
import org.netbeans.api.annotations.common.NonNull;
import org.netbeans.modules.parsing.impl.indexing.ClusteredIndexables;
import org.netbeans.modules.parsing.impl.indexing.Pair;
import org.netbeans.modules.parsing.impl.indexing.PathRegistry;
import org.netbeans.modules.parsing.lucene.support.DocumentIndex;
import org.netbeans.modules.parsing.lucene.support.DocumentIndexCache;
import org.netbeans.modules.parsing.lucene.support.IndexManager;
import org.openide.util.Exceptions;
import org.openide.util.Pair;
import org.openide.util.Parameters;
import org.openide.util.Utilities;


                throw new IOException(e);
            }
        }
        return li == null ? null : li.first();
    }

   @CheckForNull
   public synchronized DocumentIndexCache getCache(@NonNull final URL root) {
       final Pair<DocumentIndex.Transactional, DocumentIndexCache> entry = indexes.get(root);
       return entry == null ? null : entry.second();
   }

   @CheckForNull
   public synchronized DocumentIndex.Transactional getIndex(@NonNull final DocumentIndexCache cache) {
       Parameters.notNull("cache", cache);  //NOI18N
       for (Pair<DocumentIndex.Transactional,DocumentIndexCache> e : indexes.values()) {
           if (cache.equals(e.second())) {
               return e.first();
           }
       }
       return null;

       closed = true;
       for (Pair<DocumentIndex.Transactional, DocumentIndexCache> index : indexes.values()) {
           try {
            index.first().close();
           } catch (IOException ioe) {
               Exceptions.printStackTrace(ioe);
           }




import java.util.Set;
import org.apache.lucene.analysis.KeywordAnalyzer;
import org.netbeans.api.annotations.common.NonNull;
import org.netbeans.modules.parsing.impl.indexing.Pair;
import org.netbeans.modules.parsing.lucene.support.DocumentIndex;
import org.netbeans.modules.parsing.lucene.support.Index.Status;
import org.netbeans.modules.parsing.lucene.support.IndexDocument;

import org.netbeans.modules.parsing.lucene.support.Queries.QueryKind;
import org.openide.util.Exceptions;
import static org.netbeans.modules.parsing.impl.indexing.TransientUpdateSupport.isTransientUpdate;
import org.openide.util.Pair;
/**
 *
 * @author Tomas Zezula

    public void store(boolean optimize) throws IOException {
        if (isTransientUpdate()) {
            final Pair<DocumentIndex,Set<String>> ovl = getOverlayIfExists();
            if (ovl.first() != null) {
                ovl.first().store(false);
            }
        } else {
            base.store(optimize);

    public Collection<? extends IndexDocument> query(String fieldName, String value, QueryKind kind, String... fieldsToLoad) throws IOException, InterruptedException {
        final Collection<? extends IndexDocument> br = base.query(fieldName, value, kind, fieldsToLoad);
        final Pair<DocumentIndex,Set<String>> ovl = getOverlayIfExists();
        if (ovl.first() == null) {
            return ovl.second() == null ? br : filter(br,ovl.second());
        } else {
            return new ProxyCollection<IndexDocument>(
                ovl.second() == null ? br : filter(br,ovl.second()),
                ovl.first().query(fieldName, value, kind, fieldsToLoad));
        }
    }


    public Collection<? extends IndexDocument> findByPrimaryKey(String primaryKeyValue, QueryKind kind, String... fieldsToLoad) throws IOException, InterruptedException {
        final Collection<? extends IndexDocument> br = base.findByPrimaryKey(primaryKeyValue, kind, fieldsToLoad);
        final Pair<DocumentIndex,Set<String>> ovl = getOverlayIfExists();
        if (ovl.first() == null) {
            return ovl.second() == null ? br : filter(br, ovl.second());
        } else {
            return new ProxyCollection<IndexDocument>(
                ovl.second() == null ? br : filter(br,ovl.second()),
                ovl.first().findByPrimaryKey(primaryKeyValue, kind, fieldsToLoad));
        }
    }





import org.netbeans.modules.parsing.impl.Utilities;
import org.netbeans.modules.parsing.impl.indexing.CacheFolder;
import org.netbeans.modules.parsing.impl.indexing.IndexFactoryImpl;
import org.netbeans.modules.parsing.impl.indexing.Pair;
import org.netbeans.modules.parsing.impl.indexing.PathRecognizerRegistry;
import org.netbeans.modules.parsing.impl.indexing.PathRegistry;
import org.netbeans.modules.parsing.impl.indexing.RepositoryUpdater;

import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileStateInvalidException;
import org.openide.filesystems.URLMapper;
import org.openide.util.Pair;
import org.openide.util.Parameters;

/**

                    Iterable<? extends Pair<URL, LayeredDocumentIndex>> indices = indexerQuery.getIndices(roots);
                    // check if there are stale indices
                    for (Pair<URL, LayeredDocumentIndex> pair : indices) {
                        final LayeredDocumentIndex index = pair.second();
                        final Collection<? extends String> staleFiles = index.getDirtyKeys();
                        final boolean scanningThread = RunWhenScanFinishedSupport.isScanningThread();
                        LOG.log(

                                scanningThread
                            });
                        if (!staleFiles.isEmpty() && !scanningThread) {
                            final URL root = pair.first();
                            LinkedList<URL> list = new LinkedList<URL>();
                            for (String staleFile : staleFiles) {
                                try {

                    }
                    final List<IndexResult> result = new LinkedList<IndexResult>();
                    for (Pair<URL, LayeredDocumentIndex> pair : indices) {
                        final DocumentIndex index = pair.second();
                        final URL root = pair.first();
                        final Collection<? extends org.netbeans.modules.parsing.lucene.support.IndexDocument> pr = index.query(
                                fieldName,
                                fieldValue,

            LOG.fine(getClass().getSimpleName() + "@" + Integer.toHexString(System.identityHashCode(this)) //NOI18N
                    + "[indexer=" + indexerQuery.getIndexerId() + "]:"); //NOI18N
            for(Pair<URL, LayeredDocumentIndex> pair : indexerQuery.getIndices(this.roots)) {
                LOG.fine(" " + pair.first() + " -> index: " + pair.second()); //NOI18N
            }
            LOG.fine("----"); //NOI18N
        }




import org.netbeans.api.annotations.common.NonNull;
import org.netbeans.junit.NbTestCase;
import org.netbeans.modules.parsing.api.Source;
import org.netbeans.modules.parsing.impl.indexing.Pair;
import org.netbeans.modules.parsing.impl.indexing.RepositoryUpdater.IndexingState;
import org.netbeans.modules.parsing.spi.ParseException;
import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileUtil;
import org.openide.util.Exceptions;
import org.openide.util.Mutex;
import org.openide.util.Pair;

/**
 *

            final Object param = record.getParameters()[0];
            for (Iterator<Pair<Pair<String, Object>, CountDownLatch>> it = condition.iterator(); it.hasNext();) {
                final Pair<Pair<String,Object>,CountDownLatch> cnd = it.next();
                if (cnd != null && cnd.first().first().equals(message) && cnd.first().second().equals(param)) {
                    //System.out.println("GOT: " + cnd.first.first + " " + cnd.first.second);
                    it.remove();
                    cnd.second().countDown();
                    break;
                }
            }




import org.netbeans.modules.parsing.api.Task;
import org.netbeans.modules.parsing.api.UserTask;
import org.netbeans.modules.parsing.impl.event.EventSupport;
import org.netbeans.modules.parsing.impl.indexing.Pair;
import org.netbeans.modules.parsing.impl.indexing.RepositoryUpdater;
import org.netbeans.modules.parsing.impl.indexing.RepositoryUpdaterTestSupport;
import org.netbeans.modules.parsing.impl.indexing.Util;

import org.openide.loaders.DataObject;
import org.openide.text.NbDocument;
import org.openide.util.Exceptions;
import org.openide.util.Pair;

/**
 *

            start_b.countDown();
            start_a.await();
            SourceAccessor.getINSTANCE().getCache(src).invalidate();
            TaskProcessor.removePhaseCompletionTasks(Collections.<SchedulerTask>singleton(tasks.iterator().next().first()), src);
        }
        end.countDown();
    }

Lines 58-63 Link Here

(-)a/parsing.api/test/unit/src/org/netbeans/modules/parsing/impl/indexing/ArchiveTimeStampsTest.java (+1 lines)
58	import org.netbeans.junit.NbTestCase;	58	import org.netbeans.junit.NbTestCase;
59	import org.openide.filesystems.FileObject;	59	import org.openide.filesystems.FileObject;
60	import org.openide.filesystems.FileUtil;	60	import org.openide.filesystems.FileUtil;
		61	import org.openide.util.Pair;
61	import org.openide.util.Utilities;	62	import org.openide.util.Utilities;
62		63
63	/**	64	/**




import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileUtil;
import org.openide.util.Exceptions;
import org.openide.util.Pair;
import org.openide.util.Parameters;

/**


        @Override
        public Boolean convert(@NonNull final Pair<URL,String> p) {
            if (!forIndexer.equals(p.second())) {
                return null;
            }
            try {
                final FileObject cacheFolder = CacheFolder.getDataFolder(p.first());
                final FileObject indexer = cacheFolder.getFileObject(p.second());
                final FileObject indexFolder = indexer.getFileObject("1/1");
                final DocumentIndexCache cache = DocumentBasedIndexManager.getDefault().getCache(indexFolder.toURL());
                final Class<?> c = Class.forName("org.netbeans.modules.parsing.impl.indexing.ClusteredIndexables$DocumentIndexCacheImpl");  //NOI18N




import org.netbeans.modules.parsing.lucene.support.Index;
import org.netbeans.modules.parsing.lucene.support.IndexDocument;
import org.netbeans.modules.parsing.lucene.support.IndexManager;
import org.openide.util.Pair;

/**
 *

                createDefaultData(size);
        final long st = System.currentTimeMillis();
        index.store(
            p.first(),
            Collections.<String>emptySet(),
            p.second(),
            new Convertor<String, Query>() {
                @Override
                public Query convert(String p) {

            },
            true);
        final long et = System.currentTimeMillis();
        System.out.println(p.first().getClass().getSimpleName() + " : " + (et-st));
        index.close();
    }


Lines 68-73 Link Here

(-)a/parsing.api/test/unit/src/org/netbeans/modules/parsing/impl/indexing/FileObjectCrawlerTest.java (+1 lines)
68	import org.openide.filesystems.FileStateInvalidException;	68	import org.openide.filesystems.FileStateInvalidException;
69	import org.openide.filesystems.FileSystem;	69	import org.openide.filesystems.FileSystem;
70	import org.openide.filesystems.FileUtil;	70	import org.openide.filesystems.FileUtil;
		71	import org.openide.util.Pair;
71		72
72	/**	73	/**
73	*	74	*

Lines 63-68 Link Here

(-)a/parsing.api/test/unit/src/org/netbeans/modules/parsing/impl/indexing/RefreshWorkTest.java (+1 lines)
63	import org.openide.filesystems.FileChangeAdapter;	63	import org.openide.filesystems.FileChangeAdapter;
64	import org.openide.filesystems.FileObject;	64	import org.openide.filesystems.FileObject;
65	import org.openide.filesystems.FileUtil;	65	import org.openide.filesystems.FileUtil;
		66	import org.openide.util.Pair;
66	import org.openide.util.Utilities;	67	import org.openide.util.Utilities;
67		68
68	/**	69	/**




import org.openide.filesystems.URLMapper;
import org.openide.util.Exceptions;
import org.openide.util.Lookup;
import org.openide.util.Pair;
import org.openide.util.Parameters;
import org.openide.util.RequestProcessor;
import org.openide.util.test.MockLookup;

        ruSync.await();

        assertEquals("Wrong number of roots", 1, indexer.indexed.size());
        assertEquals("Expecting nested root", nestedRoot.getURL(), indexer.indexed.get(0).first().getRootURI());
        assertEquals("Wrong number of files under nestedRoot", 1, indexer.indexed.get(0).second().size());
        assertEquals("Wring file indexed", file2.getURL(), indexer.indexed.get(0).second().get(0).getURL());
    }

    public void testMarkingIndexesDirty() throws Exception {


        // the indexer does not store any data and so physically there is no lucene index on the disk
        // therefore we have to forcibly create one
        Context ctx = indexer.indexed.get(0).first();
        DocumentIndex ii = SPIAccessor.getInstance().getIndexFactory(ctx).createIndex(ctx);
        ii.markKeyDirty("file1.txt"); // marks index as dirty and adds file1.txt among stale files
        assertEquals("Wrong number of stale files", 1, ii.getDirtyKeys().size());

        ruSync.await();

        assertEquals("Wrong number of roots", 1, indexer.indexed.size());
        assertEquals("Expecting root", root.getURL(), indexer.indexed.get(0).first().getRootURI());
        assertEquals("Wrong number of files under root", 1, indexer.indexed.get(0).second().size());
        assertEquals("Wrong file indexed", file1.getURL(), indexer.indexed.get(0).second().get(0).getURL());
        assertEquals("Expecting no stale files", 0, ii.getDirtyKeys().size());
    }





import org.openide.util.ChangeSupport;
import org.openide.util.Exceptions;
import org.openide.util.Lookup;
import org.openide.util.Pair;
import org.openide.util.RequestProcessor;

/**

        assertEquals(1, contextState.size());
        Pair<Boolean,Boolean> state = contextState.get(this.srcRootWithFiles1.getURL());
        assertNotNull(state);
        assertTrue(state.first());
        assertFalse(state.second());
        contextState = eindexerFactory.indexer.getContextState();
        assertEquals(embeddedFiles.length, contextState.size());
        for (URL url : embeddedFiles) {
            state = contextState.get(url);
            assertNotNull(state);
            assertTrue(state.first());
            assertFalse(state.second());
        }

        //2nd) Clean up - unregister

        assertEquals(1, contextState.size());
        state = contextState.get(this.srcRootWithFiles1.getURL());
        assertNotNull(state);
        assertFalse(state.first());
        assertFalse(state.second());
        contextState = eindexerFactory.indexer.getContextState();
        assertEquals(0, contextState.size());


        assertEquals(1, contextState.size());
        state = contextState.get(this.srcRootWithFiles1.getURL());
        assertNotNull(state);
        assertFalse(state.first());
        assertFalse(state.second());
        contextState = eindexerFactory.indexer.getContextState();
        assertEquals(1, contextState.size());
        state = contextState.get(embeddedFiles[0]);
        assertNotNull(state);
        assertFalse(state.first());
        assertFalse(state.second());

        //6th Do some modification when source are registered (allFiles should be false)
        indexerFactory.indexer.setExpectedFile(new URL[] {customFiles[0]}, new URL[0], new URL[0]);

        assertEquals(1, contextState.size());
        state = contextState.get(this.srcRootWithFiles1.getURL());
        assertNotNull(state);
        assertFalse(state.first());
        assertFalse(state.second());
        contextState = eindexerFactory.indexer.getContextState();
        assertEquals(1, contextState.size());
        state = contextState.get(embeddedFiles[0]);
        assertNotNull(state);
        assertFalse(state.first());
        assertFalse(state.second());
        
        //7th IndexingManager.refreshIndex(root, all_files, fullRescan==true) (allFiles should be true)
        indexerFactory.indexer.setExpectedFile(customFiles, new URL[0], new URL[0]);

        assertEquals(1, contextState.size());
        state = contextState.get(this.srcRootWithFiles1.getURL());
        assertNotNull(state);
        assertTrue(state.first());
        assertFalse(state.second());
        contextState = eindexerFactory.indexer.getContextState();
        assertEquals(embeddedFiles.length, contextState.size());
        for (URL url : embeddedFiles) {
            state = contextState.get(url);
            assertNotNull(state);
            assertTrue(state.first());
            assertFalse(state.second());
        }

        //8th IndexingManager.refreshIndex(root, specifoc_file, fullRescan==true, checkEditor==true) (allFiles should be false, checkForEditorModifications should be true)

        assertEquals(1, contextState.size());
        state = contextState.get(this.srcRootWithFiles1.getURL());
        assertNotNull(state);
        assertFalse(state.first());
        assertTrue(state.second());
        contextState = eindexerFactory.indexer.getContextState();
        assertEquals(1, contextState.size());
        state = contextState.get(embeddedFiles[0]);
        assertNotNull(state);
        assertFalse(state.first());
        assertTrue(state.second());
    }

    public void testVisibilityQueryAmongIDERestarts() throws Exception {

Lines 70-75 Link Here

(-)a/parsing.api/test/unit/src/org/netbeans/modules/parsing/impl/indexing/ScanStartedTest.java (-2 / +3 lines)
70	import org.netbeans.spi.java.classpath.support.ClassPathSupport;	70	import org.netbeans.spi.java.classpath.support.ClassPathSupport;
71	import org.openide.filesystems.FileObject;	71	import org.openide.filesystems.FileObject;
72	import org.openide.filesystems.FileUtil;	72	import org.openide.filesystems.FileUtil;
		73	import org.openide.util.Pair;
73		74
74	/**	75	/**
75	*	76	*
Lines 534-541 Link Here
534	if (ie != null &&	535	if (ie != null &&
535	msg != null &&	536	msg != null &&
536	msg.startsWith("scanStarting:") && //NOI18N	537	msg.startsWith("scanStarting:") && //NOI18N
537	ie.first.equals(record.getParameters()[0])) {	538	ie.first().equals(record.getParameters()[0])) {
538	throw ie.second;	539	throw ie.second();
539	} else {	540	} else {
540	super.publish(record);	541	super.publish(record);
541	}	542	}




import org.netbeans.api.java.queries.SourceForBinaryQuery;
import org.netbeans.junit.MockServices;
import org.netbeans.junit.NbTestCase;
import org.netbeans.modules.parsing.impl.indexing.Pair;
import org.netbeans.modules.parsing.impl.indexing.RepositoryUpdater;
import org.netbeans.modules.parsing.impl.indexing.RepositoryUpdaterTest;
import org.netbeans.modules.parsing.impl.indexing.friendapi.IndexingController;

import org.netbeans.spi.java.queries.SourceForBinaryQueryImplementation2;
import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileUtil;
import org.openide.util.Pair;

/**
 *

            return new Result() {
                @Override
                public boolean preferSources() {
                    return sources.first();
                }

                @Override
                public FileObject[] getRoots() {
                    return sources.second().toArray(new FileObject[sources.second().size()]);
                }

                @Override

Lines 1-4 Link Here

(-)a/php.api.editor/manifest.mf (-1 / +1 lines)
1	Manifest-Version: 1.0	1	Manifest-Version: 1.0
2	OpenIDE-Module: org.netbeans.modules.php.api.editor/0	2	OpenIDE-Module: org.netbeans.modules.php.api.editor/0
3	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/php/api/editor/resources/Bundle.properties	3	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/php/api/editor/resources/Bundle.properties
4	OpenIDE-Module-Specification-Version: 0.11	4	OpenIDE-Module-Specification-Version: 0.12

Lines 19-25 Link Here

(-)a/php.api.editor/nbproject/project.xml (-2 / +2 lines)
19	<build-prerequisite/>	19	<build-prerequisite/>
20	<compile-dependency/>	20	<compile-dependency/>
21	<run-dependency>	21	<run-dependency>
22	<specification-version>2.0</specification-version>	22	<specification-version>2.19</specification-version>
23	</run-dependency>	23	</run-dependency>
24	</dependency>	24	</dependency>
25	<dependency>	25	<dependency>
Lines 35-41 Link Here
35	<build-prerequisite/>	35	<build-prerequisite/>
36	<compile-dependency/>	36	<compile-dependency/>
37	<run-dependency>	37	<run-dependency>
38	<specification-version>8.26</specification-version>	38	<specification-version>8.32</specification-version>
39	</run-dependency>	39	</run-dependency>
40	</dependency>	40	</dependency>
41	</module-dependencies>	41	</module-dependencies>

Lines 43-50 Link Here

(-)a/php.api.editor/src/org/netbeans/modules/php/api/editor/EditorSupport.java (-1 / +1 lines)
43	package org.netbeans.modules.php.api.editor;	43	package org.netbeans.modules.php.api.editor;
44		44
45	import java.util.Collection;	45	import java.util.Collection;
46	import org.netbeans.modules.php.api.util.Pair;
47	import org.openide.filesystems.FileObject;	46	import org.openide.filesystems.FileObject;
		47	import org.openide.util.Pair;
48		48
49	/**	49	/**
50	* Helper editor class that can be found in the default lookup.	50	* Helper editor class that can be found in the default lookup.

Lines 1-4 Link Here

(-)a/php.api.executable/manifest.mf (-1 / +1 lines)
1	Manifest-Version: 1.0	1	Manifest-Version: 1.0
2	OpenIDE-Module: org.netbeans.modules.php.api.executable/0	2	OpenIDE-Module: org.netbeans.modules.php.api.executable/0
3	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/php/api/executable/resources/Bundle.properties	3	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/php/api/executable/resources/Bundle.properties
4	OpenIDE-Module-Specification-Version: 0.13	4	OpenIDE-Module-Specification-Version: 0.14

Lines 37-43 Link Here

(-)a/php.api.executable/nbproject/project.xml (-2 / +2 lines)
37	<build-prerequisite/>	37	<build-prerequisite/>
38	<compile-dependency/>	38	<compile-dependency/>
39	<run-dependency>	39	<run-dependency>
40	<specification-version>2.0</specification-version>	40	<specification-version>2.19</specification-version>
41	</run-dependency>	41	</run-dependency>
42	</dependency>	42	</dependency>
43	<dependency>	43	<dependency>
Lines 87-93 Link Here
87	<build-prerequisite/>	87	<build-prerequisite/>
88	<compile-dependency/>	88	<compile-dependency/>
89	<run-dependency>	89	<run-dependency>
90	<specification-version>8.26</specification-version>	90	<specification-version>8.32</specification-version>
91	</run-dependency>	91	</run-dependency>
92	</dependency>	92	</dependency>
93	<dependency>	93	<dependency>




import org.netbeans.api.project.Project;
import org.netbeans.api.queries.FileEncodingQuery;
import org.netbeans.modules.php.api.phpmodule.PhpOptions;
import org.netbeans.modules.php.api.util.Pair;
import org.netbeans.modules.php.api.util.StringUtils;
import org.netbeans.modules.php.api.util.UiUtils;
import org.netbeans.modules.php.spi.executable.DebugStarter;

import org.openide.util.Cancellable;
import org.openide.util.Lookup;
import org.openide.util.NbBundle;
import org.openide.util.Pair;
import org.openide.util.Parameters;
import org.openide.util.Utilities;
import org.openide.windows.InputOutput;

     */
    public PhpExecutable(String command) {
        Pair<String, List<String>> parsedCommand = parseCommand(command);
        executable = parsedCommand.first();
        parameters = parsedCommand.second();
        this.command = command.trim();
    }


            return Pair.of(tokens[0].trim(), Collections.<String>emptyList());
        }
        Pair<String, List<String>> parsedCommand = Pair.of(tokens[0].trim(), Arrays.asList(Utilities.parseParameters(tokens[1].trim())));
        LOGGER.log(Level.FINE, "Parameters parsed: {0} {1}", new Object[] {parsedCommand.first(), parsedCommand.second()});
        return parsedCommand;
    }


Lines 71-77 Link Here

(-)a/php.api.executable/src/org/netbeans/modules/php/api/executable/PhpExecutableValidator.java (-2 / +2 lines)
71	public static String validateCommand(@NullAllowed String command, @NullAllowed String executableName) {	71	public static String validateCommand(@NullAllowed String command, @NullAllowed String executableName) {
72	String executable = null;	72	String executable = null;
73	if (command != null) {	73	if (command != null) {
74	executable = PhpExecutable.parseCommand(command).first;	74	executable = PhpExecutable.parseCommand(command).first();
75	}	75	}
76	if (executableName == null) {	76	if (executableName == null) {
77	return FileUtils.validateFile(executable, false);	77	return FileUtils.validateFile(executable, false);
Lines 86-92 Link Here
86	* @return error if it is not valid, {@code null} otherwise	86	* @return error if it is not valid, {@code null} otherwise
87	*/	87	*/
88	public static String validateCommand(@NonNull String command, @NonNull ValidationHandler validationHandler) {	88	public static String validateCommand(@NonNull String command, @NonNull ValidationHandler validationHandler) {
89	return validationHandler.validate(PhpExecutable.parseCommand(command).first);	89	return validationHandler.validate(PhpExecutable.parseCommand(command).first());
90	}	90	}
91		91
92	//~ Inner classes	92	//~ Inner classes

Lines 50-58 Link Here

(-)a/php.api.executable/src/org/netbeans/modules/php/spi/executable/DebugStarter.java (-1 / +1 lines)
50	import org.netbeans.api.annotations.common.NonNull;	50	import org.netbeans.api.annotations.common.NonNull;
51	import org.netbeans.api.annotations.common.NullAllowed;	51	import org.netbeans.api.annotations.common.NullAllowed;
52	import org.netbeans.api.project.Project;	52	import org.netbeans.api.project.Project;
53	import org.netbeans.modules.php.api.util.Pair;
54	import org.openide.filesystems.FileObject;	53	import org.openide.filesystems.FileObject;
55	import org.openide.util.Cancellable;	54	import org.openide.util.Cancellable;
		55	import org.openide.util.Pair;
56	import org.openide.util.Parameters;	56	import org.openide.util.Parameters;
57		57
58	/**	58	/**




import java.util.List;
import org.junit.Test;
import org.netbeans.junit.NbTestCase;
import org.openide.util.Pair;

public class PhpExecutableTest extends NbTestCase {


    @Test
    public void testParseNullCommand() {
        Pair<String, List<String>> command = PhpExecutable.parseCommand(null);
        assertEquals("", command.first());
        assertTrue(command.second().isEmpty());
    }

    @Test
    public void testParseEmptyCommand() {
        Pair<String, List<String>> command = PhpExecutable.parseCommand("");
        assertEquals("", command.first());
        assertTrue(command.second().isEmpty());
    }

    @Test
    public void testParseOnlyCommand() {
        Pair<String, List<String>> command = PhpExecutable.parseCommand("/usr/bin/php");
        assertEquals("/usr/bin/php", command.first());
        assertTrue(command.second().isEmpty());
    }

    @Test
    public void testParseCommandWithParam1() {
        Pair<String, List<String>> command = PhpExecutable.parseCommand("/usr/bin/php --verbose");
        assertEquals("/usr/bin/php", command.first());
        assertEquals(1, command.second().size());
        assertEquals("--verbose", command.second().get(0));
    }

    @Test
    public void testParseCommandWithParam2() {
        Pair<String, List<String>> command = PhpExecutable.parseCommand("/usr/bin/php /verbose");
        assertEquals("/usr/bin/php", command.first());
        assertEquals(1, command.second().size());
        assertEquals("/verbose", command.second().get(0));
    }

    @Test
    public void testParseCommandWithParams1() {
        Pair<String, List<String>> command = PhpExecutable.parseCommand("/usr/bin/php --verbose --version");
        assertEquals("/usr/bin/php", command.first());
        assertEquals(2, command.second().size());
        assertEquals("--verbose", command.second().get(0));
        assertEquals("--version", command.second().get(1));
    }

    @Test
    public void testParseCommandWithParams2() {
        Pair<String, List<String>> command = PhpExecutable.parseCommand("/usr/bin/php /verbose /version");
        assertEquals("/usr/bin/php", command.first());
        assertEquals(2, command.second().size());
        assertEquals("/verbose", command.second().get(0));
        assertEquals("/version", command.second().get(1));
    }

    public void testInfoCommand() {

Lines 1-4 Link Here

(-)a/php.api.phpmodule/manifest.mf (-1 / +1 lines)
1	Manifest-Version: 1.0	1	Manifest-Version: 1.0
2	OpenIDE-Module: org.netbeans.modules.php.api.phpmodule	2	OpenIDE-Module: org.netbeans.modules.php.api.phpmodule
3	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/php/api/phpmodule/resources/Bundle.properties	3	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/php/api/phpmodule/resources/Bundle.properties
4	OpenIDE-Module-Specification-Version: 2.18	4	OpenIDE-Module-Specification-Version: 2.19

Lines 104-110 Link Here

(-)a/php.api.phpmodule/nbproject/project.xml (-1 / +1 lines)
104	<build-prerequisite/>	104	<build-prerequisite/>
105	<compile-dependency/>	105	<compile-dependency/>
106	<run-dependency>	106	<run-dependency>
107	<specification-version>8.26</specification-version>	107	<specification-version>8.32</specification-version>
108	</run-dependency>	108	</run-dependency>
109	</dependency>	109	</dependency>
110	<dependency>	110	<dependency>




/*
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 *
 * Copyright 2010 Oracle and/or its affiliates. All rights reserved.
 *
 * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
 * Other names may be trademarks of their respective owners.
 *
 * The contents of this file are subject to the terms of either the GNU
 * General Public License Version 2 only ("GPL") or the Common
 * Development and Distribution License("CDDL") (collectively, the
 * "License"). You may not use this file except in compliance with the
 * License. You can obtain a copy of the License at
 * http://www.netbeans.org/cddl-gplv2.html
 * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
 * specific language governing permissions and limitations under the
 * License.  When distributing the software, include this License Header
 * Notice in each file and include the License file at
 * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
 * particular file as subject to the "Classpath" exception as provided
 * by Oracle in the GPL Version 2 section of the License file that
 * accompanied this code. If applicable, add the following below the
 * License Header, with the fields enclosed by brackets [] replaced by
 * your own identifying information:
 * "Portions Copyrighted [year] [name of copyright owner]"
 *
 * If you wish your version of this file to be governed by only the CDDL
 * or only the GPL Version 2, indicate your decision by adding
 * "[Contributor] elects to include this software in this distribution
 * under the [CDDL or GPL Version 2] license." If you do not indicate a
 * single choice of license, a recipient has the option to distribute
 * your version of this file under either the CDDL, the GPL Version 2 or
 * to extend the choice of license to its licensees as provided above.
 * However, if you add GPL Version 2 code and therefore, elected the GPL
 * Version 2 license, then the option applies only if the new code is
 * made subject to such option by the copyright holder.
 *
 * Contributor(s):
 *
 * Portions Copyrighted 2008 Sun Microsystems, Inc.
 */
package org.netbeans.modules.php.api.util;

/**
 * Class representing a pair of values.
 */
public final class Pair<P, K> {

    public final P first;
    public final K second;

    private Pair(P first, K second) {
        this.first = first;
        this.second = second;
    }

    public static <P, K> Pair<P, K> of(P first, K second) {
        return new Pair<P, K>(first, second);
    }

    @Override
    public int hashCode() {
        int hashCode  = 0;
        hashCode ^= first == null ? 0 : first.hashCode();
        hashCode ^= second == null ? 0 : second.hashCode();
        return hashCode;
    }

    @Override
    public boolean equals(final Object other) {
        if (other instanceof Pair) {
            Pair<?, ?> otherPair = (Pair) other;
            return (this.first == null ? otherPair.first == null : this.first.equals(otherPair.first))
                    && (this.second == null ? otherPair.second == null : this.second.equals(otherPair.second));
        }
        return false;
    }

    @Override
    public String toString() {
        return String.format("Pair [%s, %s]", first, second); // NOI18N
    }
}

Lines 3-7 Link Here

(-)a/php.dbgp/manifest.mf (-1 / +1 lines)
3	OpenIDE-Module: org.netbeans.modules.php.dbgp	3	OpenIDE-Module: org.netbeans.modules.php.dbgp
4	OpenIDE-Module-Layer: org/netbeans/modules/php/dbgp/resources/layer.xml	4	OpenIDE-Module-Layer: org/netbeans/modules/php/dbgp/resources/layer.xml
5	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/php/dbgp/resources/Bundle.properties	5	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/php/dbgp/resources/Bundle.properties
6	OpenIDE-Module-Specification-Version: 1.29	6	OpenIDE-Module-Specification-Version: 1.30
7		7




                    <compile-dependency/>
                    <run-dependency>
                        <release-version>0</release-version>
                        <specification-version>0.14</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>

                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>2.19</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>

                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>8.32</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>

Lines 42-49 Link Here

(-)a/php.dbgp/src/org/netbeans/modules/php/dbgp/DebuggerOptions.java (-1 / +1 lines)
42	package org.netbeans.modules.php.dbgp;	42	package org.netbeans.modules.php.dbgp;
43		43
44	import java.util.List;	44	import java.util.List;
45	import org.netbeans.modules.php.api.util.Pair;
46	import org.netbeans.modules.php.project.api.PhpOptions;	45	import org.netbeans.modules.php.project.api.PhpOptions;
		46	import org.openide.util.Pair;
47		47
48	/**	48	/**
49	* @author Radek Matous	49	* @author Radek Matous

Lines 71-81 Link Here

(-)a/php.dbgp/src/org/netbeans/modules/php/dbgp/ProxyClient.java (-4 / +4 lines)
71		71
72	private ProxyClient(DebuggerOptions options) {	72	private ProxyClient(DebuggerOptions options) {
73	assert options != null;	73	assert options != null;
74	assert options.getDebugProxy().first != null;	74	assert options.getDebugProxy().first() != null;
75	assert options.getDebugProxy().second != null;	75	assert options.getDebugProxy().second() != null;
76		76
77	this.proxyHost = options.getDebugProxy().first;	77	this.proxyHost = options.getDebugProxy().first();
78	this.proxyPort = options.getDebugProxy().second;	78	this.proxyPort = options.getDebugProxy().second();
79	this.idePort = PhpOptions.getInstance().getDebuggerPort();	79	this.idePort = PhpOptions.getInstance().getDebuggerPort();
80	this.ideKey = PhpOptions.getInstance().getDebuggerSessionId();	80	this.ideKey = PhpOptions.getInstance().getDebuggerSessionId();
81	}	81	}

Lines 53-62 Link Here

(-)a/php.dbgp/src/org/netbeans/modules/php/dbgp/SessionId.java (-1 / +1 lines)
53	import org.netbeans.api.project.ProjectUtils;	53	import org.netbeans.api.project.ProjectUtils;
54	import org.netbeans.api.project.SourceGroup;	54	import org.netbeans.api.project.SourceGroup;
55	import org.netbeans.api.project.Sources;	55	import org.netbeans.api.project.Sources;
56	import org.netbeans.modules.php.api.util.Pair;
57	import org.netbeans.modules.php.project.api.PhpOptions;	56	import org.netbeans.modules.php.project.api.PhpOptions;
58	import org.openide.filesystems.FileObject;	57	import org.openide.filesystems.FileObject;
59	import org.openide.filesystems.FileUtil;	58	import org.openide.filesystems.FileUtil;
		59	import org.openide.util.Pair;
60		60
61		61
62	/**	62	/**




import java.util.Map;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.netbeans.modules.php.api.util.Pair;
import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileUtil;
import org.openide.util.Exceptions;
import org.openide.util.Pair;
import org.openide.util.Utilities;

/**

        for (Pair<String, String> pair : pathMapping) {
            //1. mapper provided by user via project UI if any
            pair = encodedPathMappingPair(pair);
            String uriPath = pair.first();
            String filePath = pair.second();
            if (uriPath.length() > 0 && filePath.length() > 0) {
                if (!uriPath.startsWith("file:")) {//NOI18N
                    if (!uriPath.startsWith("/")) {

    }

    private static Pair<String, String> encodedPathMappingPair(Pair<String, String> pathMapping)  {
        String resName = pathMapping.first();
        resName = resName.replace('\\', '/');//NOI18N
        final String[] elements = resName.split("/"); // NOI18N
        final StringBuilder sb = new StringBuilder(200);

                sb.append('/');
            }
        }
        return Pair.of(sb.toString(), pathMapping.second());//NOI18N
    }

}

Lines 42-48 Link Here

(-)a/php.dbgp/test/unit/src/org/netbeans/modules/php/dbgp/URIMapperTest.java (-1 / +1 lines)
42	package org.netbeans.modules.php.dbgp;	42	package org.netbeans.modules.php.dbgp;
43		43
44	import java.util.LinkedList;	44	import java.util.LinkedList;
45	import org.netbeans.modules.php.api.util.Pair;
46	import java.io.File;	45	import java.io.File;
47	import java.io.IOException;	46	import java.io.IOException;
48	import java.net.URI;	47	import java.net.URI;
Lines 52-57 Link Here
52	import org.netbeans.junit.NbTestCase;	51	import org.netbeans.junit.NbTestCase;
53	import org.openide.filesystems.FileUtil;	52	import org.openide.filesystems.FileUtil;
54	import static org.junit.Assert.*;	53	import static org.junit.Assert.*;
		54	import org.openide.util.Pair;
55		55
56	/**	56	/**
57	* @author Radek Matous	57	* @author Radek Matous

Lines 3-9 Link Here

(-)a/php.editor/nbproject/project.properties (-1 / +1 lines)
3	build.compiler=extJavac	3	build.compiler=extJavac
4	javac.compilerargs=-J-Xmx512m	4	javac.compilerargs=-J-Xmx512m
5	nbm.needs.restart=true	5	nbm.needs.restart=true
6	spec.version.base=1.36.0	6	spec.version.base=1.37.0
7	release.external/predefined_vars.zip=docs/predefined_vars.zip	7	release.external/predefined_vars.zip=docs/predefined_vars.zip
8	sigtest.gen.fail.on.error=false	8	sigtest.gen.fail.on.error=false
9		9




                    <compile-dependency/>
                    <run-dependency>
                        <release-version>0</release-version>
                        <specification-version>0.12</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>

                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>2.19</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>

                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>8.32</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>

Lines 56-62 Link Here

(-)a/php.editor/src/org/netbeans/modules/php/editor/model/impl/EditorSupportImpl.java (-1 / +1 lines)
56	import org.netbeans.modules.php.api.editor.PhpBaseElement;	56	import org.netbeans.modules.php.api.editor.PhpBaseElement;
57	import org.netbeans.modules.php.api.editor.PhpClass;	57	import org.netbeans.modules.php.api.editor.PhpClass;
58	import org.netbeans.modules.php.api.editor.PhpFunction;	58	import org.netbeans.modules.php.api.editor.PhpFunction;
59	import org.netbeans.modules.php.api.util.Pair;
60	import org.netbeans.modules.php.editor.api.ElementQuery.Index;	59	import org.netbeans.modules.php.editor.api.ElementQuery.Index;
61	import org.netbeans.modules.php.editor.api.ElementQueryFactory;	60	import org.netbeans.modules.php.editor.api.ElementQueryFactory;
62	import org.netbeans.modules.php.editor.api.NameKind;	61	import org.netbeans.modules.php.editor.api.NameKind;
Lines 75-80 Link Here
75	import org.netbeans.modules.php.editor.parser.PHPParseResult;	74	import org.netbeans.modules.php.editor.parser.PHPParseResult;
76	import org.openide.filesystems.FileObject;	75	import org.openide.filesystems.FileObject;
77	import org.openide.util.Exceptions;	76	import org.openide.util.Exceptions;
		77	import org.openide.util.Pair;
78	import org.openide.util.lookup.ServiceProvider;	78	import org.openide.util.lookup.ServiceProvider;
79		79
80	/**	80	/**

Lines 3-7 Link Here

(-)a/php.phpunit/manifest.mf (-1 / +1 lines)
3	OpenIDE-Module: org.netbeans.modules.php.phpunit/0	3	OpenIDE-Module: org.netbeans.modules.php.phpunit/0
4	OpenIDE-Module-Layer: org/netbeans/modules/php/phpunit/resources/layer.xml	4	OpenIDE-Module-Layer: org/netbeans/modules/php/phpunit/resources/layer.xml
5	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/php/phpunit/resources/Bundle.properties	5	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/php/phpunit/resources/Bundle.properties
6	OpenIDE-Module-Specification-Version: 0.5	6	OpenIDE-Module-Specification-Version: 0.6
7		7




                    <compile-dependency/>
                    <run-dependency>
                        <release-version>0</release-version>
                        <specification-version>0.12</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>

                    <compile-dependency/>
                    <run-dependency>
                        <release-version>0</release-version>
                        <specification-version>0.14</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>

                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>2.19</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>

                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>8.32</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>




import org.netbeans.modules.php.api.editor.PhpClass;
import org.netbeans.modules.php.api.phpmodule.PhpModule;
import org.netbeans.modules.php.api.util.FileUtils;
import org.netbeans.modules.php.api.util.Pair;
import org.netbeans.modules.php.phpunit.commands.PhpUnit;
import org.netbeans.modules.php.spi.testing.locate.Locations;
import org.netbeans.modules.php.spi.testing.locate.TestLocator;
import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileUtil;
import org.openide.util.Lookup;
import org.openide.util.Pair;

public class PhpUnitTestLocator implements TestLocator {



            for (Pair<String, String> namePair : classes) {
                // prefer FQN
                Collection<Pair<FileObject, Integer>> files = editorSupport.filesForClass(sourceRoot, new PhpClass(namePair.first(), namePair.second(), -1));
                List<Locations.Offset> results = filterPhpFiles(sourceRoot, files);
                if (!results.isEmpty()) {
                    phpFiles.addAll(results);
                    continue;
                }
                // #221816 - search only by class name
                files = editorSupport.filesForClass(sourceRoot, new PhpClass(namePair.first(), null, -1));
                results = filterPhpFiles(sourceRoot, files);
                phpFiles.addAll(results);
            }

    private List<Locations.Offset> filterPhpFiles(FileObject sourceRoot, Collection<Pair<FileObject, Integer>> files) {
        List<Locations.Offset> results = new ArrayList<Locations.Offset>(files.size());
        for (Pair<FileObject, Integer> pair : files) {
            FileObject fileObject = pair.first();
            if (FileUtils.isPhpFile(fileObject)
                    && FileUtil.isParentOf(sourceRoot, fileObject)) {
                results.add(new Locations.Offset(fileObject, pair.second()));
            }
        }
        return results;

Lines 1-6 Link Here

(-)a/php.project/manifest.mf (-1 / +1 lines)
1	Manifest-Version: 1.0	1	Manifest-Version: 1.0
2	AutoUpdate-Show-In-Client: false	2	AutoUpdate-Show-In-Client: false
3	OpenIDE-Module-Specification-Version: 2.81	3	OpenIDE-Module-Specification-Version: 2.82
4	OpenIDE-Module: org.netbeans.modules.php.project	4	OpenIDE-Module: org.netbeans.modules.php.project
5	OpenIDE-Module-Layer: org/netbeans/modules/php/project/resources/layer.xml	5	OpenIDE-Module-Layer: org/netbeans/modules/php/project/resources/layer.xml
6	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/php/project/resources/Bundle.properties	6	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/php/project/resources/Bundle.properties




                    <compile-dependency/>
                    <run-dependency>
                        <release-version>0</release-version>
                        <specification-version>0.14</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>

                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>2.19</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>

                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>1.28</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>

                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>8.32</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>

Lines 52-58 Link Here

(-)a/php.project/src/org/netbeans/modules/php/project/ProjectPropertiesSupport.java (-1 / +1 lines)
52	import org.netbeans.api.progress.ProgressUtils;	52	import org.netbeans.api.progress.ProgressUtils;
53	import org.netbeans.modules.php.api.executable.InvalidPhpExecutableException;	53	import org.netbeans.modules.php.api.executable.InvalidPhpExecutableException;
54	import org.netbeans.modules.php.api.executable.PhpInterpreter;	54	import org.netbeans.modules.php.api.executable.PhpInterpreter;
55	import org.netbeans.modules.php.api.util.Pair;
56	import org.netbeans.modules.php.api.util.StringUtils;	55	import org.netbeans.modules.php.api.util.StringUtils;
57	import org.netbeans.modules.php.project.api.PhpLanguageProperties;	56	import org.netbeans.modules.php.project.api.PhpLanguageProperties;
58	import org.netbeans.modules.php.project.api.PhpOptions;	57	import org.netbeans.modules.php.project.api.PhpOptions;
Lines 65-70 Link Here
65	import org.openide.filesystems.FileObject;	64	import org.openide.filesystems.FileObject;
66	import org.openide.filesystems.FileUtil;	65	import org.openide.filesystems.FileUtil;
67	import org.openide.util.NbBundle;	66	import org.openide.util.NbBundle;
		67	import org.openide.util.Pair;
68		68
69	/**	69	/**
70	* Helper class for getting <b>all</b> the properties of a PHP project.	70	* Helper class for getting <b>all</b> the properties of a PHP project.




import javax.swing.table.TableModel;
import javax.swing.table.TableRowSorter;
import org.netbeans.api.annotations.common.StaticResource;
import org.netbeans.modules.php.api.util.Pair;
import org.netbeans.modules.php.project.PhpProject;
import org.netbeans.modules.php.project.ProjectPropertiesSupport;
import org.netbeans.modules.php.project.connections.RemoteClient;

import org.openide.util.ImageUtilities;
import org.openide.util.Mutex;
import org.openide.util.NbBundle;
import org.openide.util.Pair;
import org.openide.util.RequestProcessor;

/**

            if (!iterator.hasNext()) {
                selectionIsAdjusting = false;
            }
            itemTable.getSelectionModel().addSelectionInterval(pair.first(), pair.second());
        }
        selectionIsAdjusting = false;
    }




import org.netbeans.modules.php.api.util.FileUtils;
import org.netbeans.modules.php.project.PhpProject;
import org.netbeans.modules.php.project.ProjectPropertiesSupport;
import org.netbeans.modules.php.api.util.Pair;
import org.netbeans.modules.php.project.ui.customizer.CompositePanelProviderImpl;
import org.openide.filesystems.FileEvent;
import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileRenameEvent;
import org.openide.filesystems.FileUtil;
import org.openide.util.NbBundle;
import org.openide.util.Pair;

/**
 * @author Radek Matous

            return null;
        }

        FileObject sourceRoot = cfgPair.first();
        File targetRoot = cfgPair.second();
        assert sourceRoot != null;
        assert targetRoot != null;


    }

    private static boolean isPairValid(Pair<FileObject, File> pair) {
        return pair != null && pair.first() != null && pair.second() != null;
    }

    @Override

Lines 57-63 Link Here

(-)a/php.project/src/org/netbeans/modules/php/project/ui/actions/support/CommandUtils.java (-1 / +1 lines)
57	import java.util.logging.Logger;	57	import java.util.logging.Logger;
58	import org.netbeans.api.annotations.common.CheckForNull;	58	import org.netbeans.api.annotations.common.CheckForNull;
59	import org.netbeans.modules.php.api.util.FileUtils;	59	import org.netbeans.modules.php.api.util.FileUtils;
60	import org.netbeans.modules.php.api.util.Pair;
61	import org.netbeans.modules.php.api.util.StringUtils;	60	import org.netbeans.modules.php.api.util.StringUtils;
62	import org.netbeans.modules.php.project.PhpActionProvider;	61	import org.netbeans.modules.php.project.PhpActionProvider;
63	import org.netbeans.modules.php.project.PhpProject;	62	import org.netbeans.modules.php.project.PhpProject;
Lines 75-80 Link Here
75	import org.openide.util.Exceptions;	74	import org.openide.util.Exceptions;
76	import org.openide.util.Lookup;	75	import org.openide.util.Lookup;
77	import org.openide.util.NbBundle;	76	import org.openide.util.NbBundle;
		77	import org.openide.util.Pair;
78	import org.openide.windows.TopComponent;	78	import org.openide.windows.TopComponent;
79		79
80	/**	80	/**




import org.netbeans.modules.gsf.testrunner.api.Testcase;
import org.netbeans.modules.php.api.phpmodule.PhpModule;
import org.netbeans.modules.php.api.util.FileUtils;
import org.netbeans.modules.php.api.util.Pair;
import org.netbeans.modules.php.project.PhpActionProvider;
import org.netbeans.modules.php.project.PhpProject;
import org.netbeans.modules.php.project.ProjectPropertiesSupport;

import org.openide.filesystems.FileUtil;
import org.openide.util.ChangeSupport;
import org.openide.util.Lookup;
import org.openide.util.Pair;

/**
 * Action implementation for TEST configuration.

        TestRunInfo testRunInfo = getTestRunInfoForFile(file, debug);
        assert testRunInfo != null;
        Pair<String, String> method = CommandUtils.decodeMethod(singleMethod.getMethodName());
        TestRunInfo.TestInfo testInfo = new TestRunInfo.TestInfo(TestRunInfo.TestInfo.UNKNOWN_TYPE, method.second(), method.first(),
                FileUtil.toFile(file).getAbsolutePath());
        testRunInfo.setCustomTests(Collections.singleton(testInfo));
        return testRunInfo;

Lines 36-42 Link Here

(-)a/php.project/src/org/netbeans/modules/php/project/ui/actions/support/DebugScript.java (-1 / +1 lines)
36	import org.netbeans.api.extexecution.ExternalProcessBuilder;	36	import org.netbeans.api.extexecution.ExternalProcessBuilder;
37	import org.netbeans.api.project.Project;	37	import org.netbeans.api.project.Project;
38	import org.netbeans.api.queries.FileEncodingQuery;	38	import org.netbeans.api.queries.FileEncodingQuery;
39	import org.netbeans.modules.php.api.util.Pair;
40	import org.netbeans.modules.php.project.PhpProject;	39	import org.netbeans.modules.php.project.PhpProject;
41	import org.netbeans.modules.php.project.ProjectPropertiesSupport;	40	import org.netbeans.modules.php.project.ProjectPropertiesSupport;
42	import org.netbeans.modules.php.spi.executable.DebugStarter;	41	import org.netbeans.modules.php.spi.executable.DebugStarter;
Lines 45-50 Link Here
45	import org.openide.filesystems.FileObject;	44	import org.openide.filesystems.FileObject;
46	import org.openide.util.Cancellable;	45	import org.openide.util.Cancellable;
47	import org.openide.util.NbBundle;	46	import org.openide.util.NbBundle;
		47	import org.openide.util.Pair;
48		48
49	/**	49	/**
50	* @author Radek Matous, Tomas Mysik	50	* @author Radek Matous, Tomas Mysik




import org.netbeans.modules.php.project.ProjectPropertiesSupport;
import org.netbeans.modules.php.project.ui.Utils;
import org.netbeans.modules.php.project.ui.customizer.PhpProjectProperties.RunAsType;
import org.netbeans.modules.php.api.util.Pair;
import org.netbeans.modules.php.project.PhpVisibilityQuery;
import org.netbeans.modules.php.project.runconfigs.RunConfigLocal;
import org.netbeans.modules.php.project.runconfigs.validation.RunConfigLocalValidator;
import org.netbeans.spi.project.ui.support.ProjectCustomizer.Category;
import org.openide.awt.Mnemonics;
import org.openide.util.NbBundle;
import org.openide.util.Pair;

/**
 * @author  Radek Matous, Tomas Mysik

            Pair<String, String> pathMapping = advanced.getPathMapping();
            Pair<String, String> debugProxy = advanced.getDebugProxy();
            RunAsLocalWeb.this.putValue(PhpProjectProperties.DEBUG_URL, advanced.getDebugUrl().name());
            RunAsLocalWeb.this.putValue(PhpProjectProperties.DEBUG_PATH_MAPPING_REMOTE, pathMapping.first());
            RunAsLocalWeb.this.putValue(PhpProjectProperties.DEBUG_PATH_MAPPING_LOCAL, pathMapping.second());
            RunAsLocalWeb.this.putValue(PhpProjectProperties.DEBUG_PROXY_HOST, debugProxy.first());
            RunAsLocalWeb.this.putValue(PhpProjectProperties.DEBUG_PROXY_PORT, debugProxy.second());
        }
    }//GEN-LAST:event_advancedButtonActionPerformed





import javax.swing.event.DocumentEvent;
import javax.swing.event.DocumentListener;
import javax.swing.plaf.UIResource;
import org.netbeans.modules.php.api.util.Pair;
import org.netbeans.modules.php.project.PhpProject;
import org.netbeans.modules.php.project.PhpVisibilityQuery;
import org.netbeans.modules.php.project.ProjectPropertiesSupport;

import org.netbeans.spi.project.ui.support.ProjectCustomizer.Category;
import org.openide.awt.Mnemonics;
import org.openide.util.NbBundle;
import org.openide.util.Pair;

/**
 * @author Tomas Mysik

            Pair<String, String> pathMapping = advanced.getPathMapping();
            Pair<String, String> debugProxy = advanced.getDebugProxy();
            RunAsRemoteWeb.this.putValue(PhpProjectProperties.DEBUG_URL, advanced.getDebugUrl().name());
            RunAsRemoteWeb.this.putValue(PhpProjectProperties.DEBUG_PATH_MAPPING_REMOTE, pathMapping.first());
            RunAsRemoteWeb.this.putValue(PhpProjectProperties.DEBUG_PATH_MAPPING_LOCAL, pathMapping.second());
            RunAsRemoteWeb.this.putValue(PhpProjectProperties.DEBUG_PROXY_HOST, debugProxy.first());
            RunAsRemoteWeb.this.putValue(PhpProjectProperties.DEBUG_PROXY_PORT, debugProxy.second());
        }
    }//GEN-LAST:event_advancedButtonActionPerformed





import javax.swing.event.TableModelListener;
import javax.swing.table.DefaultTableModel;
import javax.swing.table.TableCellRenderer;
import org.netbeans.modules.php.api.util.Pair;
import org.netbeans.modules.php.api.util.StringUtils;
import org.netbeans.modules.php.project.PhpProject;
import org.netbeans.modules.php.project.ProjectPropertiesSupport;

import org.openide.filesystems.FileUtil;
import org.openide.util.HelpCtx;
import org.openide.util.NbBundle;
import org.openide.util.Pair;

/**
 * @author Tomas Mysik

                local = locals.get(i);
            }
            Pair<String, String> pathMapping = getPathMapping(remotes.get(i), local);
            paths[i][COLUMN_REMOTE_PATH] = pathMapping.first();
            paths[i][COLUMN_LOCAL_PATH] = new LocalPathCell(pathMapping.second());
        }
        paths[remotesSize][COLUMN_REMOTE_PATH] = null;
        paths[remotesSize][COLUMN_LOCAL_PATH] = new LocalPathCell(DEFAULT_LOCAL_PATH);




import javax.swing.event.ChangeListener;
import org.netbeans.api.project.Project;
import org.netbeans.modules.php.api.phpmodule.PhpModule;
import org.netbeans.modules.php.api.util.Pair;
import org.netbeans.modules.php.api.util.UiUtils;
import org.netbeans.modules.php.project.PhpProject;
import org.netbeans.modules.php.project.PhpVisibilityQuery;

import org.openide.util.ChangeSupport;
import org.openide.util.ImageUtilities;
import org.openide.util.NbBundle;
import org.openide.util.Pair;
import org.openide.util.RequestProcessor;

/**

        private final FileObject sourceDir;

        public ImportantFileNode(Pair<PhpFrameworkProvider, FileObject> pair, FileObject sourceDir) throws DataObjectNotFoundException {
            super(DataObject.find(pair.second()).getNodeDelegate());
            this.pair = pair;
            this.sourceDir = sourceDir;
        }

        @Override
        public String getShortDescription() {
            String filepath = FileUtil.getRelativePath(sourceDir, pair.second());
            if (filepath == null) {
                filepath = FileUtil.getFileDisplayName(pair.second());
            }
            return NbBundle.getMessage(ImportantFileNode.class, "LBL_ImportantFileTooltip", filepath, pair.first().getName());
        }
    }
}

Lines 60-66 Link Here

(-)a/php.project/src/org/netbeans/modules/php/project/util/PhpProjectUtils.java (-1 / +1 lines)
60	import org.netbeans.api.project.Sources;	60	import org.netbeans.api.project.Sources;
61	import org.netbeans.editor.BaseDocument;	61	import org.netbeans.editor.BaseDocument;
62	import org.netbeans.modules.editor.indent.api.Reformat;	62	import org.netbeans.modules.editor.indent.api.Reformat;
63	import org.netbeans.modules.php.api.util.Pair;
64	import org.netbeans.modules.php.api.util.StringUtils;	63	import org.netbeans.modules.php.api.util.StringUtils;
65	import org.netbeans.modules.php.project.PhpProject;	64	import org.netbeans.modules.php.project.PhpProject;
66	import org.netbeans.modules.php.project.PhpSources;	65	import org.netbeans.modules.php.project.PhpSources;
Lines 83-88 Link Here
83	import org.openide.text.Line.Set;	82	import org.openide.text.Line.Set;
84	import org.openide.util.Mutex;	83	import org.openide.util.Mutex;
85	import org.openide.util.NbBundle;	84	import org.openide.util.NbBundle;
		85	import org.openide.util.Pair;
86	import org.openide.util.UserQuestionException;	86	import org.openide.util.UserQuestionException;
87		87
88	/**	88	/**

Lines 50-56 Link Here

(-)a/php.project/test/unit/src/org/netbeans/modules/php/project/util/PhpProjectUtilsTest.java (-1 / +1 lines)
50	import org.netbeans.modules.php.api.util.StringUtils;	50	import org.netbeans.modules.php.api.util.StringUtils;
51	import org.netbeans.modules.php.project.ui.customizer.PhpProjectProperties;	51	import org.netbeans.modules.php.project.ui.customizer.PhpProjectProperties;
52	import static org.junit.Assert.*;	52	import static org.junit.Assert.*;
53	import org.netbeans.modules.php.api.util.Pair;	53	import org.openide.util.Pair;
54		54
55	public class PhpProjectUtilsTest extends NbTestCase {	55	public class PhpProjectUtilsTest extends NbTestCase {
56		56

Lines 2-6 Link Here

(-)a/php.symfony/manifest.mf (-1 / +1 lines)
2	OpenIDE-Module: org.netbeans.modules.php.symfony	2	OpenIDE-Module: org.netbeans.modules.php.symfony
3	OpenIDE-Module-Layer: org/netbeans/modules/php/symfony/resources/layer.xml	3	OpenIDE-Module-Layer: org/netbeans/modules/php/symfony/resources/layer.xml
4	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/php/symfony/resources/Bundle.properties	4	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/php/symfony/resources/Bundle.properties
5	OpenIDE-Module-Specification-Version: 1.30	5	OpenIDE-Module-Specification-Version: 1.31
6		6




                    <compile-dependency/>
                    <run-dependency>
                        <release-version>0</release-version>
                        <specification-version>0.12</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>

                    <compile-dependency/>
                    <run-dependency>
                        <release-version>0</release-version>
                        <specification-version>0.14</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>

                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>2.19</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>

                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>8.32</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>




import org.netbeans.modules.php.api.executable.InvalidPhpExecutableException;
import org.netbeans.modules.php.api.executable.PhpInterpreter;
import org.netbeans.modules.php.api.phpmodule.PhpModule;
import org.netbeans.modules.php.api.util.Pair;
import org.netbeans.modules.php.spi.framework.PhpModuleExtender;
import org.netbeans.modules.php.symfony.ui.wizards.NewProjectConfigurationPanel;
import org.openide.filesystems.FileObject;
import org.openide.util.Exceptions;
import org.openide.util.HelpCtx;
import org.openide.util.NbBundle;
import org.openide.util.Pair;

/**
 * @author Tomas Mysik


        // generate apps
        for (Pair<String, String[]> app : getPanel().getApps()) {
            symfonyScript.initApp(phpModule, app.first(), app.second());
        }

        // prefetch commands




import javax.swing.event.DocumentEvent;
import javax.swing.event.DocumentListener;
import org.netbeans.api.options.OptionsDisplayer;
import org.netbeans.modules.php.api.util.Pair;
import org.netbeans.modules.php.api.util.StringUtils;
import org.netbeans.modules.php.symfony.SymfonyScript;
import org.netbeans.modules.php.symfony.ui.options.SymfonyOptions;
import org.openide.awt.Mnemonics;
import org.openide.util.ChangeSupport;
import org.openide.util.NbBundle;
import org.openide.util.Pair;
import org.openide.util.Utilities;

/**

Lines 294-300 Link Here

(-)a/refactoring.java/nbproject/project.xml (-1 / +1 lines)
294	<build-prerequisite/>	294	<build-prerequisite/>
295	<compile-dependency/>	295	<compile-dependency/>
296	<run-dependency>	296	<run-dependency>
297	<specification-version>8.0</specification-version>	297	<specification-version>8.32</specification-version>
298	</run-dependency>	298	</run-dependency>
299	</dependency>	299	</dependency>
300	<dependency>	300	<dependency>




/*
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 *
 * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
 *
 * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
 * Other names may be trademarks of their respective owners.
 *
 * The contents of this file are subject to the terms of either the GNU
 * General Public License Version 2 only ("GPL") or the Common
 * Development and Distribution License("CDDL") (collectively, the
 * "License"). You may not use this file except in compliance with the
 * License. You can obtain a copy of the License at
 * http://www.netbeans.org/cddl-gplv2.html
 * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
 * specific language governing permissions and limitations under the
 * License.  When distributing the software, include this License Header
 * Notice in each file and include the License file at
 * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
 * particular file as subject to the "Classpath" exception as provided
 * by Oracle in the GPL Version 2 section of the License file that
 * accompanied this code. If applicable, add the following below the
 * License Header, with the fields enclosed by brackets [] replaced by
 * your own identifying information:
 * "Portions Copyrighted [year] [name of copyright owner]"
 *
 * Contributor(s):
 *
 * Portions Copyrighted 2007 Sun Microsystems, Inc.
 */
package org.netbeans.modules.refactoring.java;

/**
 * Copy from org.netbeans.modules.java.source.usages.Pair;
 * @author Ralph Ruijs
 */
public final class Pair<P,K> {

    public final P first;
    public final K second;

    private Pair (P first, K second) {
        this.first = first;
        this.second = second;
    }

    
    public static <P,K> Pair<P,K> of (P first, K second) {
        return new Pair<P,K> (first,second);
    }
    
    
    @Override
    public int hashCode () {
        int hashCode  = 0;
        hashCode ^= first == null ? 0 : first.hashCode();
        hashCode ^= second == null ? 0: second.hashCode();
        return hashCode;
    }
    
    @Override
    public boolean equals (final Object other) {
        if (other instanceof Pair) {
            Pair otherPair = (Pair) other;
            return (this.first == null ? otherPair.first == null : this.first.equals(otherPair.first)) &&
                   (this.second == null ? otherPair.second == null : this.second.equals(otherPair.second));
        }
        return false;
    }
    
    @Override
    public String toString () {
        return String.format("Pair[%s,%s]", first,second);
    }
}




import org.netbeans.api.java.source.GeneratorUtilities;
import org.netbeans.api.java.source.TreePathHandle;
import org.netbeans.modules.refactoring.api.Problem;
import org.netbeans.modules.refactoring.java.Pair;
import org.netbeans.modules.refactoring.java.RefactoringUtils;
import org.netbeans.modules.refactoring.java.api.JavaRefactoringUtils;
import org.netbeans.modules.refactoring.java.spi.RefactoringVisitor;
import org.openide.filesystems.FileUtil;
import org.openide.util.NbBundle;
import org.openide.util.Pair;

/**
 *

                if(path != null) {
                    el = trees.getElement(path);
                }
                if (p.first().equals(el)) {
                    original2TranslatedBody.put(node, make.setLabel(node, p.second()));
                }
                return super.visitIdentifier(node, p);
            }

                if(currentPath != null) {
                    el = trees.getElement(currentPath);
                }
                if (p.first().equals(el)) {
                    original2TranslatedBody.put(node, p.second());
                }
                return super.visitIdentifier(node, p);
            }




import org.netbeans.api.java.source.*;
import org.netbeans.modules.refactoring.api.MoveRefactoring;
import org.netbeans.modules.refactoring.api.Problem;
import org.netbeans.modules.refactoring.java.Pair;
import org.netbeans.modules.refactoring.java.RefactoringUtils;
import org.netbeans.modules.refactoring.java.api.JavaMoveMembersProperties;
import org.netbeans.modules.refactoring.java.api.JavaMoveMembersProperties.Visibility;

import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileUtil;
import org.openide.util.NbBundle;
import org.openide.util.Pair;

/**
 *

                            public Void visitIdentifier(IdentifierTree node, Pair<Element, ExpressionTree> p) {
                                TreePath currentPath = new TreePath(resolvedPath, node);
                                Element el = trees.getElement(currentPath);
                                if (p.first().equals(el)) {
                                    original2Translated.put(node, p.second());
                                }
                                return super.visitIdentifier(node, p);
                            }




import org.netbeans.api.java.source.*;
import org.netbeans.api.java.source.JavaSource.Phase;
import org.netbeans.modules.refactoring.api.Scope;
import org.netbeans.modules.refactoring.java.Pair;
import org.netbeans.modules.refactoring.spi.ui.CustomRefactoringPanel;
import org.openide.filesystems.FileObject;
import org.openide.util.NbBundle;
import org.openide.util.NbPreferences;
import org.openide.util.Pair;
import org.openide.util.lookup.Lookups;






import org.netbeans.api.java.source.CompilationController;
import org.netbeans.api.java.source.TreePathHandle;
import org.netbeans.api.java.source.ui.ElementIcons;
import org.netbeans.modules.refactoring.java.Pair;
import org.netbeans.modules.refactoring.java.RefactoringModule;
import org.openide.util.Pair;

/**
 *

    @SuppressWarnings("unchecked")
    String getMethodDeclaringClass() {
        Pair<Pair<String, Icon>, TreePathHandle> selectedItem = (Pair<Pair<String, Icon>, TreePathHandle>) jComboBox1.getSelectedItem();
        return selectedItem.first().first();
    }

    @SuppressWarnings("unchecked")
    public TreePathHandle getMethodHandle() {
        Pair<Pair<String, Icon>, TreePathHandle> selectedItem = (Pair<Pair<String, Icon>, TreePathHandle>) jComboBox1.getSelectedItem();
        return selectedItem == null ? tph : selectedItem.second();
    }

    public boolean isMethodFromBaseClass() {

                    setIcon(getEmptyIcon());
                } else {
                    Pair<Pair<String, Icon>, TreePathHandle> selectedPair = (Pair<Pair<String, Icon>, TreePathHandle>) value;
                    setText(selectedPair.first().first());
                    setIcon(selectedPair.first().second());
                }
            } else {
                setText(null);

Lines 64-70 Link Here

(-)a/refactoring.java/src/org/netbeans/modules/refactoring/java/ui/WhereUsedQueryUI.java (-1 / +1 lines)
64	import org.netbeans.modules.refactoring.api.AbstractRefactoring;	64	import org.netbeans.modules.refactoring.api.AbstractRefactoring;
65	import org.netbeans.modules.refactoring.api.Scope;	65	import org.netbeans.modules.refactoring.api.Scope;
66	import org.netbeans.modules.refactoring.api.WhereUsedQuery;	66	import org.netbeans.modules.refactoring.api.WhereUsedQuery;
67	import org.netbeans.modules.refactoring.java.Pair;
68	import org.netbeans.modules.refactoring.java.RefactoringUtils;	67	import org.netbeans.modules.refactoring.java.RefactoringUtils;
69	import org.netbeans.modules.refactoring.java.api.JavaRefactoringUtils;	68	import org.netbeans.modules.refactoring.java.api.JavaRefactoringUtils;
70	import org.netbeans.modules.refactoring.java.api.WhereUsedQueryConstants;	69	import org.netbeans.modules.refactoring.java.api.WhereUsedQueryConstants;
Lines 73-78 Link Here
73	import org.openide.filesystems.FileObject;	72	import org.openide.filesystems.FileObject;
74	import org.openide.util.HelpCtx;	73	import org.openide.util.HelpCtx;
75	import org.openide.util.NbBundle;	74	import org.openide.util.NbBundle;
		75	import org.openide.util.Pair;
76	import org.openide.util.lookup.Lookups;	76	import org.openide.util.lookup.Lookups;
77		77
78	/**	78	/**




                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.util</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>8.32</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.util.lookup</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>

                        <specification-version>8.16</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.util</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>8.2</specification-version>
                    </run-dependency>
                </dependency>
            </module-dependencies>
            <public-packages/>
        </data>




/*
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 *
 * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
 *
 * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
 * Other names may be trademarks of their respective owners.
 *
 * The contents of this file are subject to the terms of either the GNU
 * General Public License Version 2 only ("GPL") or the Common
 * Development and Distribution License("CDDL") (collectively, the
 * "License"). You may not use this file except in compliance with the
 * License. You can obtain a copy of the License at
 * http://www.netbeans.org/cddl-gplv2.html
 * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
 * specific language governing permissions and limitations under the
 * License.  When distributing the software, include this License Header
 * Notice in each file and include the License file at
 * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
 * particular file as subject to the "Classpath" exception as provided
 * by Oracle in the GPL Version 2 section of the License file that
 * accompanied this code. If applicable, add the following below the
 * License Header, with the fields enclosed by brackets [] replaced by
 * your own identifying information:
 * "Portions Copyrighted [year] [name of copyright owner]"
 *
 * Contributor(s):
 *
 * Portions Copyrighted 2007-2008 Sun Microsystems, Inc.
 */
package org.netbeans.modules.spellchecker.bindings.htmlxml;

/**
 *
 * @author Tor Norbye
 */
public class Pair<A,B> {

    A a;
    B b;

    public Pair(A a, B b) {
        this.a = a;
        this.b = b;
    }
}

Lines 1-5 Link Here

(-)a/web.clientproject.api/manifest.mf (-1 / +1 lines)
1	Manifest-Version: 1.0	1	Manifest-Version: 1.0
2	OpenIDE-Module: org.netbeans.modules.web.clientproject.api	2	OpenIDE-Module: org.netbeans.modules.web.clientproject.api
3	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/web/clientproject/api/Bundle.properties	3	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/web/clientproject/api/Bundle.properties
4	OpenIDE-Module-Specification-Version: 1.27	4	OpenIDE-Module-Specification-Version: 1.28
5		5

Lines 90-96 Link Here

(-)a/web.clientproject.api/nbproject/project.xml (-2 / +2 lines)
90	<build-prerequisite/>	90	<build-prerequisite/>
91	<compile-dependency/>	91	<compile-dependency/>
92	<run-dependency>	92	<run-dependency>
93	<specification-version>1.34</specification-version>	93	<specification-version>1.46</specification-version>
94	</run-dependency>	94	</run-dependency>
95	</dependency>	95	</dependency>
96	<dependency>	96	<dependency>
Lines 146-152 Link Here
146	<build-prerequisite/>	146	<build-prerequisite/>
147	<compile-dependency/>	147	<compile-dependency/>
148	<run-dependency>	148	<run-dependency>
149	<specification-version>8.26</specification-version>	149	<specification-version>8.32</specification-version>
150	</run-dependency>	150	</run-dependency>
151	</dependency>	151	</dependency>
152	<dependency>	152	<dependency>

Lines 73-79 Link Here

(-)a/web.clientproject.api/src/org/netbeans/modules/web/clientproject/api/jslibs/JavaScriptLibraryCustomizerPanel.java (-1 / +1 lines)
73	import org.netbeans.modules.web.clientproject.api.util.StringUtilities;	73	import org.netbeans.modules.web.clientproject.api.util.StringUtilities;
74	import org.netbeans.modules.web.clientproject.api.validation.FolderValidator;	74	import org.netbeans.modules.web.clientproject.api.validation.FolderValidator;
75	import org.netbeans.modules.web.clientproject.api.validation.ValidationResult;	75	import org.netbeans.modules.web.clientproject.api.validation.ValidationResult;
76	import org.netbeans.modules.web.common.api.Pair;
77	import org.netbeans.spi.project.ui.support.ProjectCustomizer;	76	import org.netbeans.spi.project.ui.support.ProjectCustomizer;
78	import org.openide.DialogDisplayer;	77	import org.openide.DialogDisplayer;
79	import org.openide.NotifyDescriptor;	78	import org.openide.NotifyDescriptor;
Lines 81-86 Link Here
81	import org.openide.filesystems.FileUtil;	80	import org.openide.filesystems.FileUtil;
82	import org.openide.util.HelpCtx;	81	import org.openide.util.HelpCtx;
83	import org.openide.util.NbBundle;	82	import org.openide.util.NbBundle;
		83	import org.openide.util.Pair;
84	import org.openide.util.Parameters;	84	import org.openide.util.Parameters;
85		85
86	/**	86	/**




import org.netbeans.api.project.libraries.Library;
import org.netbeans.modules.web.clientproject.api.WebClientLibraryManager;
import org.netbeans.modules.web.clientproject.api.util.StringUtilities;
import org.netbeans.modules.web.common.api.Pair;
import org.netbeans.modules.web.common.api.Version;
import org.openide.DialogDisplayer;
import org.openide.NotifyDescriptor;
import org.openide.util.ChangeSupport;
import org.openide.util.Mutex;
import org.openide.util.NbBundle;
import org.openide.util.Pair;
import org.openide.util.Parameters;
import org.openide.util.RequestProcessor;
import org.openide.util.WeakListeners;

        Pair<Set<SelectedLibrary>, String> result = librariesValidator.validate(librariesFolder, newLibraries);
        // libraries
        invalidLibraries.clear();
        invalidLibraries.addAll(result.first());
        return result.second();
    }

    private void fireSelectedLibrariesChangeInEDT() {




import org.netbeans.api.progress.ProgressHandle;
import org.netbeans.api.progress.ProgressHandleFactory;
import org.netbeans.modules.web.clientproject.api.network.ui.NetworkErrorPanel;
import org.netbeans.modules.web.common.api.Pair;
import org.openide.DialogDescriptor;
import org.openide.DialogDisplayer;
import org.openide.NotifyDescriptor;
import org.openide.util.Cancellable;
import org.openide.util.NbBundle;
import org.openide.util.Pair;
import org.openide.util.Parameters;

/**

        if (progressHandle != null) {
            progressHandle.progress(Bundle.NetworkSupport_progress_download(url));
        }
        InputStream is = downloadSetup.first();
        try {
            copyToFile(is, target, progressHandle, downloadSetup.second());
        } catch (IOException ex) {
            // error => ensure file is deleted
            if (!target.delete()) {

Lines 3-6 Link Here

(-)a/web.clientproject/manifest.mf (-1 / +1 lines)
3	OpenIDE-Module: org.netbeans.modules.web.clientproject	3	OpenIDE-Module: org.netbeans.modules.web.clientproject
4	OpenIDE-Module-Layer: org/netbeans/modules/web/clientproject/resources/layer.xml	4	OpenIDE-Module-Layer: org/netbeans/modules/web/clientproject/resources/layer.xml
5	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/web/clientproject/Bundle.properties	5	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/web/clientproject/Bundle.properties
6	OpenIDE-Module-Specification-Version: 1.27	6	OpenIDE-Module-Specification-Version: 1.28




                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>1.28</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>

                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>1.46</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>

                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>8.32</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>




import org.netbeans.modules.web.clientproject.spi.SiteTemplateImplementation;
import org.netbeans.modules.web.clientproject.ui.customizer.ClientSideProjectProperties;
import org.netbeans.modules.web.clientproject.util.FileUtilities;
import org.netbeans.modules.web.common.api.Pair;
import org.openide.WizardDescriptor;
import org.openide.WizardValidationException;
import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileUtil;
import org.openide.util.HelpCtx;
import org.openide.util.NbBundle;
import org.openide.util.Pair;

public class JavaScriptLibrarySelectionPanel implements WizardDescriptor.AsynchronousValidatingPanel<WizardDescriptor>,
        WizardDescriptor.FinishablePanel<WizardDescriptor> {

Lines 1-5 Link Here

(-)a/web.common/manifest.mf (-1 / +1 lines)
1	Manifest-Version: 1.0	1	Manifest-Version: 1.0
2	OpenIDE-Module: org.netbeans.modules.web.common	2	OpenIDE-Module: org.netbeans.modules.web.common
3	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/web/common/Bundle.properties	3	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/web/common/Bundle.properties
4	OpenIDE-Module-Specification-Version: 1.45	4	OpenIDE-Module-Specification-Version: 1.46
5		5

Lines 146-152 Link Here

(-)a/web.common/nbproject/project.xml (-1 / +1 lines)
146	<build-prerequisite/>	146	<build-prerequisite/>
147	<compile-dependency/>	147	<compile-dependency/>
148	<run-dependency>	148	<run-dependency>
149	<specification-version>8.0</specification-version>	149	<specification-version>8.32</specification-version>
150	</run-dependency>	150	</run-dependency>
151	</dependency>	151	</dependency>
152	<dependency>	152	<dependency>




/*
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 *
 * Copyright 2011 Oracle and/or its affiliates. All rights reserved.
 *
 * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
 * Other names may be trademarks of their respective owners.
 *
 * The contents of this file are subject to the terms of either the GNU
 * General Public License Version 2 only ("GPL") or the Common
 * Development and Distribution License("CDDL") (collectively, the
 * "License"). You may not use this file except in compliance with the
 * License. You can obtain a copy of the License at
 * http://www.netbeans.org/cddl-gplv2.html
 * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
 * specific language governing permissions and limitations under the
 * License.  When distributing the software, include this License Header
 * Notice in each file and include the License file at
 * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
 * particular file as subject to the "Classpath" exception as provided
 * by Oracle in the GPL Version 2 section of the License file that
 * accompanied this code. If applicable, add the following below the
 * License Header, with the fields enclosed by brackets [] replaced by
 * your own identifying information:
 * "Portions Copyrighted [year] [name of copyright owner]"
 *
 * If you wish your version of this file to be governed by only the CDDL
 * or only the GPL Version 2, indicate your decision by adding
 * "[Contributor] elects to include this software in this distribution
 * under the [CDDL or GPL Version 2] license." If you do not indicate a
 * single choice of license, a recipient has the option to distribute
 * your version of this file under either the CDDL, the GPL Version 2 or
 * to extend the choice of license to its licensees as provided above.
 * However, if you add GPL Version 2 code and therefore, elected the GPL
 * Version 2 license, then the option applies only if the new code is
 * made subject to such option by the copyright holder.
 *
 * Contributor(s):
 *
 * Portions Copyrighted 2011 Sun Microsystems, Inc.
 */
package org.netbeans.modules.web.common.api;

/**
 *
 * @author Jan Lahoda
 */
public final class Pair<A, B> {

    private final A a;
    private final B b;

    public Pair(A a, B b) {
        this.a = a;
        this.b = b;
    }

    public A getA() {
        return a;
    }

    public B getB() {
        return b;
    }

    public static <A,B> Pair<A,B> of(A a, B b) {
      return new Pair<A, B>(a, b);
    } 
}

Lines 295-301 Link Here

(-)a/web.el/nbproject/project.xml (-1 / +1 lines)
295	<build-prerequisite/>	295	<build-prerequisite/>
296	<compile-dependency/>	296	<compile-dependency/>
297	<run-dependency>	297	<run-dependency>
298	<specification-version>8.0</specification-version>	298	<specification-version>8.32</specification-version>
299	</run-dependency>	299	</run-dependency>
300	</dependency>	300	</dependency>
301	<dependency>	301	<dependency>




import org.netbeans.modules.parsing.spi.SchedulerEvent;
import org.openide.filesystems.FileObject;
import org.openide.util.Exceptions;
import org.openide.util.Pair;

/**
 * Occurrences finder for Expression Language.

        // the logic here is a bit strange, maybe should add new methods to ResourceBundles
        // for a more straightforward computation.
        // first, check whether the current EL elements has keys
        keys.addAll(resourceBundles.collectKeys(target.first().getNode()));
        if (keys.isEmpty()) {
            return Collections.emptyMap();
        }

        // second, if yes, check whether it has a key matching to the node under the caret
        boolean found = false;
        for (Pair<AstIdentifier, Node> pair : keys) {
            if (pair.second().equals(target.second())) {
                found = true;
                break;
            }

                continue;
            }
            for (Pair<AstIdentifier, Node> candidate : resourceBundles.collectKeys(each.getNode())) {
                if (candidate.second().equals(target.second())) {
                    OffsetRange range = each.getOriginalOffset(candidate.second());
                    result.put(range, ColoringAttributes.MARK_OCCURRENCES);
                }
            }

    }

    private Map<OffsetRange, ColoringAttributes> findMatchingTypes(CompilationContext info, ELParserResult parserResult, Pair<ELElement,Node> target, List<Pair<ELElement,Node>> candidates) {
        Element targetType = ELTypeUtilities.resolveElement(info, target.first(), target.second());
        Map<OffsetRange, ColoringAttributes>  result = new HashMap<OffsetRange, ColoringAttributes>();

        for (Pair<ELElement,Node> candidate : candidates) {
            if (checkAndResetCancel()) {
                return result;
            }
            Element type = ELTypeUtilities.resolveElement(info, candidate.first(), candidate.second());
            if (type != null && type.equals(targetType)) {
                OffsetRange range = candidate.first().getOriginalOffset(candidate.second());
                result.put(range, ColoringAttributes.MARK_OCCURRENCES);
            }
        }




/*
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 *
 * Copyright 2010 Oracle and/or its affiliates. All rights reserved.
 *
 * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
 * Other names may be trademarks of their respective owners.
 *
 * The contents of this file are subject to the terms of either the GNU
 * General Public License Version 2 only ("GPL") or the Common
 * Development and Distribution License("CDDL") (collectively, the
 * "License"). You may not use this file except in compliance with the
 * License. You can obtain a copy of the License at
 * http://www.netbeans.org/cddl-gplv2.html
 * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
 * specific language governing permissions and limitations under the
 * License.  When distributing the software, include this License Header
 * Notice in each file and include the License file at
 * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
 * particular file as subject to the "Classpath" exception as provided
 * by Oracle in the GPL Version 2 section of the License file that
 * accompanied this code. If applicable, add the following below the
 * License Header, with the fields enclosed by brackets [] replaced by
 * your own identifying information:
 * "Portions Copyrighted [year] [name of copyright owner]"
 *
 * If you wish your version of this file to be governed by only the CDDL
 * or only the GPL Version 2, indicate your decision by adding
 * "[Contributor] elects to include this software in this distribution
 * under the [CDDL or GPL Version 2] license." If you do not indicate a
 * single choice of license, a recipient has the option to distribute
 * your version of this file under either the CDDL, the GPL Version 2 or
 * to extend the choice of license to its licensees as provided above.
 * However, if you add GPL Version 2 code and therefore, elected the GPL
 * Version 2 license, then the option applies only if the new code is
 * made subject to such option by the copyright holder.
 *
 * Contributor(s):
 *
 * Portions Copyrighted 2010 Sun Microsystems, Inc.
 */

package org.netbeans.modules.web.el;

/**
 *
 * @author Erno Mononen
 */
public final class Pair<P, K> {

    public final P first;
    public final K second;

    private Pair(P first, K second) {
        this.first = first;
        this.second = second;
    }

    public static <P, K> Pair<P, K> of(P first, K second) {
        return new Pair<P, K>(first, second);
    }

    @Override
    public boolean equals(Object obj) {
        if (obj == null) {
            return false;
        }
        if (getClass() != obj.getClass()) {
            return false;
        }
        final Pair<P, K> other = (Pair<P, K>) obj;
        if (this.first != other.first && (this.first == null || !this.first.equals(other.first))) {
            return false;
        }
        if (this.second != other.second && (this.second == null || !this.second.equals(other.second))) {
            return false;
        }
        return true;
    }

    @Override
    public int hashCode() {
        int hash = 7;
        hash = 83 * hash + (this.first != null ? this.first.hashCode() : 0);
        hash = 83 * hash + (this.second != null ? this.second.hashCode() : 0);
        return hash;
    }

    @Override
    public String toString() {
        return "Pair{" + "first=" + first + "second=" + second + '}';
    }

}

Lines 61-66 Link Here

(-)a/web.el/src/org/netbeans/modules/web/el/ResourceBundles.java (+1 lines)
61	import org.netbeans.modules.web.el.spi.ResourceBundle;	61	import org.netbeans.modules.web.el.spi.ResourceBundle;
62	import org.netbeans.spi.java.classpath.ClassPathProvider;	62	import org.netbeans.spi.java.classpath.ClassPathProvider;
63	import org.openide.filesystems.*;	63	import org.openide.filesystems.*;
		64	import org.openide.util.Pair;
64	import org.openide.util.Parameters;	65	import org.openide.util.Parameters;
65	import org.openide.util.WeakListeners;	66	import org.openide.util.WeakListeners;
66		67




import org.netbeans.modules.web.el.ELElement;
import org.netbeans.modules.web.el.ELParser;
import org.netbeans.modules.web.el.ELPreprocessor;
import org.openide.util.Pair;

/**
 * Attempts to sanitize EL statements. Check the unit test

            }
            // special handling for brackets
            for (Pair<ELTokenId, ELTokenId> bracket : BRACKETS) {
                if (expression.endsWith(bracket.first().fixedText())) {
                    return expression + bracket.second().fixedText();
                } else if (expression.endsWith(bracket.second().fixedText())) {
                    return expression;
                }
            }




import org.netbeans.modules.web.el.CompilationContext;
import org.netbeans.modules.web.el.ELElement;
import org.netbeans.modules.web.el.ELParserResult;
import org.netbeans.modules.web.el.Pair;
import org.netbeans.modules.web.el.ResourceBundles;
import org.openide.filesystems.FileObject;
import org.openide.util.NbBundle;
import org.openide.util.Pair;

/**
 * Hint for checking unknown resource bundle keys.

                continue;
            }
            for (Pair<AstIdentifier, Node> pair : resourceBundles.collectKeys(each.getNode(), info.context())) {
                String clearedKey = pair.second().getImage().replace("'", "").replace("\"", "");
                if (!resourceBundles.isValidKey(pair.first().getImage(), clearedKey)) {
                    Hint hint = new Hint(this,
                            NbBundle.getMessage(ResourceBundleKeys.class, "ResourceBundleKeys_Unknown", clearedKey),
                            elResult.getFileObject(),
                            each.getOriginalOffset(pair.second()),
                            Collections.<HintFix>emptyList(), 200);
                    result.add(hint);
                }




import org.netbeans.modules.web.el.CompilationContext;
import org.netbeans.modules.web.el.ELElement;
import org.netbeans.modules.web.el.ELTypeUtilities;
import org.netbeans.modules.web.el.Pair;
import org.openide.filesystems.FileObject;
import org.openide.util.Exceptions;
import org.openide.util.Pair;

/**
 * Simple DeclarationFinder based on the ELHyperlinkProvider code.

                public void run(CompilationController cc) throws Exception {
                    cc.toPhase(JavaSource.Phase.RESOLVED);
                    CompilationContext context = CompilationContext.create(file, cc);
                    Element javaElement = ELTypeUtilities.resolveElement(context, nodeElem.second(), nodeElem.first());
                    if (javaElement != null) {
                        refs.handle = ElementHandle.<Element>create(javaElement);
                        refs.fo = SourceUtils.getFile(refs.handle, cp);




import org.netbeans.modules.web.el.ELLanguage;
import org.netbeans.modules.web.el.ELParserResult;
import org.netbeans.modules.web.el.ELTypeUtilities;
import org.netbeans.modules.web.el.Pair;
import org.netbeans.modules.web.el.ResourceBundles;
import org.openide.filesystems.FileObject;
import org.openide.util.Exceptions;
import org.openide.util.NbBundle;
import org.openide.util.Pair;

/**
 * Go to declaration for Expression Language.

    public String getTooltipText(Document doc, int offset, HyperlinkType type) {
        Pair<Node, ELElement> nodeAndElement = resolveNodeAndElement(doc, offset, new AtomicBoolean());
        if (nodeAndElement != null) {
            if (nodeAndElement.first() instanceof AstString) {
                // could be a resource bundle key
                return getTooltipTextForBundleKey(nodeAndElement);
            } else {


    private String getTooltipTextForElement(final Pair<Node, ELElement> pair) {
        final String[] result = new String[1];
        final FileObject file = pair.second().getSnapshot().getSource().getFileObject();
        ClasspathInfo cp = ClasspathInfo.create(file);
        try {
            JavaSource.create(cp, file).runUserActionTask(new Task<CompilationController>() {

                @Override
                public void run(CompilationController cc) throws Exception {
                    cc.toPhase(JavaSource.Phase.RESOLVED);
                    final Element resolvedElement = ELTypeUtilities.resolveElement(CompilationContext.create(file, cc), pair.second(), pair.first());
                    if (resolvedElement == null) {
                        return;
                    }

    }
    
    private String getTooltipTextForBundleKey(Pair<Node, ELElement> pair) {
        FileObject context = pair.second().getSnapshot().getSource().getFileObject();
        ResourceBundles resourceBundles = ResourceBundles.get(context);
        if (!resourceBundles.canHaveBundles()) {
            return null;
        }
        for (Pair<AstIdentifier, Node> each : resourceBundles.collectKeys(pair.second().getNode())) {
            if (each.second().equals(pair.first())) {
                StringBuilder result = new StringBuilder();
                String key = each.second().getImage();
                String value = resourceBundles.getValue(each.first().getImage(), each.second().getImage());
                String bundle = each.first().getImage();
                result.append("<html><body>")
                        /* displaying the bundle in the tooltip looks a bit strange,
                          so commented out for now - maybe using a smaller font would

                @Override
                public void run(CompilationController cc) throws Exception {
                    cc.toPhase(JavaSource.Phase.RESOLVED);
                    Element javaElement = ELTypeUtilities.resolveElement(CompilationContext.create(file, cc), nodeElem.second(), nodeElem.first());
                    if(javaElement != null) {
                        handleRef.set(ElementHandle.create(javaElement));
                    }

Lines 56-62 Link Here

(-)a/web.project/nbproject/project.properties (-1 / +1 lines)
56	javac.compilerargs=-Xlint:unchecked	56	javac.compilerargs=-Xlint:unchecked
57	javadoc.arch=${basedir}/arch.xml	57	javadoc.arch=${basedir}/arch.xml
58		58
59	spec.version.base=1.46.0	59	spec.version.base=1.47.0
60		60
61	# needed for the TestUtil class	61	# needed for the TestUtil class
62	test.unit.cp.extra=	62	test.unit.cp.extra=

Lines 348-354 Link Here

(-)a/web.project/nbproject/project.xml (-1 / +1 lines)
348	<build-prerequisite/>	348	<build-prerequisite/>
349	<compile-dependency/>	349	<compile-dependency/>
350	<run-dependency>	350	<run-dependency>
351	<specification-version>1.18</specification-version>	351	<specification-version>1.28</specification-version>
352	</run-dependency>	352	</run-dependency>
353	</dependency>	353	</dependency>
354	<dependency>	354	<dependency>

Return to bug 228994

Lines 173-179 Link Here

(-)a/csl.api/test/unit/src/org/netbeans/modules/csl/api/test/CslTestBase.java (-3 / +3 lines)
173	import org.netbeans.modules.csl.editor.codetemplates.CslCorePackageAccessor;	173	import org.netbeans.modules.csl.editor.codetemplates.CslCorePackageAccessor;
174	import org.netbeans.modules.csl.hints.infrastructure.GsfHintsManager;	174	import org.netbeans.modules.csl.hints.infrastructure.GsfHintsManager;
175	import org.netbeans.modules.csl.hints.infrastructure.HintsSettings;	175	import org.netbeans.modules.csl.hints.infrastructure.HintsSettings;
176	import org.netbeans.modules.csl.hints.infrastructure.Pair;
177	import org.netbeans.modules.csl.spi.DefaultError;	176	import org.netbeans.modules.csl.spi.DefaultError;
178	import org.netbeans.modules.csl.spi.GsfUtilities;	177	import org.netbeans.modules.csl.spi.GsfUtilities;
179	import org.netbeans.modules.csl.spi.ParserResult;	178	import org.netbeans.modules.csl.spi.ParserResult;
Lines 207-212 Link Here
207	import org.openide.filesystems.XMLFileSystem;	206	import org.openide.filesystems.XMLFileSystem;
208	import org.openide.loaders.DataObject;	207	import org.openide.loaders.DataObject;
209	import org.openide.loaders.DataObjectNotFoundException;	208	import org.openide.loaders.DataObjectNotFoundException;
		209	import org.openide.util.Pair;
210	import org.openide.util.test.MockLookup;	210	import org.openide.util.test.MockLookup;
211		211
212	/**	212	/**
Lines 3391-3397 Link Here
3391	}	3391	}
3392	}	3392	}
3393		3393
3394	return new Pair<EditHistory,String>(history, modifiedText);	3394	return Pair.<EditHistory,String>of(history, modifiedText);
3395	}	3395	}
3396		3396
3397	protected final Pair<EditHistory,String> getEditHistory(BaseDocument doc, final EditHistory history, String... edits) throws BadLocationException {	3397	protected final Pair<EditHistory,String> getEditHistory(BaseDocument doc, final EditHistory history, String... edits) throws BadLocationException {
Lines 3466-3472 Link Here
3466	}	3466	}
3467	}	3467	}
3468		3468
3469	return new Pair<EditHistory,String>(history, modifiedText);	3469	return Pair.<EditHistory,String>of(history, modifiedText);
3470	}	3470	}
3471		3471
3472	// /**	3472	// /**

Lines 1-68 Link Here

(-)a/cnd.asm/src/org/netbeans/modules/cnd/asm/model/util/Pair.java (-68 lines)
1	/*
2	* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3	*
4	* Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
5	*
6	* Oracle and Java are registered trademarks of Oracle and/or its affiliates.
7	* Other names may be trademarks of their respective owners.
8	*
9	* The contents of this file are subject to the terms of either the GNU
10	* General Public License Version 2 only ("GPL") or the Common
11	* Development and Distribution License("CDDL") (collectively, the
12	* "License"). You may not use this file except in compliance with the
13	* License. You can obtain a copy of the License at
14	* http://www.netbeans.org/cddl-gplv2.html
15	* or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
16	* specific language governing permissions and limitations under the
17	* License. When distributing the software, include this License Header
18	* Notice in each file and include the License file at
19	* nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
20	* particular file as subject to the "Classpath" exception as provided
21	* by Oracle in the GPL Version 2 section of the License file that
22	* accompanied this code. If applicable, add the following below the
23	* License Header, with the fields enclosed by brackets [] replaced by
24	* your own identifying information:
25	* "Portions Copyrighted [year] [name of copyright owner]"
26	*
27	* Contributor(s):
28	*
29	* The Original Software is NetBeans. The Initial Developer of the Original
30	* Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
31	* Microsystems, Inc. All Rights Reserved.
32	*
33	* If you wish your version of this file to be governed by only the CDDL
34	* or only the GPL Version 2, indicate your decision by adding
35	* "[Contributor] elects to include this software in this distribution
36	* under the [CDDL or GPL Version 2] license." If you do not indicate a
37	* single choice of license, a recipient has the option to distribute
38	* your version of this file under either the CDDL, the GPL Version 2 or
39	* to extend the choice of license to its licensees as provided above.
40	* However, if you add GPL Version 2 code and therefore, elected the GPL
41	* Version 2 license, then the option applies only if the new code is
42	* made subject to such option by the copyright holder.
43	*/
44
45
46	package org.netbeans.modules.cnd.asm.model.util;
47
48	public class Pair<T1, T2> {
49	private final T1 p1;
50	private final T2 p2;
51
52	public Pair(T1 p1, T2 p2) {
53	this.p1 = p1;
54	this.p2 = p2;
55	}
56
57	public T1 getFirst() {
58	return p1;
59	}
60
61	public T2 getSecond() {
62	return p2;
63	}
64
65	public static <T1, T2> Pair<T1, T2> getPair(T1 p1, T2 p2) {
66	return new Pair<T1,T2>(p1, p2);
67	}
68	}

Lines 58-68 Link Here

(-)a/cnd.asm/src/org/netbeans/modules/cnd/asm/model/xml/ModelXMLRootContext.java (-3 / +3 lines)
58	import org.xml.sax.Attributes;	58	import org.xml.sax.Attributes;
59		59
60	import org.netbeans.modules.cnd.asm.model.lang.BitWidth;	60	import org.netbeans.modules.cnd.asm.model.lang.BitWidth;
61	import org.netbeans.modules.cnd.asm.model.util.Pair;
62	import org.netbeans.modules.cnd.asm.model.lang.instruction.Instruction;	61	import org.netbeans.modules.cnd.asm.model.lang.instruction.Instruction;
63	import org.netbeans.modules.cnd.asm.model.lang.Register;	62	import org.netbeans.modules.cnd.asm.model.lang.Register;
64	import org.netbeans.modules.cnd.asm.model.lang.instruction.InstructionArgs;	63	import org.netbeans.modules.cnd.asm.model.lang.instruction.InstructionArgs;
65	import static org.netbeans.modules.cnd.asm.model.xml.ModelXMLAttributes.*;	64	import static org.netbeans.modules.cnd.asm.model.xml.ModelXMLAttributes.*;
		65	import org.openide.util.Pair;
66		66
67	public class ModelXMLRootContext implements XMLReaderContext {	67	public class ModelXMLRootContext implements XMLReaderContext {
68		68
Lines 181-187 Link Here
181	XMLBaseRegister result = new DefaultXMLBaseRegister(ctx.getName(), ctx.getWidth());	181	XMLBaseRegister result = new DefaultXMLBaseRegister(ctx.getName(), ctx.getWidth());
182	Set<Register> children = new HashSet<Register>();	182	Set<Register> children = new HashSet<Register>();
183	for (Pair<String, Integer> pair : ctx.getChildren()) {	183	for (Pair<String, Integer> pair : ctx.getChildren()) {
184	XMLBaseRegister res = process(getForName(pair.getFirst()));	184	XMLBaseRegister res = process(getForName(pair.first()));
185	children.addAll(res.getChildren());	185	children.addAll(res.getChildren());
186	children.add(res);	186	children.add(res);
187	res.setDirectParent(result);	187	res.setDirectParent(result);
Lines 230-236 Link Here
230	String name = checkForName(attributes, REG_NAME_ATTRIBUTE);	230	String name = checkForName(attributes, REG_NAME_ATTRIBUTE);
231	String offset = checkForName(attributes, REG_OFFSET_ATTRIBUTE);	231	String offset = checkForName(attributes, REG_OFFSET_ATTRIBUTE);
232		232
233	children.add(new Pair<String, Integer>(name, Integer.parseInt(offset)));	233	children.add(Pair.<String, Integer>of(name, Integer.parseInt(offset)));
234	return null;	234	return null;
235	}	235	}
236		236

Lines 60-67 Link Here

(-)a/cnd.repository/src/org/netbeans/modules/cnd/repository/disk/MemoryCache.java (-2 / +2 lines)
60	import org.netbeans.modules.cnd.debug.CndTraceFlags;	60	import org.netbeans.modules.cnd.debug.CndTraceFlags;
61	import org.netbeans.modules.cnd.repository.spi.Key;	61	import org.netbeans.modules.cnd.repository.spi.Key;
62	import org.netbeans.modules.cnd.repository.spi.Persistent;	62	import org.netbeans.modules.cnd.repository.spi.Persistent;
63	import org.netbeans.modules.cnd.repository.util.Pair;
64	import org.netbeans.modules.cnd.utils.CndUtils;	63	import org.netbeans.modules.cnd.utils.CndUtils;
		64	import org.openide.util.Pair;
65		65
66	/**	66	/**
67	* An in-memory cache for storing repository objects	67	* An in-memory cache for storing repository objects
Lines 380-386 Link Here
380	s.r.unlock();	380	s.r.unlock();
381	}	381	}
382	if (value instanceof Persistent ) {	382	if (value instanceof Persistent ) {
383	result.add(new Pair<Key,Persistent>(key, (Persistent) value));	383	result.add(Pair.<Key,Persistent>of(key, (Persistent) value));
384	s.w.lock();	384	s.w.lock();
385	try {	385	try {
386	s.storage.remove(key);	386	s.storage.remove(key);

Lines 1-59 Link Here

(-)a/cnd.repository/src/org/netbeans/modules/cnd/repository/util/Pair.java (-59 lines)
1	/*
2	* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3	*
4	* Copyright 2010 Oracle and/or its affiliates. All rights reserved.
5	*
6	* Oracle and Java are registered trademarks of Oracle and/or its affiliates.
7	* Other names may be trademarks of their respective owners.
8	*
9	* The contents of this file are subject to the terms of either the GNU
10	* General Public License Version 2 only ("GPL") or the Common
11	* Development and Distribution License("CDDL") (collectively, the
12	* "License"). You may not use this file except in compliance with the
13	* License. You can obtain a copy of the License at
14	* http://www.netbeans.org/cddl-gplv2.html
15	* or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
16	* specific language governing permissions and limitations under the
17	* License. When distributing the software, include this License Header
18	* Notice in each file and include the License file at
19	* nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
20	* particular file as subject to the "Classpath" exception as provided
21	* by Oracle in the GPL Version 2 section of the License file that
22	* accompanied this code. If applicable, add the following below the
23	* License Header, with the fields enclosed by brackets [] replaced by
24	* your own identifying information:
25	* "Portions Copyrighted [year] [name of copyright owner]"
26	*
27	* If you wish your version of this file to be governed by only the CDDL
28	* or only the GPL Version 2, indicate your decision by adding
29	* "[Contributor] elects to include this software in this distribution
30	* under the [CDDL or GPL Version 2] license." If you do not indicate a
31	* single choice of license, a recipient has the option to distribute
32	* your version of this file under either the CDDL, the GPL Version 2 or
33	* to extend the choice of license to its licensees as provided above.
34	* However, if you add GPL Version 2 code and therefore, elected the GPL
35	* Version 2 license, then the option applies only if the new code is
36	* made subject to such option by the copyright holder.
37	*
38	* Contributor(s):
39	*
40	* Portions Copyrighted 2008 Sun Microsystems, Inc.
41	*/
42
43	package org.netbeans.modules.cnd.repository.util;
44
45	/**
46	* A simple struct, mainly for returning pairs of values
47	* @author Vladimir Kvashin
48	*/
49	public class Pair<T1, T2> {
50
51	public final T1 first;
52	public final T2 second;
53
54	public Pair(T1 first, T2 second) {
55	this.first = first;
56	this.second = second;
57	}
58
59	}

Lines 89-94 Link Here

(-)a/csl.api/src/org/netbeans/modules/csl/hints/infrastructure/GsfHintsManager.java (-8 / +9 lines)
89	import org.openide.filesystems.FileUtil;	89	import org.openide.filesystems.FileUtil;
90	import org.openide.loaders.DataObject;	90	import org.openide.loaders.DataObject;
91	import org.openide.util.Exceptions;	91	import org.openide.util.Exceptions;
		92	import org.openide.util.Pair;
92		93
93	/**	94	/**
94	*	95	*
Lines 322-335 Link Here
322	r = instantiateRule(o);	323	r = instantiateRule(o);
323	}	324	}
324	if ( r != null ) {	325	if ( r != null ) {
325	rules.add( new Pair<Rule,FileObject>( r, o ) );	326	rules.add( Pair.<Rule,FileObject>of( r, o ) );
326	}	327	}
327	}	328	}
328	}	329	}
329	Collections.sort(rules, new Comparator<Pair<Rule,FileObject>>() {	330	Collections.sort(rules, new Comparator<Pair<Rule,FileObject>>() {
330	@Override	331	@Override
331	public int compare(Pair<Rule,FileObject> p1, Pair<Rule,FileObject> p2) {	332	public int compare(Pair<Rule,FileObject> p1, Pair<Rule,FileObject> p2) {
332	return p1.getA().getDisplayName().compareTo(p2.getA().getDisplayName());	333	return p1.first().getDisplayName().compareTo(p2.first().getDisplayName());
333	}	334	}
334	});	335	});
335	return rules;	336	return rules;
Lines 366-373 Link Here
366	dir2node.put(rootFolder, rootNode);	367	dir2node.put(rootFolder, rootNode);
367		368
368	for( Pair<Rule,FileObject> pair : rules ) {	369	for( Pair<Rule,FileObject> pair : rules ) {
369	Rule rule = pair.getA();	370	Rule rule = pair.first();
370	FileObject fo = pair.getB();	371	FileObject fo = pair.second();
371		372
372	if ( rule instanceof ErrorRule ) {	373	if ( rule instanceof ErrorRule ) {
373	addRule( (ErrorRule)rule, (Map)dest );	374	addRule( (ErrorRule)rule, (Map)dest );
Lines 395-402 Link Here
395	dir2node.put(rootFolder, rootNode);	396	dir2node.put(rootFolder, rootNode);
396		397
397	for( Pair<Rule,FileObject> pair : rules ) {	398	for( Pair<Rule,FileObject> pair : rules ) {
398	Rule rule = pair.getA();	399	Rule rule = pair.first();
399	FileObject fo = pair.getB();	400	FileObject fo = pair.second();
400		401
401	if ( rule instanceof AstRule ) {	402	if ( rule instanceof AstRule ) {
402		403
Lines 436-443 Link Here
436	dir2node.put(rootFolder, rootNode);	437	dir2node.put(rootFolder, rootNode);
437		438
438	for( Pair<Rule,FileObject> pair : rules ) {	439	for( Pair<Rule,FileObject> pair : rules ) {
439	Rule rule = pair.getA();	440	Rule rule = pair.first();
440	FileObject fo = pair.getB();	441	FileObject fo = pair.second();
441		442
442	if ( rule instanceof SelectionRule ) {	443	if ( rule instanceof SelectionRule ) {
443	addRule((SelectionRule)rule, (List)dest );	444	addRule((SelectionRule)rule, (List)dest );

Lines 48-56 Link Here

(-)a/css.editor/src/org/netbeans/modules/css/editor/module/PropertiesReader.java (-2 / +3 lines)
48	import java.util.ArrayList;	48	import java.util.ArrayList;
49	import java.util.Collection;	49	import java.util.Collection;
50	import java.util.Properties;	50	import java.util.Properties;
51	import org.netbeans.modules.web.common.api.Pair;	51
52	import org.openide.util.Exceptions;	52	import org.openide.util.Exceptions;
53	import org.openide.util.Lookup;	53	import org.openide.util.Lookup;
		54	import org.openide.util.Pair;
54		55
55	/**	56	/**
56	*	57	*
Lines 152-158 Link Here
152	}	153	}
153	String key = loadConvert(lr.lineBuf, 0, keyLen, convtBuf);	154	String key = loadConvert(lr.lineBuf, 0, keyLen, convtBuf);
154	String value = loadConvert(lr.lineBuf, valueStart, limit - valueStart, convtBuf);	155	String value = loadConvert(lr.lineBuf, valueStart, limit - valueStart, convtBuf);
155	col.add(new Pair<String, String>(key, value));	156	col.add(Pair.<String, String>of(key, value));
156	}	157	}
157	}	158	}
158		159

Lines 47-53 Link Here

(-)a/css.lib/src/org/netbeans/modules/css/lib/api/properties/GrammarResolver.java (-4 / +4 lines)
47	import java.util.logging.Logger;	47	import java.util.logging.Logger;
48	import static org.netbeans.modules.css.lib.api.properties.GrammarResolver.Log.*;	48	import static org.netbeans.modules.css.lib.api.properties.GrammarResolver.Log.*;
49	import org.netbeans.modules.css.lib.properties.GrammarParseTreeBuilder;	49	import org.netbeans.modules.css.lib.properties.GrammarParseTreeBuilder;
50	import org.netbeans.modules.web.common.api.Pair;	50	import org.openide.util.Pair;
51		51
52	/**	52	/**
53	* Resolves a css property value against its grammar.	53	* Resolves a css property value against its grammar.
Lines 328-334 Link Here
328	}	328	}
329		329
330	Pair<InputState, Collection<ValueGrammarElement>> pair = resolvedSomething.get(lastResolved);	330	Pair<InputState, Collection<ValueGrammarElement>> pair = resolvedSomething.get(lastResolved);
331	pair.getB().add(valueGrammarElement);	331	pair.second().add(valueGrammarElement);
332	}	332	}
333		333
334	private void groupMemberResolved(GrammarElement member, GroupGrammarElement group, InputState state, boolean root) {	334	private void groupMemberResolved(GrammarElement member, GroupGrammarElement group, InputState state, boolean root) {
Lines 340-353 Link Here
340	if (LOG) {	340	if (LOG) {
341	log(ALTERNATIVES, String.format("input matched %s, %s", member.path(), state));	341	log(ALTERNATIVES, String.format("input matched %s, %s", member.path(), state));
342	}	342	}
343	resolvedSomething.put(group, new Pair<InputState, Collection<ValueGrammarElement>>(state, new LinkedList<ValueGrammarElement>()));	343	resolvedSomething.put(group, Pair.<InputState, Collection<ValueGrammarElement>>of(state, new LinkedList<ValueGrammarElement>()));
344	lastResolved = group;	344	lastResolved = group;
345	}	345	}
346		346
347	private Set<ValueGrammarElement> getAlternatives() {	347	private Set<ValueGrammarElement> getAlternatives() {
348	HashSet<ValueGrammarElement> alternatives = new HashSet<>();	348	HashSet<ValueGrammarElement> alternatives = new HashSet<>();
349	for (Pair<InputState, Collection<ValueGrammarElement>> tri : resolvedSomething.values()) {	349	for (Pair<InputState, Collection<ValueGrammarElement>> tri : resolvedSomething.values()) {
350	for (ValueGrammarElement value : tri.getB()) {	350	for (ValueGrammarElement value : tri.second()) {
351	alternatives.add(value);	351	alternatives.add(value);
352	}	352	}
353	}	353	}

Lines 47-53 Link Here

(-)a/css.prep/nbproject/project.xml (-3 / +3 lines)
47	<compile-dependency/>	47	<compile-dependency/>
48	<run-dependency>	48	<run-dependency>
49	<release-version>1</release-version>	49	<release-version>1</release-version>
50	<specification-version>1.49</specification-version>	50	<specification-version>1.53</specification-version>
51	</run-dependency>	51	</run-dependency>
52	</dependency>	52	</dependency>
53	<dependency>	53	<dependency>
Lines 161-167 Link Here
161	<build-prerequisite/>	161	<build-prerequisite/>
162	<compile-dependency/>	162	<compile-dependency/>
163	<run-dependency>	163	<run-dependency>
164	<specification-version>1.45</specification-version>	164	<specification-version>1.46</specification-version>
165	</run-dependency>	165	</run-dependency>
166	</dependency>	166	</dependency>
167	<dependency>	167	<dependency>
Lines 225-231 Link Here
225	<build-prerequisite/>	225	<build-prerequisite/>
226	<compile-dependency/>	226	<compile-dependency/>
227	<run-dependency>	227	<run-dependency>
228	<specification-version>8.30</specification-version>	228	<specification-version>8.32</specification-version>
229	</run-dependency>	229	</run-dependency>
230	</dependency>	230	</dependency>
231	<dependency>	231	<dependency>

Lines 70-77 Link Here

(-)a/css.prep/src/org/netbeans/modules/css/prep/util/ExternalExecutable.java (-4 / +4 lines)
70	import org.netbeans.api.extexecution.input.InputProcessor;	70	import org.netbeans.api.extexecution.input.InputProcessor;
71	import org.netbeans.api.extexecution.input.InputProcessors;	71	import org.netbeans.api.extexecution.input.InputProcessors;
72	import org.netbeans.api.progress.ProgressUtils;	72	import org.netbeans.api.progress.ProgressUtils;
73	import org.netbeans.modules.web.common.api.Pair;
74	import org.openide.util.NbBundle;	73	import org.openide.util.NbBundle;
		74	import org.openide.util.Pair;
75	import org.openide.util.Parameters;	75	import org.openide.util.Parameters;
76	import org.openide.util.Utilities;	76	import org.openide.util.Utilities;
77	import org.openide.windows.InputOutput;	77	import org.openide.windows.InputOutput;
Lines 126-133 Link Here
126	*/	126	*/
127	public ExternalExecutable(String command) {	127	public ExternalExecutable(String command) {
128	Pair<String, List<String>> parsedCommand = parseCommand(command);	128	Pair<String, List<String>> parsedCommand = parseCommand(command);
129	executable = parsedCommand.getA();	129	executable = parsedCommand.first();
130	parameters = parsedCommand.getB();	130	parameters = parsedCommand.second();
131	this.command = command.trim();	131	this.command = command.trim();
132	}	132	}
133		133
Lines 143-149 Link Here
143	return Pair.of(tokens[0].trim(), Collections.<String>emptyList());	143	return Pair.of(tokens[0].trim(), Collections.<String>emptyList());
144	}	144	}
145	Pair<String, List<String>> parsedCommand = Pair.of(tokens[0].trim(), Arrays.asList(Utilities.parseParameters(tokens[1].trim())));	145	Pair<String, List<String>> parsedCommand = Pair.of(tokens[0].trim(), Arrays.asList(Utilities.parseParameters(tokens[1].trim())));
146	LOGGER.log(Level.FINE, "Parameters parsed: {0} {1}", new Object[] {parsedCommand.getA(), parsedCommand.getB()});	146	LOGGER.log(Level.FINE, "Parameters parsed: {0} {1}", new Object[] {parsedCommand.first(), parsedCommand.second()});
147	return parsedCommand;	147	return parsedCommand;
148	}	148	}
149		149

Lines 60-65 Link Here

(-)a/debugger.jpda.ui/src/org/netbeans/modules/debugger/jpda/ui/breakpoints/MethodBreakpointPanel.java (-4 / +5 lines)
60	import org.openide.ErrorManager;	60	import org.openide.ErrorManager;
61	import org.openide.util.HelpCtx;	61	import org.openide.util.HelpCtx;
62	import org.openide.util.NbBundle;	62	import org.openide.util.NbBundle;
		63	import org.openide.util.Pair;
63		64
64	/**	65	/**
65	* @author Jan Jancura	66	* @author Jan Jancura
Lines 126-133 Link Here
126	className = ClassBreakpointPanel.concatClassFilters(cf);	127	className = ClassBreakpointPanel.concatClassFilters(cf);
127	String tooltipText = NbBundle.getMessage(MethodBreakpointPanel.class, "TTT_TF_Field_Breakpoint_Class_Name");	128	String tooltipText = NbBundle.getMessage(MethodBreakpointPanel.class, "TTT_TF_Field_Breakpoint_Class_Name");
128	Pair<JScrollPane, JEditorPane> editorCC = ClassBreakpointPanel.addClassNameEditorCC(JavaClassNbDebugEditorKit.MIME_TYPE, null, className, tooltipText);	129	Pair<JScrollPane, JEditorPane> editorCC = ClassBreakpointPanel.addClassNameEditorCC(JavaClassNbDebugEditorKit.MIME_TYPE, null, className, tooltipText);
129	spClassName = editorCC.get1();	130	spClassName = editorCC.first();
130	epClassName = editorCC.get2();	131	epClassName = editorCC.second();
131	epClassName.getAccessibleContext().setAccessibleName(NbBundle.getMessage(MethodBreakpointPanel.class, "ACSN_Method_Breakpoint_ClassName"));	132	epClassName.getAccessibleContext().setAccessibleName(NbBundle.getMessage(MethodBreakpointPanel.class, "ACSN_Method_Breakpoint_ClassName"));
132	epClassName.getAccessibleContext().setAccessibleDescription(NbBundle.getMessage(MethodBreakpointPanel.class, "ACSD_Method_Breakpoint_ClassName"));	133	epClassName.getAccessibleContext().setAccessibleDescription(NbBundle.getMessage(MethodBreakpointPanel.class, "ACSD_Method_Breakpoint_ClassName"));
133	jLabel3.setLabelFor(spClassName);	134	jLabel3.setLabelFor(spClassName);
Lines 135-142 Link Here
135	panelClassName.add(java.awt.BorderLayout.CENTER, spClassName);	136	panelClassName.add(java.awt.BorderLayout.CENTER, spClassName);
136		137
137	editorCC = ClassBreakpointPanel.addClassNameEditorCC(JavaMethodNbDebugEditorKit.MIME_TYPE, null, className, org.openide.util.NbBundle.getMessage(MethodBreakpointPanel.class, "TTT_TF_Method_Breakpoint_Method_Name"));	138	editorCC = ClassBreakpointPanel.addClassNameEditorCC(JavaMethodNbDebugEditorKit.MIME_TYPE, null, className, org.openide.util.NbBundle.getMessage(MethodBreakpointPanel.class, "TTT_TF_Method_Breakpoint_Method_Name"));
138	spMethodName = editorCC.get1();	139	spMethodName = editorCC.first();
139	epMethodName = editorCC.get2();	140	epMethodName = editorCC.second();
140	jLabel1.setLabelFor(spMethodName);	141	jLabel1.setLabelFor(spMethodName);
141	java.awt.GridBagConstraints gridBagConstraints = new java.awt.GridBagConstraints();	142	java.awt.GridBagConstraints gridBagConstraints = new java.awt.GridBagConstraints();
142	gridBagConstraints.gridx = 1;	143	gridBagConstraints.gridx = 1;

Lines 1-67 Link Here

(-)a/debugger.jpda.ui/src/org/netbeans/modules/debugger/jpda/ui/breakpoints/Pair.java (-67 lines)
1	/*
2	* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3	*
4	* Copyright 2012 Oracle and/or its affiliates. All rights reserved.
5	*
6	* Oracle and Java are registered trademarks of Oracle and/or its affiliates.
7	* Other names may be trademarks of their respective owners.
8	*
9	* The contents of this file are subject to the terms of either the GNU
10	* General Public License Version 2 only ("GPL") or the Common
11	* Development and Distribution License("CDDL") (collectively, the
12	* "License"). You may not use this file except in compliance with the
13	* License. You can obtain a copy of the License at
14	* http://www.netbeans.org/cddl-gplv2.html
15	* or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
16	* specific language governing permissions and limitations under the
17	* License. When distributing the software, include this License Header
18	* Notice in each file and include the License file at
19	* nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
20	* particular file as subject to the "Classpath" exception as provided
21	* by Oracle in the GPL Version 2 section of the License file that
22	* accompanied this code. If applicable, add the following below the
23	* License Header, with the fields enclosed by brackets [] replaced by
24	* your own identifying information:
25	* "Portions Copyrighted [year] [name of copyright owner]"
26	*
27	* If you wish your version of this file to be governed by only the CDDL
28	* or only the GPL Version 2, indicate your decision by adding
29	* "[Contributor] elects to include this software in this distribution
30	* under the [CDDL or GPL Version 2] license." If you do not indicate a
31	* single choice of license, a recipient has the option to distribute
32	* your version of this file under either the CDDL, the GPL Version 2 or
33	* to extend the choice of license to its licensees as provided above.
34	* However, if you add GPL Version 2 code and therefore, elected the GPL
35	* Version 2 license, then the option applies only if the new code is
36	* made subject to such option by the copyright holder.
37	*
38	* Contributor(s):
39	*
40	* Portions Copyrighted 2012 Sun Microsystems, Inc.
41	*/
42	package org.netbeans.modules.debugger.jpda.ui.breakpoints;
43
44	/**
45	* A pair of values
46	*
47	* @author Martin Entlicher
48	*/
49	final class Pair<T1, T2> {
50
51	private final T1 o1;
52	private final T2 o2;
53
54	public Pair(final T1 o1, final T2 o2) {
55	this.o1 = o1;
56	this.o2 = o2;
57	}
58
59	public T1 get1() {
60	return o1;
61	}
62
63	public T2 get2() {
64	return o2;
65	}
66
67	}

Lines 57-66 Link Here

(-)a/html.editor/src/org/netbeans/modules/html/editor/gsf/HtmlStructureScanner.java (-6 / +6 lines)
57	import org.netbeans.modules.html.editor.api.gsf.HtmlParserResult;	57	import org.netbeans.modules.html.editor.api.gsf.HtmlParserResult;
58	import org.netbeans.modules.html.editor.lib.api.elements.*;	58	import org.netbeans.modules.html.editor.lib.api.elements.*;
59	import org.netbeans.modules.parsing.api.Snapshot;	59	import org.netbeans.modules.parsing.api.Snapshot;
60	import org.netbeans.modules.web.common.api.Pair;
61	import org.openide.filesystems.FileObject;	60	import org.openide.filesystems.FileObject;
62	import org.openide.util.NbBundle;	61	import org.openide.util.NbBundle;
63	import static org.netbeans.modules.html.editor.gsf.Bundle.*;	62	import static org.netbeans.modules.html.editor.gsf.Bundle.*;
		63	import org.openide.util.Pair;
64		64
65	/**	65	/**
66	*	66	*
Lines 99-106 Link Here
99	if (cache != null) {	99	if (cache != null) {
100	Pair<ParserResult, List<HtmlStructureItem>> pair = cache.get();	100	Pair<ParserResult, List<HtmlStructureItem>> pair = cache.get();
101	if (pair != null) {	101	if (pair != null) {
102	if (info == pair.getA()) {	102	if (info == pair.first()) {
103	return pair.getB();	103	return pair.second();
104	}	104	}
105	}	105	}
106	}	106	}
Lines 119-133 Link Here
119		119
120	Snapshot snapshot = info.getSnapshot();	120	Snapshot snapshot = info.getSnapshot();
121	FileObject file = snapshot.getSource().getFileObject();	121	FileObject file = snapshot.getSource().getFileObject();
122	List<StructureItem> elements = new ArrayList<StructureItem>();	122	List<HtmlStructureItem> elements = new ArrayList<HtmlStructureItem>();
123	for(OpenTag tag : root.children(OpenTag.class)) {	123	for(OpenTag tag : root.children(OpenTag.class)) {
124	HtmlElementHandle handle = new HtmlElementHandle(tag, file);	124	HtmlElementHandle handle = new HtmlElementHandle(tag, file);
125	StructureItem si = new HtmlStructureItem(tag, handle, snapshot);	125	HtmlStructureItem si = new HtmlStructureItem(tag, handle, snapshot);
126	elements.add(si);	126	elements.add(si);
127	}	127	}
128		128
129	//cache	129	//cache
130	Pair<ParserResult, List<HtmlStructureItem>> pair = new Pair(info, elements);	130	Pair<ParserResult, List<HtmlStructureItem>> pair = Pair.of(info, elements);
131	cache = new WeakReference<Pair<ParserResult, List<HtmlStructureItem>>>(pair);	131	cache = new WeakReference<Pair<ParserResult, List<HtmlStructureItem>>>(pair);
132		132
133	return elements;	133	return elements;

Lines 83-89 Link Here

(-)a/java.hints/src/org/netbeans/modules/java/hints/ConvertAnonymousToInner.java (-3 / +3 lines)
83	import org.netbeans.api.java.source.support.SelectionAwareJavaSourceTaskFactory;	83	import org.netbeans.api.java.source.support.SelectionAwareJavaSourceTaskFactory;
84	import org.netbeans.modules.java.editor.rename.InstantRenamePerformer;	84	import org.netbeans.modules.java.editor.rename.InstantRenamePerformer;
85	import org.netbeans.modules.java.hints.errors.Utilities;	85	import org.netbeans.modules.java.hints.errors.Utilities;
86	import org.netbeans.modules.java.hints.infrastructure.Pair;
87	import org.netbeans.modules.java.hints.spi.AbstractHint;	86	import org.netbeans.modules.java.hints.spi.AbstractHint;
88	import org.netbeans.spi.editor.hints.ChangeInfo;	87	import org.netbeans.spi.editor.hints.ChangeInfo;
89	import org.netbeans.spi.editor.hints.ErrorDescription;	88	import org.netbeans.spi.editor.hints.ErrorDescription;
Lines 96-101 Link Here
96	import org.openide.loaders.DataObjectNotFoundException;	95	import org.openide.loaders.DataObjectNotFoundException;
97	import org.openide.util.Exceptions;	96	import org.openide.util.Exceptions;
98	import org.openide.util.NbBundle;	97	import org.openide.util.NbBundle;
		98	import org.openide.util.Pair;
99		99
100	/**	100	/**
101	*	101	*
Lines 491-498 Link Here
491	if (resolvedArguments != null) {	491	if (resolvedArguments != null) {
492	nueSuperConstructorCallRealArguments = new LinkedList<ExpressionTree>();	492	nueSuperConstructorCallRealArguments = new LinkedList<ExpressionTree>();
493		493
494	Iterator<? extends TypeMirror> typeIt = resolvedArguments.getA().iterator();	494	Iterator<? extends TypeMirror> typeIt = resolvedArguments.first().iterator();
495	Iterator<String> nameIt = resolvedArguments.getB().iterator();	495	Iterator<String> nameIt = resolvedArguments.second().iterator();
496		496
497	while (typeIt.hasNext() && nameIt.hasNext()) {	497	while (typeIt.hasNext() && nameIt.hasNext()) {
498	TypeMirror tm = typeIt.next();	498	TypeMirror tm = typeIt.next();

Lines 57-63 Link Here

(-)a/java.hints/src/org/netbeans/modules/java/hints/bugs/UnusedAssignmentOrBranch.java (-4 / +4 lines)
57	import org.netbeans.api.java.source.CompilationInfo;	57	import org.netbeans.api.java.source.CompilationInfo;
58	import org.netbeans.api.java.source.CompilationInfo.CacheClearPolicy;	58	import org.netbeans.api.java.source.CompilationInfo.CacheClearPolicy;
59	import org.netbeans.api.java.source.support.CancellableTreePathScanner;	59	import org.netbeans.api.java.source.support.CancellableTreePathScanner;
60	import org.netbeans.modules.java.hints.infrastructure.Pair;
61	import org.netbeans.modules.java.hints.introduce.Flow;	60	import org.netbeans.modules.java.hints.introduce.Flow;
62	import org.netbeans.modules.java.hints.introduce.Flow.FlowResult;	61	import org.netbeans.modules.java.hints.introduce.Flow.FlowResult;
63	import org.netbeans.spi.java.hints.Hint;	62	import org.netbeans.spi.java.hints.Hint;
Lines 69-74 Link Here
69	import org.netbeans.spi.java.hints.TriggerPattern;	68	import org.netbeans.spi.java.hints.TriggerPattern;
70	import org.netbeans.spi.java.hints.TriggerPatterns;	69	import org.netbeans.spi.java.hints.TriggerPatterns;
71	import org.openide.util.NbBundle;	70	import org.openide.util.NbBundle;
		71	import org.openide.util.Pair;
72		72
73	/**	73	/**
74	*	74	*
Lines 136-142 Link Here
136	}	136	}
137	}.scan(info.getCompilationUnit(), null);	137	}.scan(info.getCompilationUnit(), null);
138		138
139	info.putCachedValue(KEY_COMPUTED_ASSIGNMENTS, result = new Pair<Set<Tree>, Set<Element>>(usedAssignments, usedVariables), CacheClearPolicy.ON_TASK_END);	139	info.putCachedValue(KEY_COMPUTED_ASSIGNMENTS, result = Pair.<Set<Tree>, Set<Element>>of(usedAssignments, usedVariables), CacheClearPolicy.ON_TASK_END);
140		140
141	return result;	141	return result;
142	}	142	}
Lines 155-162 Link Here
155	if (ctx.isCanceled() \|\| computedAssignments == null) return null;	155	if (ctx.isCanceled() \|\| computedAssignments == null) return null;
156		156
157	final CompilationInfo info = ctx.getInfo();	157	final CompilationInfo info = ctx.getInfo();
158	final Set<Tree> usedAssignments = computedAssignments.getA();	158	final Set<Tree> usedAssignments = computedAssignments.first();
159	final Set<Element> usedVariables = computedAssignments.getB();	159	final Set<Element> usedVariables = computedAssignments.second();
160	Element var = info.getTrees().getElement(ctx.getVariables().get("$var"));	160	Element var = info.getTrees().getElement(ctx.getVariables().get("$var"));
161	Tree value = ctx.getVariables().get("$value").getLeaf();	161	Tree value = ctx.getVariables().get("$value").getLeaf();
162		162

Lines 1-87 Link Here

(-)a/java.j2seprofiles/src/org/netbeans/modules/java/j2seprofiles/Pair.java (-87 lines)
1	/*
2	* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3	*
4	* Copyright 2010 Oracle and/or its affiliates. All rights reserved.
5	*
6	* Oracle and Java are registered trademarks of Oracle and/or its affiliates.
7	* Other names may be trademarks of their respective owners.
8	*
9	* The contents of this file are subject to the terms of either the GNU
10	* General Public License Version 2 only ("GPL") or the Common
11	* Development and Distribution License("CDDL") (collectively, the
12	* "License"). You may not use this file except in compliance with the
13	* License. You can obtain a copy of the License at
14	* http://www.netbeans.org/cddl-gplv2.html
15	* or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
16	* specific language governing permissions and limitations under the
17	* License. When distributing the software, include this License Header
18	* Notice in each file and include the License file at
19	* nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
20	* particular file as subject to the "Classpath" exception as provided
21	* by Oracle in the GPL Version 2 section of the License file that
22	* accompanied this code. If applicable, add the following below the
23	* License Header, with the fields enclosed by brackets [] replaced by
24	* your own identifying information:
25	* "Portions Copyrighted [year] [name of copyright owner]"
26	*
27	* If you wish your version of this file to be governed by only the CDDL
28	* or only the GPL Version 2, indicate your decision by adding
29	* "[Contributor] elects to include this software in this distribution
30	* under the [CDDL or GPL Version 2] license." If you do not indicate a
31	* single choice of license, a recipient has the option to distribute
32	* your version of this file under either the CDDL, the GPL Version 2 or
33	* to extend the choice of license to its licensees as provided above.
34	* However, if you add GPL Version 2 code and therefore, elected the GPL
35	* Version 2 license, then the option applies only if the new code is
36	* made subject to such option by the copyright holder.
37	*
38	* Contributor(s):
39	*
40	* Portions Copyrighted 2009 Sun Microsystems, Inc.
41	*/
42
43	package org.netbeans.modules.java.j2seprofiles;
44
45	/**
46	* Just another copy of Pair.
47	* @author Tomas Zezula
48	*/
49	final class Pair<P,K> {
50
51	public final P first;
52	public final K second;
53
54	private Pair (P first, K second) {
55	this.first = first;
56	this.second = second;
57	}
58
59
60	public static <P,K> Pair<P,K> of (P first, K second) {
61	return new Pair<P,K> (first,second);
62	}
63
64
65	@Override
66	public int hashCode () {
67	int hashCode = 0;
68	hashCode ^= first == null ? 0 : first.hashCode();
69	hashCode ^= second == null ? 0: second.hashCode();
70	return hashCode;
71	}
72
73	@Override
74	public boolean equals (final Object other) {
75	if (other instanceof Pair) {
76	Pair<?,?> otherPair = (Pair<?,?>) other;
77	return (this.first == null ? otherPair.first == null : this.first.equals(otherPair.first)) &&
78	(this.second == null ? otherPair.second == null : this.second.equals(otherPair.second));
79	}
80	return false;
81	}
82
83	@Override
84	public String toString () {
85	return String.format("Pair[%s,%s]", first,second);
86	}
87	}

Lines 96-102 Link Here

(-)a/java.navigation/src/org/netbeans/modules/java/navigation/ClassMemberPanelUI.java (-4 / +4 lines)
96	import org.netbeans.modules.java.navigation.actions.SortActions;	96	import org.netbeans.modules.java.navigation.actions.SortActions;
97	import org.netbeans.modules.java.navigation.base.FiltersManager;	97	import org.netbeans.modules.java.navigation.base.FiltersManager;
98	import org.netbeans.modules.java.navigation.base.HistorySupport;	98	import org.netbeans.modules.java.navigation.base.HistorySupport;
99	import org.netbeans.modules.java.navigation.base.Pair;
100	import org.netbeans.modules.java.navigation.base.Resolvers;	99	import org.netbeans.modules.java.navigation.base.Resolvers;
101	import org.netbeans.modules.java.navigation.base.SelectJavadocTask;	100	import org.netbeans.modules.java.navigation.base.SelectJavadocTask;
102	import org.openide.nodes.Node;	101	import org.openide.nodes.Node;
Lines 117-122 Link Here
117	import org.openide.util.Lookup;	116	import org.openide.util.Lookup;
118	import org.openide.util.Mutex;	117	import org.openide.util.Mutex;
119	import org.openide.util.NbPreferences;	118	import org.openide.util.NbPreferences;
		119	import org.openide.util.Pair;
120	import org.openide.util.RequestProcessor;	120	import org.openide.util.RequestProcessor;
121	import org.openide.util.lookup.AbstractLookup;	121	import org.openide.util.lookup.AbstractLookup;
122	import org.openide.util.lookup.InstanceContent;	122	import org.openide.util.lookup.InstanceContent;
Lines 756-762 Link Here
756	try {	756	try {
757	final Pair<URI,ElementHandle<TypeElement>> handlePair = becomesHandle.get();	757	final Pair<URI,ElementHandle<TypeElement>> handlePair = becomesHandle.get();
758	if (handlePair != null) {	758	if (handlePair != null) {
759	final FileObject target = URLMapper.findFileObject(handlePair.first.toURL());	759	final FileObject target = URLMapper.findFileObject(handlePair.first().toURL());
760	if (target != null) {	760	if (target != null) {
761	final JavaSource targetJs = JavaSource.forFileObject(target);	761	final JavaSource targetJs = JavaSource.forFileObject(target);
762	if (targetJs != null) {	762	if (targetJs != null) {
Lines 766-777 Link Here
766	} else {	766	} else {
767	clearNodes();	767	clearNodes();
768	StatusDisplayer.getDefault().setStatusText(Bundle.ERR_Cannot_Resolve_File(	768	StatusDisplayer.getDefault().setStatusText(Bundle.ERR_Cannot_Resolve_File(
769	handlePair.second.getQualifiedName()));	769	handlePair.second().getQualifiedName()));
770	}	770	}
771	} else {	771	} else {
772	clearNodes();	772	clearNodes();
773	StatusDisplayer.getDefault().setStatusText(Bundle.ERR_Cannot_Resolve_File(	773	StatusDisplayer.getDefault().setStatusText(Bundle.ERR_Cannot_Resolve_File(
774	handlePair.second.getQualifiedName()));	774	handlePair.second().getQualifiedName()));
775	}	775	}
776	} else {	776	} else {
777	clearNodes();	777	clearNodes();

Lines 75-87 Link Here

(-)a/java.source/src/org/netbeans/api/java/source/CompilationInfo.java (-2 / +2 lines)
75	import org.netbeans.modules.java.source.parsing.FileObjects;	75	import org.netbeans.modules.java.source.parsing.FileObjects;
76	import org.netbeans.modules.java.source.parsing.JavacParser;	76	import org.netbeans.modules.java.source.parsing.JavacParser;
77	import org.netbeans.modules.java.source.parsing.JavacParserResult;	77	import org.netbeans.modules.java.source.parsing.JavacParserResult;
78	import org.netbeans.modules.java.source.usages.Pair;
79	import org.netbeans.modules.parsing.api.Snapshot;	78	import org.netbeans.modules.parsing.api.Snapshot;
80	import org.netbeans.modules.parsing.spi.Parser;	79	import org.netbeans.modules.parsing.spi.Parser;
81	import org.openide.cookies.EditorCookie;	80	import org.openide.cookies.EditorCookie;
82	import org.openide.filesystems.FileObject;	81	import org.openide.filesystems.FileObject;
83	import org.openide.filesystems.FileUtil;	82	import org.openide.filesystems.FileUtil;
84	import org.openide.loaders.DataObject;	83	import org.openide.loaders.DataObject;
		84	import org.openide.util.Pair;
85	import org.openide.util.Parameters;	85	import org.openide.util.Parameters;
86		86
87	/** Assorted information about the JavaSource.	87	/** Assorted information about the JavaSource.
Lines 171-177 Link Here
171	if (cu == null) {	171	if (cu == null) {
172	return null;	172	return null;
173	}	173	}
174	return TreePath.getPath(cu, changedTree.second);	174	return TreePath.getPath(cu, changedTree.second());
175	}	175	}
176		176
177	/**	177	/**

Lines 47-53 Link Here

(-)a/java.source/src/org/netbeans/modules/java/source/parsing/SiblingSupport.java (-6 / +6 lines)
47	import java.util.logging.Level;	47	import java.util.logging.Level;
48	import java.util.logging.Logger;	48	import java.util.logging.Logger;
49	import org.netbeans.api.annotations.common.NonNull;	49	import org.netbeans.api.annotations.common.NonNull;
50	import org.netbeans.modules.java.source.usages.Pair;	50	import org.openide.util.Pair;
51		51
52	/**	52	/**
53	*	53	*
Lines 81-87 Link Here
81	} else {	81	} else {
82	LOG.log(Level.FINE, "Poped sibling: {0} size: {1}", new Object[] {removed, siblings.size()}); //NOI18N	82	LOG.log(Level.FINE, "Poped sibling: {0} size: {1}", new Object[] {removed, siblings.size()}); //NOI18N
83	}	83	}
84	return removed.first;	84	return removed.first();
85	}	85	}
86		86
87	@Override	87	@Override
Lines 104-113 Link Here
104	Level.FINER,	104	Level.FINER,
105	"Returns sibling: {0} in source root? {1}", //NOI18N	105	"Returns sibling: {0} in source root? {1}", //NOI18N
106	new Object[] {	106	new Object[] {
107	result.first,	107	result.first(),
108	result.second	108	result.second()
109	});	109	});
110	return result.first;	110	return result.first();
111	}	111	}
112		112
113	@Override	113	@Override
Lines 119-125 Link Here
119		119
120	@Override	120	@Override
121	public boolean isInSourceRoot() {	121	public boolean isInSourceRoot() {
122	return siblings.peek().second;	122	return siblings.peek().second();
123	}	123	}
124	}	124	}
125		125

Lines 62-72 Link Here

(-)a/java.source/src/org/netbeans/modules/java/source/save/PositionEstimator.java (-4 / +4 lines)
62	import org.netbeans.api.editor.guards.GuardedSectionManager;	62	import org.netbeans.api.editor.guards.GuardedSectionManager;
63	import org.netbeans.api.java.lexer.JavaTokenId;	63	import org.netbeans.api.java.lexer.JavaTokenId;
64	import org.netbeans.modules.java.source.transform.FieldGroupTree;	64	import org.netbeans.modules.java.source.transform.FieldGroupTree;
65	import org.netbeans.modules.java.source.usages.Pair;
66	import static org.netbeans.api.java.lexer.JavaTokenId.*;	65	import static org.netbeans.api.java.lexer.JavaTokenId.*;
67	import org.netbeans.api.lexer.Token;	66	import org.netbeans.api.lexer.Token;
68	import org.netbeans.api.lexer.TokenSequence;	67	import org.netbeans.api.lexer.TokenSequence;
69	import org.netbeans.modules.java.source.save.CasualDiff.LineInsertionType;	68	import org.netbeans.modules.java.source.save.CasualDiff.LineInsertionType;
		69	import org.openide.util.Pair;
70		70
71	/**	71	/**
72	* Estimates the position for given element or element set. Offsets are	72	* Estimates the position for given element or element set. Offsets are
Lines 997-1003 Link Here
997	if (commentEndPos.isEmpty()) {	997	if (commentEndPos.isEmpty()) {
998	wideEnd = seq.offset() + indexOf + 1;	998	wideEnd = seq.offset() + indexOf + 1;
999	} else {	999	} else {
1000	commentEndPos.add(Pair.of(commentEndPos.getLast().first, seq.offset() + indexOf + 1));	1000	commentEndPos.add(Pair.of(commentEndPos.getLast().first(), seq.offset() + indexOf + 1));
1001	}	1001	}
1002	}	1002	}
1003	}	1003	}
Lines 1031-1038 Link Here
1031	}	1031	}
1032	maxLines = Math.max(maxLines, newlines);	1032	maxLines = Math.max(maxLines, newlines);
1033	for (Pair<Integer, Integer> comment : commentEndPos) {	1033	for (Pair<Integer, Integer> comment : commentEndPos) {
1034	if (comment.first < maxLines \|\| comment.first == 0) {	1034	if (comment.first() < maxLines \|\| comment.first() == 0) {
1035	wideEnd = comment.second;	1035	wideEnd = comment.second();
1036	} else {	1036	} else {
1037	break;	1037	break;
1038	}	1038	}

Lines 78-88 Link Here

(-)a/java.source/test/unit/src/org/netbeans/api/java/source/support/ProfileSupportTest.java (-4 / +4 lines)
78	import org.netbeans.modules.java.platform.JavaPlatformProvider;	78	import org.netbeans.modules.java.platform.JavaPlatformProvider;
79	import org.netbeans.modules.java.source.ElementHandleAccessor;	79	import org.netbeans.modules.java.source.ElementHandleAccessor;
80	import org.netbeans.modules.java.source.parsing.FileObjects;	80	import org.netbeans.modules.java.source.parsing.FileObjects;
81	import org.netbeans.modules.java.source.usages.Pair;
82	import org.netbeans.spi.java.classpath.support.ClassPathSupport;	81	import org.netbeans.spi.java.classpath.support.ClassPathSupport;
83	import org.openide.filesystems.FileObject;	82	import org.openide.filesystems.FileObject;
84	import org.openide.filesystems.FileUtil;	83	import org.openide.filesystems.FileUtil;
85	import org.openide.modules.SpecificationVersion;	84	import org.openide.modules.SpecificationVersion;
		85	import org.openide.util.Pair;
86	import org.openide.util.Utilities;	86	import org.openide.util.Utilities;
87		87
88	/**	88	/**
Lines 214-220 Link Here
214	public int compare(	214	public int compare(
215	Pair<ElementHandle<TypeElement>, SourceLevelQuery.Profile> o1,	215	Pair<ElementHandle<TypeElement>, SourceLevelQuery.Profile> o1,
216	Pair<ElementHandle<TypeElement>, SourceLevelQuery.Profile> o2) {	216	Pair<ElementHandle<TypeElement>, SourceLevelQuery.Profile> o2) {
217	return o1.first.getBinaryName().compareTo(o2.first.getBinaryName());	217	return o1.first().getBinaryName().compareTo(o2.first().getBinaryName());
218	}	218	}
219	});	219	});
220	}	220	}
Lines 352-359 Link Here
352		352
353		353
354	JP(Pair<File,URL> p) {	354	JP(Pair<File,URL> p) {
355	this.home = FileUtil.toFileObject(p.first);	355	this.home = FileUtil.toFileObject(p.first());
356	this.boot = ClassPathSupport.createClassPath(p.second);	356	this.boot = ClassPathSupport.createClassPath(p.second());
357	}	357	}
358		358
359		359

Lines 58-66 Link Here

(-)a/java.source/test/unit/src/org/netbeans/modules/java/source/parsing/CachingFileManagerTest.java (-8 / +8 lines)
58	import javax.tools.StandardLocation;	58	import javax.tools.StandardLocation;
59	import org.netbeans.api.java.classpath.ClassPath;	59	import org.netbeans.api.java.classpath.ClassPath;
60	import org.netbeans.junit.NbTestCase;	60	import org.netbeans.junit.NbTestCase;
61	import org.netbeans.modules.java.source.usages.Pair;
62	import org.netbeans.spi.java.classpath.support.ClassPathSupport;	61	import org.netbeans.spi.java.classpath.support.ClassPathSupport;
63	import org.openide.filesystems.FileUtil;	62	import org.openide.filesystems.FileUtil;
		63	import org.openide.util.Pair;
64	import org.openide.util.Utilities;	64	import org.openide.util.Utilities;
65		65
66	/**	66	/**
Lines 120-139 Link Here
120	final CachingArchiveProvider provider = CachingArchiveProvider.getDefault();	120	final CachingArchiveProvider provider = CachingArchiveProvider.getDefault();
121	final CachingFileManager manager = new CachingFileManager(provider, cp, false, true);	121	final CachingFileManager manager = new CachingFileManager(provider, cp, false, true);
122	for (Pair<Pair<String,String>,URI> testCase : testCases) {	122	for (Pair<Pair<String,String>,URI> testCase : testCases) {
123	final Pair<String,String> name = testCase.first;	123	final Pair<String,String> name = testCase.first();
124	final URI expectedURI = testCase.second;	124	final URI expectedURI = testCase.second();
125	FileObject fo = manager.getFileForInput(StandardLocation.CLASS_PATH, name.first, name.second);	125	FileObject fo = manager.getFileForInput(StandardLocation.CLASS_PATH, name.first(), name.second());
126	if (expectedURI == null) {	126	if (expectedURI == null) {
127	assertNull(	127	assertNull(
128	String.format("Lookup: %s/%s expected: null",	128	String.format("Lookup: %s/%s expected: null",
129	name.first,	129	name.first(),
130	name.second),	130	name.second()),
131	fo);	131	fo);
132	} else {	132	} else {
133	assertEquals(	133	assertEquals(
134	String.format("Lookup: %s/%s expected: %s",	134	String.format("Lookup: %s/%s expected: %s",
135	name.first,	135	name.first(),
136	name.second,	136	name.second(),
137	expectedURI),	137	expectedURI),
138	expectedURI,	138	expectedURI,
139	fo.toUri());	139	fo.toUri());

Lines 79-91 Link Here

(-)a/java.sourceui/src/org/netbeans/api/java/source/ui/ElementJavadoc.java (-23 / +23 lines)
79	import org.netbeans.modules.java.preprocessorbridge.api.JavaSourceUtil;	79	import org.netbeans.modules.java.preprocessorbridge.api.JavaSourceUtil;
80	import org.netbeans.modules.java.source.JavadocHelper;	80	import org.netbeans.modules.java.source.JavadocHelper;
81	import org.netbeans.modules.java.source.parsing.FileObjects;	81	import org.netbeans.modules.java.source.parsing.FileObjects;
82	import org.netbeans.modules.java.source.usages.Pair;
83	import org.netbeans.spi.java.classpath.support.ClassPathSupport;	82	import org.netbeans.spi.java.classpath.support.ClassPathSupport;
84	import org.openide.filesystems.FileObject;	83	import org.openide.filesystems.FileObject;
85	import org.openide.filesystems.FileStateInvalidException;	84	import org.openide.filesystems.FileStateInvalidException;
86	import org.openide.filesystems.FileUtil;	85	import org.openide.filesystems.FileUtil;
87	import org.openide.util.Exceptions;	86	import org.openide.util.Exceptions;
88	import org.openide.util.NbBundle;	87	import org.openide.util.NbBundle;
		88	import org.openide.util.Pair;
89	import org.openide.util.RequestProcessor;	89	import org.openide.util.RequestProcessor;
90	import org.openide.xml.XMLUtil;	90	import org.openide.xml.XMLUtil;
91		91
Lines 344-350 Link Here
344	this.cpInfo = compilationInfo.getClasspathInfo();	344	this.cpInfo = compilationInfo.getClasspathInfo();
345	this.handle = element == null ? null : ElementHandle.create(element);	345	this.handle = element == null ? null : ElementHandle.create(element);
346	this.cancel = cancel;	346	this.cancel = cancel;
347	Doc doc = context.second.javaDocFor(element);	347	Doc doc = context.second().javaDocFor(element);
348	boolean localized = false;	348	boolean localized = false;
349	StringBuilder content = new StringBuilder();	349	StringBuilder content = new StringBuilder();
350	JavadocHelper.TextStream page = null;	350	JavadocHelper.TextStream page = null;
Lines 397-403 Link Here
397	c.toPhase(Phase.RESOLVED);	397	c.toPhase(Phase.RESOLVED);
398	final Element element = handle.resolve(c);	398	final Element element = handle.resolve(c);
399	Pair<Trees,ElementUtilities> context = Pair.of(c.getTrees(), c.getElementUtilities());	399	Pair<Trees,ElementUtilities> context = Pair.of(c.getTrees(), c.getElementUtilities());
400	Doc doc = context.second.javaDocFor(element);	400	Doc doc = context.second().javaDocFor(element);
401	JavadocHelper.TextStream page = JavadocHelper.getJavadoc(element, cancel);	401	JavadocHelper.TextStream page = JavadocHelper.getJavadoc(element, cancel);
402	return prepareContent(contentFin, doc,localizedFin, page, cancel, false, context).get();	402	return prepareContent(contentFin, doc,localizedFin, page, cancel, false, context).get();
403	}	403	}
Lines 787-793 Link Here
787	StringBuilder sb = new StringBuilder();	787	StringBuilder sb = new StringBuilder();
788	ClassDoc cls = peDoc.containingClass();	788	ClassDoc cls = peDoc.containingClass();
789	if (cls != null) {	789	if (cls != null) {
790	Element e = ctx.second.elementFor(cls);	790	Element e = ctx.second().elementFor(cls);
791	if (e != null) {	791	if (e != null) {
792	switch(e.getEnclosingElement().getKind()) {	792	switch(e.getEnclosingElement().getKind()) {
793	case ANNOTATION_TYPE:	793	case ANNOTATION_TYPE:
Lines 806-812 Link Here
806	PackageDoc pkg = peDoc.containingPackage();	806	PackageDoc pkg = peDoc.containingPackage();
807	if (pkg != null) {	807	if (pkg != null) {
808	sb.append("<font size='+0'><b>"); //NOI18N	808	sb.append("<font size='+0'><b>"); //NOI18N
809	createLink(sb, ctx.second.elementFor(pkg), makeNameLineBreakable(pkg.name()));	809	createLink(sb, ctx.second().elementFor(pkg), makeNameLineBreakable(pkg.name()));
810	sb.append("</b></font>"); //NOI18N)	810	sb.append("</b></font>"); //NOI18N)
811	}	811	}
812	}	812	}
Lines 973-979 Link Here
973	sb.append('('); //NOI18N	973	sb.append('('); //NOI18N
974	for (int i = 0; i < pairs.length; i++) {	974	for (int i = 0; i < pairs.length; i++) {
975	AnnotationTypeElementDoc ated = pairs[i].element();	975	AnnotationTypeElementDoc ated = pairs[i].element();
976	createLink(sb, ctx.second.elementFor(ated), ated.name());	976	createLink(sb, ctx.second().elementFor(ated), ated.name());
977	sb.append('='); //NOI18N	977	sb.append('='); //NOI18N
978	appendAnnotationValue(sb, pairs[i].value(), ctx);	978	appendAnnotationValue(sb, pairs[i].value(), ctx);
979	if (i < pairs.length - 1)	979	if (i < pairs.length - 1)
Lines 1009-1015 Link Here
1009	if (length > 1)	1009	if (length > 1)
1010	sb.append('}'); //NOI18N	1010	sb.append('}'); //NOI18N
1011	} else if (value instanceof Doc) {	1011	} else if (value instanceof Doc) {
1012	createLink(sb, ctx.second.elementFor((Doc)value), ((Doc)value).name());	1012	createLink(sb, ctx.second().elementFor((Doc)value), ((Doc)value).name());
1013	} else {	1013	} else {
1014	sb.append(value.toString());	1014	sb.append(value.toString());
1015	}	1015	}
Lines 1061-1067 Link Here
1061	thr.append("<code>"); //NOI18N	1061	thr.append("<code>"); //NOI18N
1062	Type exType = throwsTag.exceptionType();	1062	Type exType = throwsTag.exceptionType();
1063	if (exType != null) {	1063	if (exType != null) {
1064	createLink(thr, ctx.second.elementFor(exType.asClassDoc()), exType.simpleTypeName());	1064	createLink(thr, ctx.second().elementFor(exType.asClassDoc()), exType.simpleTypeName());
1065	} else {	1065	} else {
1066	thr.append(throwsTag.exceptionName());	1066	thr.append(throwsTag.exceptionName());
1067	}	1067	}
Lines 1090-1096 Link Here
1090	String label = stag.label();	1090	String label = stag.label();
1091	if (memberName != null) {	1091	if (memberName != null) {
1092	if (refClass != null) {	1092	if (refClass != null) {
1093	createLink(see, ctx.second.elementFor(stag.referencedMember()), "<code>" + (label != null && label.length() > 0 ? label : (refClass.simpleTypeName() + "." + memberName)) + "</code>"); //NOI18N	1093	createLink(see, ctx.second().elementFor(stag.referencedMember()), "<code>" + (label != null && label.length() > 0 ? label : (refClass.simpleTypeName() + "." + memberName)) + "</code>"); //NOI18N
1094	} else {	1094	} else {
1095	see.append(className);	1095	see.append(className);
1096	see.append('.'); //NOI18N	1096	see.append('.'); //NOI18N
Lines 1099-1107 Link Here
1099	see.append(", "); //NOI18N	1099	see.append(", "); //NOI18N
1100	} else if (className != null) {	1100	} else if (className != null) {
1101	if (refClass != null) {	1101	if (refClass != null) {
1102	createLink(see, ctx.second.elementFor(refClass), "<code>" + (label != null && label.length() > 0 ? label : refClass.simpleTypeName()) + "</code>"); //NOI18N	1102	createLink(see, ctx.second().elementFor(refClass), "<code>" + (label != null && label.length() > 0 ? label : refClass.simpleTypeName()) + "</code>"); //NOI18N
1103	} else if (refPackage != null) {	1103	} else if (refPackage != null) {
1104	createLink(see, ctx.second.elementFor(refPackage), "<code>" + (label != null && label.length() > 0 ? label : refPackage.name()) + "</code>"); //NOI18N	1104	createLink(see, ctx.second().elementFor(refPackage), "<code>" + (label != null && label.length() > 0 ? label : refPackage.name()) + "</code>"); //NOI18N
1105	} else {	1105	} else {
1106	see.append(className);	1106	see.append(className);
1107	}	1107	}
Lines 1159-1165 Link Here
1159	thr.append("<code>"); //NOI18N	1159	thr.append("<code>"); //NOI18N
1160	Type exType = ((ThrowsTag)tag).exceptionType();	1160	Type exType = ((ThrowsTag)tag).exceptionType();
1161	if (exType != null)	1161	if (exType != null)
1162	createLink(thr, ctx.second.elementFor(exType.asClassDoc()), exType.simpleTypeName());	1162	createLink(thr, ctx.second().elementFor(exType.asClassDoc()), exType.simpleTypeName());
1163	else	1163	else
1164	thr.append(((ThrowsTag)tag).exceptionName());	1164	thr.append(((ThrowsTag)tag).exceptionName());
1165	thr.append("</code>"); //NOI18N	1165	thr.append("</code>"); //NOI18N
Lines 1181-1187 Link Here
1181	String label = stag.label();	1181	String label = stag.label();
1182	if (memberName != null) {	1182	if (memberName != null) {
1183	if (refClass != null) {	1183	if (refClass != null) {
1184	createLink(see, ctx.second.elementFor(stag.referencedMember()), "<code>" + (label != null && label.length() > 0 ? label : (refClass.simpleTypeName() + "." + memberName)) + "</code>"); //NOI18N	1184	createLink(see, ctx.second().elementFor(stag.referencedMember()), "<code>" + (label != null && label.length() > 0 ? label : (refClass.simpleTypeName() + "." + memberName)) + "</code>"); //NOI18N
1185	} else {	1185	} else {
1186	see.append(className);	1186	see.append(className);
1187	see.append('.'); //NOI18N	1187	see.append('.'); //NOI18N
Lines 1190-1198 Link Here
1190	see.append(", "); //NOI18N	1190	see.append(", "); //NOI18N
1191	} else if (className != null) {	1191	} else if (className != null) {
1192	if (refClass != null) {	1192	if (refClass != null) {
1193	createLink(see, ctx.second.elementFor(refClass), "<code>" + (label != null && label.length() > 0 ? label : refClass.simpleTypeName()) + "</code>"); //NOI18N	1193	createLink(see, ctx.second().elementFor(refClass), "<code>" + (label != null && label.length() > 0 ? label : refClass.simpleTypeName()) + "</code>"); //NOI18N
1194	} else if (refPackage != null) {	1194	} else if (refPackage != null) {
1195	createLink(see, ctx.second.elementFor(refPackage), "<code>" + (label != null && label.length() > 0 ? label : refPackage.name()) + "</code>"); //NOI18N	1195	createLink(see, ctx.second().elementFor(refPackage), "<code>" + (label != null && label.length() > 0 ? label : refPackage.name()) + "</code>"); //NOI18N
1196	} else {	1196	} else {
1197	see.append(className);	1197	see.append(className);
1198	}	1198	}
Lines 1262-1268 Link Here
1262	boolean plain = LINKPLAIN_TAG.equals(stag.name());	1262	boolean plain = LINKPLAIN_TAG.equals(stag.name());
1263	if (memberName != null) {	1263	if (memberName != null) {
1264	if (refClass != null) {	1264	if (refClass != null) {
1265	createLink(sb, ctx.second.elementFor(stag.referencedMember()), (plain ? "" : "<code>") + (label != null && label.length() > 0 ? label : (refClass.simpleTypeName() + "." + memberName)) + (plain ? "" : "</code>")); //NOI18N	1265	createLink(sb, ctx.second().elementFor(stag.referencedMember()), (plain ? "" : "<code>") + (label != null && label.length() > 0 ? label : (refClass.simpleTypeName() + "." + memberName)) + (plain ? "" : "</code>")); //NOI18N
1266	} else {	1266	} else {
1267	sb.append(stag.referencedClassName());	1267	sb.append(stag.referencedClassName());
1268	sb.append('.'); //NOI18N	1268	sb.append('.'); //NOI18N
Lines 1270-1278 Link Here
1270	}	1270	}
1271	} else {	1271	} else {
1272	if (refClass != null) {	1272	if (refClass != null) {
1273	createLink(sb, ctx.second.elementFor(refClass), (plain ? "" : "<code>") + (label != null && label.length() > 0 ? label : refClass.simpleTypeName()) + (plain ? "" : "</code>")); //NOI18N	1273	createLink(sb, ctx.second().elementFor(refClass), (plain ? "" : "<code>") + (label != null && label.length() > 0 ? label : refClass.simpleTypeName()) + (plain ? "" : "</code>")); //NOI18N
1274	} else if (refPackage != null) {	1274	} else if (refPackage != null) {
1275	createLink(sb, ctx.second.elementFor(refPackage), (plain ? "" : "<code>") + (label != null && label.length() > 0 ? label : refPackage.name()) + (plain ? "" : "</code>")); //NOI18N	1275	createLink(sb, ctx.second().elementFor(refPackage), (plain ? "" : "<code>") + (label != null && label.length() > 0 ? label : refPackage.name()) + (plain ? "" : "</code>")); //NOI18N
1276	} else {	1276	} else {
1277	String className = stag.referencedClassName();	1277	String className = stag.referencedClassName();
1278	sb.append(className != null ? className : stag.text());	1278	sb.append(className != null ? className : stag.text());
Lines 1383-1389 Link Here
1383	String tName = cd != null ? cd.name() : type.simpleTypeName();	1383	String tName = cd != null ? cd.name() : type.simpleTypeName();
1384	if (cd != null && cd.isAnnotationType() && annotation)	1384	if (cd != null && cd.isAnnotationType() && annotation)
1385	tName = "@" + tName; //NOI18N	1385	tName = "@" + tName; //NOI18N
1386	len += createLink(sb, ctx.second.elementFor(type.asClassDoc()), tName);	1386	len += createLink(sb, ctx.second().elementFor(type.asClassDoc()), tName);
1387	ParameterizedType pt = type.asParameterizedType();	1387	ParameterizedType pt = type.asParameterizedType();
1388	if (pt != null) {	1388	if (pt != null) {
1389	Type[] targs = pt.typeArguments();	1389	Type[] targs = pt.typeArguments();
Lines 1433-1439 Link Here
1433	for (ClassDoc ifaceDoc : cdoc.interfaces()) {	1433	for (ClassDoc ifaceDoc : cdoc.interfaces()) {
1434	for (MethodDoc methodDoc : ifaceDoc.methods(false)) {	1434	for (MethodDoc methodDoc : ifaceDoc.methods(false)) {
1435	if (mdoc.overrides(methodDoc)) {	1435	if (mdoc.overrides(methodDoc)) {
1436	Element e = ctx.second.elementFor(methodDoc);	1436	Element e = ctx.second().elementFor(methodDoc);
1437	boolean isLocalized = false;	1437	boolean isLocalized = false;
1438	if (e != null) {	1438	if (e != null) {
1439	inheritedPage = JavadocHelper.getJavadoc(e, cancel);	1439	inheritedPage = JavadocHelper.getJavadoc(e, cancel);
Lines 1441-1447 Link Here
1441	docURL = inheritedPage.getLocation();	1441	docURL = inheritedPage.getLocation();
1442	}	1442	}
1443	if (!(isLocalized = isLocalized(docURL, e)))	1443	if (!(isLocalized = isLocalized(docURL, e)))
1444	ctx.first.getTree(e);	1444	ctx.first().getTree(e);
1445	}	1445	}
1446	if (!isLocalized) {	1446	if (!isLocalized) {
1447	List<Tag> inheritedInlineTags = null;	1447	List<Tag> inheritedInlineTags = null;
Lines 1606-1612 Link Here
1606	if (superclass != null) { //NOI18N	1606	if (superclass != null) { //NOI18N
1607	for (MethodDoc methodDoc : superclass.methods(false)) {	1607	for (MethodDoc methodDoc : superclass.methods(false)) {
1608	if (mdoc.overrides(methodDoc)) {	1608	if (mdoc.overrides(methodDoc)) {
1609	Element e = ctx.second.elementFor(methodDoc);	1609	Element e = ctx.second().elementFor(methodDoc);
1610	boolean isLocalized = false;	1610	boolean isLocalized = false;
1611	if (e != null) {	1611	if (e != null) {
1612	inheritedPage = JavadocHelper.getJavadoc(e, cancel);	1612	inheritedPage = JavadocHelper.getJavadoc(e, cancel);
Lines 1614-1620 Link Here
1614	docURL = inheritedPage.getLocation();	1614	docURL = inheritedPage.getLocation();
1615	}	1615	}
1616	if (!(isLocalized = isLocalized(docURL, e)))	1616	if (!(isLocalized = isLocalized(docURL, e)))
1617	ctx.first.getTree(e);	1617	ctx.first().getTree(e);
1618	}	1618	}
1619	if (!isLocalized) {	1619	if (!isLocalized) {
1620	List<Tag> inheritedInlineTags = null;	1620	List<Tag> inheritedInlineTags = null;

Lines 99-104 Link Here

(-)a/javascript.editing/src/org/netbeans/modules/javascript/editing/JsCodeCompletion.java (-6 / +7 lines)
99	import org.openide.util.Exceptions;	99	import org.openide.util.Exceptions;
100	import org.openide.util.ImageUtilities;	100	import org.openide.util.ImageUtilities;
101	import org.openide.util.NbBundle;	101	import org.openide.util.NbBundle;
		102	import org.openide.util.Pair;
102		103
103	/**	104	/**
104	* Code completion handler for JavaScript	105	* Code completion handler for JavaScript
Lines 1222-1229 Link Here
1222	matches = index.getElements(prefix, fqn, kind, result);	1223	matches = index.getElements(prefix, fqn, kind, result);
1223	} else {	1224	} else {
1224	Pair<Set<IndexedElement>, Boolean> names = index.getAllNamesTruncated(prefix, kind, result);	1225	Pair<Set<IndexedElement>, Boolean> names = index.getAllNamesTruncated(prefix, kind, result);
1225	matches = names.getA();	1226	matches = names.first();
1226	boolean isTruncated = names.getB();	1227	boolean isTruncated = names.second();
1227	if (isTruncated) {	1228	if (isTruncated) {
1228	request.completionResult.setTruncated(true);	1229	request.completionResult.setTruncated(true);
1229	includeNonFqn = false;	1230	includeNonFqn = false;
Lines 1446-1453 Link Here
1446	// return true;	1447	// return true;
1447	// } else {	1448	// } else {
1448	Pair<Set<IndexedElement>, Boolean> names = index.getAllNamesTruncated(prefix, kind, result);	1449	Pair<Set<IndexedElement>, Boolean> names = index.getAllNamesTruncated(prefix, kind, result);
1449	elements = names.getA();	1450	elements = names.first();
1450	boolean isTruncated = names.getB();	1451	boolean isTruncated = names.second();
1451	if (isTruncated) {	1452	if (isTruncated) {
1452	request.completionResult.setTruncated(true);	1453	request.completionResult.setTruncated(true);
1453	}	1454	}
Lines 1583-1590 Link Here
1583		1584
1584	if (token.id() == JsTokenId.NEW) {	1585	if (token.id() == JsTokenId.NEW) {
1585	Pair<Set<IndexedElement>, Boolean> constructors = index.getConstructors(prefix, kind);	1586	Pair<Set<IndexedElement>, Boolean> constructors = index.getConstructors(prefix, kind);
1586	Set<IndexedElement> elements = constructors.getA();	1587	Set<IndexedElement> elements = constructors.first();
1587	if (constructors.getB()) {	1588	if (constructors.second()) {
1588	request.completionResult.setTruncated(true);	1589	request.completionResult.setTruncated(true);
1589	}	1590	}
1590	String lhs = request.call.getLhs();	1591	String lhs = request.call.getLhs();

Lines 110-116 Link Here

(-)a/jumpto/src/org/netbeans/modules/jumpto/file/FileSearchAction.java (-2 / +2 lines)
110	import org.netbeans.modules.jumpto.common.Factory;	110	import org.netbeans.modules.jumpto.common.Factory;
111	import org.netbeans.modules.jumpto.type.GoToTypeAction;	111	import org.netbeans.modules.jumpto.type.GoToTypeAction;
112	import org.netbeans.modules.jumpto.common.Models;	112	import org.netbeans.modules.jumpto.common.Models;
113	import org.netbeans.modules.jumpto.common.Pair;
114	import org.netbeans.modules.parsing.spi.indexing.support.IndexResult;	113	import org.netbeans.modules.parsing.spi.indexing.support.IndexResult;
115	import org.netbeans.modules.parsing.spi.indexing.support.QuerySupport;	114	import org.netbeans.modules.parsing.spi.indexing.support.QuerySupport;
116	import org.netbeans.spi.jumpto.file.FileDescriptor;	115	import org.netbeans.spi.jumpto.file.FileDescriptor;
Lines 133-138 Link Here
133	import org.openide.util.ImageUtilities;	132	import org.openide.util.ImageUtilities;
134	import org.openide.util.Lookup;	133	import org.openide.util.Lookup;
135	import org.openide.util.NbBundle;	134	import org.openide.util.NbBundle;
		135	import org.openide.util.Pair;
136	import org.openide.util.Parameters;	136	import org.openide.util.Parameters;
137	import org.openide.util.RequestProcessor;	137	import org.openide.util.RequestProcessor;
138	import org.openide.util.Utilities;	138	import org.openide.util.Utilities;
Lines 491-497 Link Here
491	new Factory<FileDescriptor, Pair<FileDescriptor,Runnable>>() {	491	new Factory<FileDescriptor, Pair<FileDescriptor,Runnable>>() {
492	@Override	492	@Override
493	public FileDescriptor create(@NonNull final Pair<FileDescriptor,Runnable> param) {	493	public FileDescriptor create(@NonNull final Pair<FileDescriptor,Runnable> param) {
494	return new AsyncFileDescriptor(param.first, param.second);	494	return new AsyncFileDescriptor(param.first(), param.second());
495	}	495	}
496	});	496	});
497		497

Lines 1-73 Link Here

(-)a/maven.hints/src/org/netbeans/modules/maven/hints/pom/Pair.java (-73 lines)
1	/*
2	* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3	*
4	* Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
5	*
6	* Oracle and Java are registered trademarks of Oracle and/or its affiliates.
7	* Other names may be trademarks of their respective owners.
8	*
9	* The contents of this file are subject to the terms of either the GNU
10	* General Public License Version 2 only ("GPL") or the Common
11	* Development and Distribution License("CDDL") (collectively, the
12	* "License"). You may not use this file except in compliance with the
13	* License. You can obtain a copy of the License at
14	* http://www.netbeans.org/cddl-gplv2.html
15	* or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
16	* specific language governing permissions and limitations under the
17	* License. When distributing the software, include this License Header
18	* Notice in each file and include the License file at
19	* nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
20	* particular file as subject to the "Classpath" exception as provided
21	* by Oracle in the GPL Version 2 section of the License file that
22	* accompanied this code. If applicable, add the following below the
23	* License Header, with the fields enclosed by brackets [] replaced by
24	* your own identifying information:
25	* "Portions Copyrighted [year] [name of copyright owner]"
26	*
27	* Contributor(s):
28	*
29	* The Original Software is NetBeans. The Initial Developer of the Original
30	* Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
31	* Microsystems, Inc. All Rights Reserved.
32	*
33	* If you wish your version of this file to be governed by only the CDDL
34	* or only the GPL Version 2, indicate your decision by adding
35	* "[Contributor] elects to include this software in this distribution
36	* under the [CDDL or GPL Version 2] license." If you do not indicate a
37	* single choice of license, a recipient has the option to distribute
38	* your version of this file under either the CDDL, the GPL Version 2 or
39	* to extend the choice of license to its licensees as provided above.
40	* However, if you add GPL Version 2 code and therefore, elected the GPL
41	* Version 2 license, then the option applies only if the new code is
42	* made subject to such option by the copyright holder.
43	*/
44
45	package org.netbeans.modules.maven.hints.pom;
46
47	/**
48	*
49	* @author Jan Lahoda
50	*/
51	public final class Pair<A, B> {
52
53	private A a;
54	private B b;
55
56	public Pair(A a, B b) {
57	this.a = a;
58	this.b = b;
59	}
60
61	public A getA() {
62	return a;
63	}
64
65	public B getB() {
66	return b;
67	}
68
69	@Override
70	public String toString() {
71	return "[" + String.valueOf(a) + "/" + String.valueOf(b) + "]";
72	}
73	}

Lines 51-56 Link Here

(-)a/openide.util/apichanges.xml (+15 lines)
51	<apidef name="actions">Actions API</apidef>	51	<apidef name="actions">Actions API</apidef>
52	</apidefs>	52	</apidefs>
53	<changes>	53	<changes>
		54	<change id="pair">
		55	<api name="util"/>
		56	<summary>Added a type safe Pair of 2 elements</summary>
		57	<version major="8" minor="32"/>
		58	<date year="2013" month="5" day="1"/>
		59	<author login="tzezula"/>
		60	<compatibility addition="yes" binary="compatible" source="compatible"/>
		61	<description>
		62	<p>
		63	Added a type safe Pair of 2 elements.
		64	</p>
		65	</description>
		66	<class package="org.openide.util" name="Pair"/>
		67	<issue number="228994"/>
		68	</change>
54	<change id="automatic-uqe">	69	<change id="automatic-uqe">
55	<api name="util"/>	70	<api name="util"/>
56	<summary>Automatic support for UserQuestionException</summary>	71	<summary>Automatic support for UserQuestionException</summary>

Line 0 Link Here

(-)a/openide.util/src/org/openide/util/Pair.java (+114 lines)
		1	/*
		2	* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
		3	*
		4	* Copyright 2013 Oracle and/or its affiliates. All rights reserved.
		5	*
		6	* Oracle and Java are registered trademarks of Oracle and/or its affiliates.
		7	* Other names may be trademarks of their respective owners.
		8	*
		9	* The contents of this file are subject to the terms of either the GNU
		10	* General Public License Version 2 only ("GPL") or the Common
		11	* Development and Distribution License("CDDL") (collectively, the
		12	* "License"). You may not use this file except in compliance with the
		13	* License. You can obtain a copy of the License at
		14	* http://www.netbeans.org/cddl-gplv2.html
		15	* or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
		16	* specific language governing permissions and limitations under the
		17	* License. When distributing the software, include this License Header
		18	* Notice in each file and include the License file at
		19	* nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
		20	* particular file as subject to the "Classpath" exception as provided
		21	* by Oracle in the GPL Version 2 section of the License file that
		22	* accompanied this code. If applicable, add the following below the
		23	* License Header, with the fields enclosed by brackets [] replaced by
		24	* your own identifying information:
		25	* "Portions Copyrighted [year] [name of copyright owner]"
		26	*
		27	* If you wish your version of this file to be governed by only the CDDL
		28	* or only the GPL Version 2, indicate your decision by adding
		29	* "[Contributor] elects to include this software in this distribution
		30	* under the [CDDL or GPL Version 2] license." If you do not indicate a
		31	* single choice of license, a recipient has the option to distribute
		32	* your version of this file under either the CDDL, the GPL Version 2 or
		33	* to extend the choice of license to its licensees as provided above.
		34	* However, if you add GPL Version 2 code and therefore, elected the GPL
		35	* Version 2 license, then the option applies only if the new code is
		36	* made subject to such option by the copyright holder.
		37	*
		38	* Contributor(s):
		39	*
		40	* Portions Copyrighted 2013 Sun Microsystems, Inc.
		41	*/
		42	package org.openide.util;
		43
		44	/**
		45	* A type safe pair of two object.
		46	* @author Tomas Zezula
		47	* @since 8.32
		48	*/
		49	public final class Pair<First,Second> {
		50
		51	private final First first;
		52	private final Second second;
		53
		54
		55	private Pair(final First first, final Second second) {
		56	this.first = first;
		57	this.second = second;
		58	}
		59
		60	/**
		61	* Returns the first element of the {@link Pair}.
		62	* @return the first element.
		63	*/
		64	public First first() {
65	return first;
66	}
67
68	/**
69	* Returns the second element of the {@link Pair}.
70	* @return the second element.
71	*/
72	public Second second() {
73	return second;
74	}
75
76	@Override
77	public String toString () {
78	return String.format("Pair[%s,%s]", first,second); //NOI18N
79	}
80
81	@Override
82	public boolean equals(final Object other) {
83	if (other == this) {
84	return true;
85	}
86	if (!(other instanceof Pair)) {
87	return false;
88	}
89	final Pair<?,?> otherPair = (Pair<?,?>) other;
90	return (first == null ? otherPair.first == null : first.equals(otherPair.first)) &&
91	(second == null ? otherPair.second == null : second.equals(otherPair.second));
92	}
93
94	@Override
95	public int hashCode() {
96	int res = 17;
97	res = res * 31 + (first == null ? 0 : first.hashCode());
98	res = res * 31 + (second == null ? 0 : second.hashCode());
99	return res;
100	}
101
102
103	/**
104	* Creates a new Pair.
105	* @param <First> the type of the first element
106	* @param <Second> the type of the second element
107	* @param first the first element
108	* @param second the second element
109	* @return the new {@link Pair} of the first and second elements.
110	*/
111	public static <First,Second> Pair<First,Second> of (final First first, final Second second) {
112	return new Pair<First, Second>(first, second);
113	}
114	}

Line 0 Link Here

(-)a/openide.util/test/unit/src/org/openide/util/PairTest.java (+79 lines)
		1	/*
		2	* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
		3	*
		4	* Copyright 2013 Oracle and/or its affiliates. All rights reserved.
		5	*
		6	* Oracle and Java are registered trademarks of Oracle and/or its affiliates.
		7	* Other names may be trademarks of their respective owners.
		8	*
		9	* The contents of this file are subject to the terms of either the GNU
		10	* General Public License Version 2 only ("GPL") or the Common
		11	* Development and Distribution License("CDDL") (collectively, the
		12	* "License"). You may not use this file except in compliance with the
		13	* License. You can obtain a copy of the License at
		14	* http://www.netbeans.org/cddl-gplv2.html
		15	* or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
		16	* specific language governing permissions and limitations under the
		17	* License. When distributing the software, include this License Header
		18	* Notice in each file and include the License file at
		19	* nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
		20	* particular file as subject to the "Classpath" exception as provided
		21	* by Oracle in the GPL Version 2 section of the License file that
		22	* accompanied this code. If applicable, add the following below the
		23	* License Header, with the fields enclosed by brackets [] replaced by
		24	* your own identifying information:
		25	* "Portions Copyrighted [year] [name of copyright owner]"
		26	*
		27	* If you wish your version of this file to be governed by only the CDDL
		28	* or only the GPL Version 2, indicate your decision by adding
		29	* "[Contributor] elects to include this software in this distribution
		30	* under the [CDDL or GPL Version 2] license." If you do not indicate a
		31	* single choice of license, a recipient has the option to distribute
		32	* your version of this file under either the CDDL, the GPL Version 2 or
		33	* to extend the choice of license to its licensees as provided above.
		34	* However, if you add GPL Version 2 code and therefore, elected the GPL
		35	* Version 2 license, then the option applies only if the new code is
		36	* made subject to such option by the copyright holder.
		37	*
		38	* Contributor(s):
		39	*
		40	* Portions Copyrighted 2013 Sun Microsystems, Inc.
		41	*/
		42	package org.openide.util;
		43
		44	import org.netbeans.junit.NbTestCase;
		45
		46	/**
		47	*
		48	* @author Tomas Zezula
		49	*/
		50	public class PairTest extends NbTestCase {
		51
		52	public PairTest(String name) {
		53	super(name);
		54	}
		55
		56
		57	public void testPairs() {
		58	final Pair<Integer,Integer> p1a = Pair.of(1, 1);
		59	final Pair<Integer,Integer> p1b = Pair.of(1, 1);
		60	final Pair<Integer,Integer> p2 = Pair.of(1, 2);
		61	final Pair<Integer,Integer> p3 = Pair.of(2, 1);
		62	final Pair<Integer,Integer> p4 = Pair.of(null, 1);
		63	final Pair<Integer,Integer> p5 = Pair.of(1, null);
		64	final Pair<Integer,Integer> p6 = Pair.of(null, null);
65	assertTrue(p1a.equals(p1a));
66	assertTrue(p1a.equals(p1b));
67	assertFalse(p1a.equals(p2));
68	assertFalse(p1a.equals(p3));
69	assertFalse(p1a.equals(p4));
70	assertFalse(p1a.equals(p5));
71	assertFalse(p1a.equals(p6));
72	assertEquals(p1a.hashCode(), p1b.hashCode());
73	assertEquals(p4.hashCode(), p4.hashCode());
74	assertEquals(p5.hashCode(), p5.hashCode());
75	assertEquals(p6.hashCode(), p6.hashCode());
76	assertFalse(p4.hashCode() == p5.hashCode());
77	}
78
79	}

Lines 50-61 Link Here

(-)a/parsing.api/src/org/netbeans/modules/parsing/impl/Utilities.java (-1 / +1 lines)
50	import org.netbeans.modules.masterfs.providers.ProvidedExtensions;	50	import org.netbeans.modules.masterfs.providers.ProvidedExtensions;
51	import org.netbeans.modules.parsing.api.Source;	51	import org.netbeans.modules.parsing.api.Source;
52	import org.netbeans.modules.parsing.impl.event.EventSupport;	52	import org.netbeans.modules.parsing.impl.event.EventSupport;
53	import org.netbeans.modules.parsing.impl.indexing.Pair;
54	import org.netbeans.modules.parsing.impl.indexing.RepositoryUpdater;	53	import org.netbeans.modules.parsing.impl.indexing.RepositoryUpdater;
55	import org.netbeans.modules.parsing.spi.Parser;	54	import org.netbeans.modules.parsing.spi.Parser;
56	import org.netbeans.modules.parsing.spi.ParserResultTask;	55	import org.netbeans.modules.parsing.spi.ParserResultTask;
57	import org.netbeans.modules.parsing.spi.Scheduler;	56	import org.netbeans.modules.parsing.spi.Scheduler;
58	import org.netbeans.modules.parsing.spi.SchedulerTask;	57	import org.netbeans.modules.parsing.spi.SchedulerTask;
		58	import org.openide.util.Pair;
59	import org.openide.util.Parameters;	59	import org.openide.util.Parameters;
60		60
61	/**	61	/**

Lines 50-56 Link Here

(-)a/parsing.api/src/org/netbeans/modules/parsing/impl/indexing/lucene/LayeredDocumentIndex.java (-11 / +11 lines)
50	import java.util.Set;	50	import java.util.Set;
51	import org.apache.lucene.analysis.KeywordAnalyzer;	51	import org.apache.lucene.analysis.KeywordAnalyzer;
52	import org.netbeans.api.annotations.common.NonNull;	52	import org.netbeans.api.annotations.common.NonNull;
53	import org.netbeans.modules.parsing.impl.indexing.Pair;
54	import org.netbeans.modules.parsing.lucene.support.DocumentIndex;	53	import org.netbeans.modules.parsing.lucene.support.DocumentIndex;
55	import org.netbeans.modules.parsing.lucene.support.Index.Status;	54	import org.netbeans.modules.parsing.lucene.support.Index.Status;
56	import org.netbeans.modules.parsing.lucene.support.IndexDocument;	55	import org.netbeans.modules.parsing.lucene.support.IndexDocument;
Lines 58-63 Link Here
58	import org.netbeans.modules.parsing.lucene.support.Queries.QueryKind;	57	import org.netbeans.modules.parsing.lucene.support.Queries.QueryKind;
59	import org.openide.util.Exceptions;	58	import org.openide.util.Exceptions;
60	import static org.netbeans.modules.parsing.impl.indexing.TransientUpdateSupport.isTransientUpdate;	59	import static org.netbeans.modules.parsing.impl.indexing.TransientUpdateSupport.isTransientUpdate;
		60	import org.openide.util.Pair;
61	/**	61	/**
62	*	62	*
63	* @author Tomas Zezula	63	* @author Tomas Zezula
Lines 118-125 Link Here
118	public void store(boolean optimize) throws IOException {	118	public void store(boolean optimize) throws IOException {
119	if (isTransientUpdate()) {	119	if (isTransientUpdate()) {
120	final Pair<DocumentIndex,Set<String>> ovl = getOverlayIfExists();	120	final Pair<DocumentIndex,Set<String>> ovl = getOverlayIfExists();
121	if (ovl.first != null) {	121	if (ovl.first() != null) {
122	ovl.first.store(false);	122	ovl.first().store(false);
123	}	123	}
124	} else {	124	} else {
125	base.store(optimize);	125	base.store(optimize);
Lines 167-178 Link Here
167	public Collection<? extends IndexDocument> query(String fieldName, String value, QueryKind kind, String... fieldsToLoad) throws IOException, InterruptedException {	167	public Collection<? extends IndexDocument> query(String fieldName, String value, QueryKind kind, String... fieldsToLoad) throws IOException, InterruptedException {
168	final Collection<? extends IndexDocument> br = base.query(fieldName, value, kind, fieldsToLoad);	168	final Collection<? extends IndexDocument> br = base.query(fieldName, value, kind, fieldsToLoad);
169	final Pair<DocumentIndex,Set<String>> ovl = getOverlayIfExists();	169	final Pair<DocumentIndex,Set<String>> ovl = getOverlayIfExists();
170	if (ovl.first == null) {	170	if (ovl.first() == null) {
171	return ovl.second == null ? br : filter(br,ovl.second);	171	return ovl.second() == null ? br : filter(br,ovl.second());
172	} else {	172	} else {
173	return new ProxyCollection<IndexDocument>(	173	return new ProxyCollection<IndexDocument>(
174	ovl.second == null ? br : filter(br,ovl.second),	174	ovl.second() == null ? br : filter(br,ovl.second()),
175	ovl.first.query(fieldName, value, kind, fieldsToLoad));	175	ovl.first().query(fieldName, value, kind, fieldsToLoad));
176	}	176	}
177	}	177	}
178		178
Lines 180-191 Link Here
180	public Collection<? extends IndexDocument> findByPrimaryKey(String primaryKeyValue, QueryKind kind, String... fieldsToLoad) throws IOException, InterruptedException {	180	public Collection<? extends IndexDocument> findByPrimaryKey(String primaryKeyValue, QueryKind kind, String... fieldsToLoad) throws IOException, InterruptedException {
181	final Collection<? extends IndexDocument> br = base.findByPrimaryKey(primaryKeyValue, kind, fieldsToLoad);	181	final Collection<? extends IndexDocument> br = base.findByPrimaryKey(primaryKeyValue, kind, fieldsToLoad);
182	final Pair<DocumentIndex,Set<String>> ovl = getOverlayIfExists();	182	final Pair<DocumentIndex,Set<String>> ovl = getOverlayIfExists();
183	if (ovl.first == null) {	183	if (ovl.first() == null) {
184	return ovl.second == null ? br : filter(br, ovl.second);	184	return ovl.second() == null ? br : filter(br, ovl.second());
185	} else {	185	} else {
186	return new ProxyCollection<IndexDocument>(	186	return new ProxyCollection<IndexDocument>(
187	ovl.second == null ? br : filter(br,ovl.second),	187	ovl.second() == null ? br : filter(br,ovl.second()),
188	ovl.first.findByPrimaryKey(primaryKeyValue, kind, fieldsToLoad));	188	ovl.first().findByPrimaryKey(primaryKeyValue, kind, fieldsToLoad));
189	}	189	}
190	}	190	}
191		191