mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-04-29 19:45:01 +02:00
Bug 299911: Increment plugin and pdom version.
This commit is contained in:
parent
fad6fcfe01
commit
9dd70eb4bb
11 changed files with 25 additions and 219 deletions
|
@ -1,153 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?><component id="org.eclipse.cdt.core" version="2">
|
||||
<resource path="model/org/eclipse/cdt/core/settings/model/ICDescriptionDelta.java" type="org.eclipse.cdt.core.settings.model.ICDescriptionDelta">
|
||||
<filter comment="Temporary filter to ignore added API restictions for interfaces that should be internal to begin with" id="403853384">
|
||||
<message_arguments>
|
||||
<message_argument value="org.eclipse.cdt.core.settings.model.ICDescriptionDelta"/>
|
||||
</message_arguments>
|
||||
</filter>
|
||||
</resource>
|
||||
<resource path="model/org/eclipse/cdt/core/settings/model/ICSettingEntry.java" type="org.eclipse.cdt.core.settings.model.ICSettingEntry">
|
||||
<filter comment="Temporary filter to ignore added API restictions for interfaces that should be internal to begin with" id="403853384">
|
||||
<message_arguments>
|
||||
<message_argument value="org.eclipse.cdt.core.settings.model.ICSettingEntry"/>
|
||||
</message_arguments>
|
||||
</filter>
|
||||
</resource>
|
||||
<resource path="parser/org/eclipse/cdt/core/dom/ast/IASTCopyLocation.java" type="org.eclipse.cdt.core.dom.ast.IASTCopyLocation">
|
||||
<filter id="403853384">
|
||||
<message_arguments>
|
||||
<message_argument value="org.eclipse.cdt.core.dom.ast.IASTCopyLocation"/>
|
||||
</message_arguments>
|
||||
</filter>
|
||||
<filter id="406052990">
|
||||
<message_arguments>
|
||||
<message_argument value="org.eclipse.cdt.core.dom.ast.IASTCopyLocation"/>
|
||||
<message_argument value="getOriginalNode()"/>
|
||||
</message_arguments>
|
||||
</filter>
|
||||
</resource>
|
||||
<resource path="parser/org/eclipse/cdt/core/parser/util/ArrayUtil.java" type="org.eclipse.cdt.core.parser.util.ArrayUtil">
|
||||
<filter id="420679712">
|
||||
<message_arguments>
|
||||
<message_argument value="org.eclipse.cdt.core.parser.util.ArrayUtil.addAll(Class<?>, Object[], Object[])"/>
|
||||
<message_argument value="T"/>
|
||||
</message_arguments>
|
||||
</filter>
|
||||
<filter id="420679712">
|
||||
<message_arguments>
|
||||
<message_argument value="org.eclipse.cdt.core.parser.util.ArrayUtil.append(Class<?>, Object[], Object)"/>
|
||||
<message_argument value="T"/>
|
||||
</message_arguments>
|
||||
</filter>
|
||||
<filter id="420679712">
|
||||
<message_arguments>
|
||||
<message_argument value="org.eclipse.cdt.core.parser.util.ArrayUtil.prepend(Class<?>, Object[], Object)"/>
|
||||
<message_argument value="T"/>
|
||||
</message_arguments>
|
||||
</filter>
|
||||
<filter id="420679712">
|
||||
<message_arguments>
|
||||
<message_argument value="org.eclipse.cdt.core.parser.util.ArrayUtil.removeNulls(Class<?>, Object[])"/>
|
||||
<message_argument value="T"/>
|
||||
</message_arguments>
|
||||
</filter>
|
||||
<filter id="420679712">
|
||||
<message_arguments>
|
||||
<message_argument value="org.eclipse.cdt.core.parser.util.ArrayUtil.trim(Class<?>, Object[])"/>
|
||||
<message_argument value="T"/>
|
||||
</message_arguments>
|
||||
</filter>
|
||||
<filter id="420679712">
|
||||
<message_arguments>
|
||||
<message_argument value="org.eclipse.cdt.core.parser.util.ArrayUtil.trim(Class<?>, Object[], boolean)"/>
|
||||
<message_argument value="T"/>
|
||||
</message_arguments>
|
||||
</filter>
|
||||
</resource>
|
||||
<resource path="src/org/eclipse/cdt/core/resources/RefreshScopeManager.java" type="org.eclipse.cdt.core.resources.RefreshScopeManager">
|
||||
<filter id="338792546">
|
||||
<message_arguments>
|
||||
<message_argument value="org.eclipse.cdt.core.resources.RefreshScopeManager"/>
|
||||
<message_argument value="addExclusion(IResource, RefreshExclusion)"/>
|
||||
</message_arguments>
|
||||
</filter>
|
||||
<filter id="338792546">
|
||||
<message_arguments>
|
||||
<message_argument value="org.eclipse.cdt.core.resources.RefreshScopeManager"/>
|
||||
<message_argument value="addResourceToRefresh(IProject, IResource)"/>
|
||||
</message_arguments>
|
||||
</filter>
|
||||
<filter id="338792546">
|
||||
<message_arguments>
|
||||
<message_argument value="org.eclipse.cdt.core.resources.RefreshScopeManager"/>
|
||||
<message_argument value="clearAllExclusions()"/>
|
||||
</message_arguments>
|
||||
</filter>
|
||||
<filter id="338792546">
|
||||
<message_arguments>
|
||||
<message_argument value="org.eclipse.cdt.core.resources.RefreshScopeManager"/>
|
||||
<message_argument value="clearAllResourcesToRefresh()"/>
|
||||
</message_arguments>
|
||||
</filter>
|
||||
<filter id="338792546">
|
||||
<message_arguments>
|
||||
<message_argument value="org.eclipse.cdt.core.resources.RefreshScopeManager"/>
|
||||
<message_argument value="clearExclusions(IResource)"/>
|
||||
</message_arguments>
|
||||
</filter>
|
||||
<filter id="338792546">
|
||||
<message_arguments>
|
||||
<message_argument value="org.eclipse.cdt.core.resources.RefreshScopeManager"/>
|
||||
<message_argument value="clearExclusionsForProject(IProject)"/>
|
||||
</message_arguments>
|
||||
</filter>
|
||||
<filter id="338792546">
|
||||
<message_arguments>
|
||||
<message_argument value="org.eclipse.cdt.core.resources.RefreshScopeManager"/>
|
||||
<message_argument value="deleteResourceToRefresh(IProject, IResource)"/>
|
||||
</message_arguments>
|
||||
</filter>
|
||||
<filter id="338792546">
|
||||
<message_arguments>
|
||||
<message_argument value="org.eclipse.cdt.core.resources.RefreshScopeManager"/>
|
||||
<message_argument value="getExclusions(IResource)"/>
|
||||
</message_arguments>
|
||||
</filter>
|
||||
<filter id="338792546">
|
||||
<message_arguments>
|
||||
<message_argument value="org.eclipse.cdt.core.resources.RefreshScopeManager"/>
|
||||
<message_argument value="getRefreshSchedulingRule(IProject)"/>
|
||||
</message_arguments>
|
||||
</filter>
|
||||
<filter id="338792546">
|
||||
<message_arguments>
|
||||
<message_argument value="org.eclipse.cdt.core.resources.RefreshScopeManager"/>
|
||||
<message_argument value="getResourcesToRefresh(IProject)"/>
|
||||
</message_arguments>
|
||||
</filter>
|
||||
<filter id="338792546">
|
||||
<message_arguments>
|
||||
<message_argument value="org.eclipse.cdt.core.resources.RefreshScopeManager"/>
|
||||
<message_argument value="removeExclusion(IResource, RefreshExclusion)"/>
|
||||
</message_arguments>
|
||||
</filter>
|
||||
<filter id="338792546">
|
||||
<message_arguments>
|
||||
<message_argument value="org.eclipse.cdt.core.resources.RefreshScopeManager"/>
|
||||
<message_argument value="setExclusions(IResource, List<RefreshExclusion>)"/>
|
||||
</message_arguments>
|
||||
</filter>
|
||||
<filter id="338792546">
|
||||
<message_arguments>
|
||||
<message_argument value="org.eclipse.cdt.core.resources.RefreshScopeManager"/>
|
||||
<message_argument value="setResourcesToRefresh(IProject, List<IResource>)"/>
|
||||
</message_arguments>
|
||||
</filter>
|
||||
<filter comment="routines no longer needed for RefreshScopeManager" id="338792546">
|
||||
<message_arguments>
|
||||
<message_argument value="org.eclipse.cdt.core.resources.RefreshScopeManager"/>
|
||||
<message_argument value="shouldResourceBeRefreshed(IResource)"/>
|
||||
</message_arguments>
|
||||
</filter>
|
||||
</resource>
|
||||
</component>
|
|
@ -101,7 +101,7 @@ public interface IScope {
|
|||
|
||||
|
||||
/**
|
||||
* @since 5.4
|
||||
* @since 5.5
|
||||
* @noextend This class is not intended to be subclassed by clients.
|
||||
*/
|
||||
public static class ScopeLookupData {
|
||||
|
@ -186,7 +186,7 @@ public interface IScope {
|
|||
* have not yet been resolved.
|
||||
*
|
||||
* @return : the bindings in this scope that match the name or prefix, or null
|
||||
* @since 5.4
|
||||
* @since 5.5
|
||||
*/
|
||||
public IBinding[] getBindings(ScopeLookupData lookup);
|
||||
|
||||
|
|
|
@ -31,13 +31,13 @@ public interface ICPPASTArraySubscriptExpression extends IASTArraySubscriptExpre
|
|||
public ICPPASTArraySubscriptExpression copy(CopyStyle style);
|
||||
|
||||
/**
|
||||
* @since 5.4
|
||||
* @since 5.5
|
||||
*/
|
||||
@Override
|
||||
public ICPPASTExpression getArrayExpression();
|
||||
|
||||
/**
|
||||
* @since 5.4
|
||||
* @since 5.5
|
||||
*/
|
||||
@Override
|
||||
public ICPPASTInitializerClause getArgument();
|
||||
|
|
|
@ -17,7 +17,7 @@ import org.eclipse.cdt.core.dom.ast.IASTExpression;
|
|||
* Interface for c++ expressions.
|
||||
* @noextend This interface is not intended to be extended by clients.
|
||||
* @noimplement This interface is not intended to be implemented by clients.
|
||||
* @since 5.4
|
||||
* @since 5.5
|
||||
*/
|
||||
public interface ICPPASTExpression extends IASTExpression, ICPPASTInitializerClause {
|
||||
|
||||
|
|
|
@ -54,7 +54,7 @@ public interface ICPPASTFieldReference extends IASTFieldReference, ICPPASTExpres
|
|||
public IType getFieldOwnerType();
|
||||
|
||||
/**
|
||||
* @since 5.4
|
||||
* @since 5.5
|
||||
*/
|
||||
@Override
|
||||
public ICPPASTExpression getFieldOwner();
|
||||
|
|
|
@ -18,7 +18,7 @@ import org.eclipse.cdt.internal.core.dom.parser.cpp.ICPPEvaluation;
|
|||
* C++ specific initializer clause
|
||||
* @noextend This interface is not intended to be extended by clients.
|
||||
* @noimplement This interface is not intended to be implemented by clients.
|
||||
* @since 5.4
|
||||
* @since 5.5
|
||||
*/
|
||||
public interface ICPPASTInitializerClause extends IASTInitializerClause {
|
||||
|
||||
|
|
|
@ -34,7 +34,7 @@ public interface ICPPClassSpecialization extends ICPPSpecialization, ICPPClassTy
|
|||
/**
|
||||
* Creates a specialized binding for a member of the original class. The result is
|
||||
* a member of this class specialization.
|
||||
* @since 5.4
|
||||
* @since 5.5
|
||||
*/
|
||||
IBinding specializeMember(IBinding binding, IASTNode point);
|
||||
}
|
||||
|
|
|
@ -216,11 +216,14 @@ public class PDOM extends PlatformObject implements IPDOM {
|
|||
* 122.0 - Compacting strings
|
||||
* 123.0 - Combined file size and encoding hash code.
|
||||
* 124.0 - GCC attributes and NO_RETURN flag for functions.
|
||||
* 125.0 - Indexes for unresolved includes and files indexed with I/O errors.
|
||||
* #125.0# - Indexes for unresolved includes and files indexed with I/O errors. <<CDT 8.1>>
|
||||
*
|
||||
* CDT 8.2 development
|
||||
* 130.0 - Dependent expressions, bug 299911
|
||||
*/
|
||||
private static final int MIN_SUPPORTED_VERSION= version(125, 0);
|
||||
private static final int MAX_SUPPORTED_VERSION= version(125, Short.MAX_VALUE);
|
||||
private static final int DEFAULT_VERSION = version(125, 0);
|
||||
private static final int MIN_SUPPORTED_VERSION= version(130, 0);
|
||||
private static final int MAX_SUPPORTED_VERSION= version(130, Short.MAX_VALUE);
|
||||
private static final int DEFAULT_VERSION = version(130, 0);
|
||||
|
||||
private static int version(int major, int minor) {
|
||||
return (major << 16) + minor;
|
||||
|
@ -320,11 +323,11 @@ public class PDOM extends PlatformObject implements IPDOM {
|
|||
private BTree fileIndex;
|
||||
private BTree indexOfDefectiveFiles;
|
||||
private BTree indexOfFiledWithUnresolvedIncludes;
|
||||
private Map<Integer, PDOMLinkage> fLinkageIDCache = new HashMap<Integer, PDOMLinkage>();
|
||||
private final Map<Integer, PDOMLinkage> fLinkageIDCache = new HashMap<Integer, PDOMLinkage>();
|
||||
private File fPath;
|
||||
private IIndexLocationConverter locationConverter;
|
||||
private Map<String, IPDOMLinkageFactory> fPDOMLinkageFactoryCache;
|
||||
private HashMap<Object, Object> fResultCache= new HashMap<Object, Object>();
|
||||
private final IIndexLocationConverter locationConverter;
|
||||
private final Map<String, IPDOMLinkageFactory> fPDOMLinkageFactoryCache;
|
||||
private final HashMap<Object, Object> fResultCache= new HashMap<Object, Object>();
|
||||
private List<IListener> listeners;
|
||||
protected ChangeEvent fEvent= new ChangeEvent();
|
||||
|
||||
|
@ -606,10 +609,10 @@ public class PDOM extends PlatformObject implements IPDOM {
|
|||
|
||||
private final ArrayList<PDOMNamedNode> currentPath= new ArrayList<PDOMNamedNode>();
|
||||
private final ArrayList<BitSet> matchStack= new ArrayList<BitSet>();
|
||||
private List<PDOMNamedNode> bindings = new ArrayList<PDOMNamedNode>();
|
||||
private boolean isFullyQualified;
|
||||
private final List<PDOMNamedNode> bindings = new ArrayList<PDOMNamedNode>();
|
||||
private final boolean isFullyQualified;
|
||||
private BitSet matchesUpToLevel;
|
||||
private IndexFilter filter;
|
||||
private final IndexFilter filter;
|
||||
|
||||
public BindingFinder(Pattern[] pattern, boolean isFullyQualified, IndexFilter filter, IProgressMonitor monitor) {
|
||||
this.pattern = pattern;
|
||||
|
@ -893,7 +896,7 @@ public class PDOM extends PlatformObject implements IPDOM {
|
|||
|
||||
// Read-write lock rules. Readers don't conflict with other readers,
|
||||
// Writers conflict with readers, and everyone conflicts with writers.
|
||||
private Object mutex = new Object();
|
||||
private final Object mutex = new Object();
|
||||
private int lockCount;
|
||||
private int waitingReaders;
|
||||
private long lastWriteAccess= 0;
|
||||
|
|
|
@ -1,44 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<component id="org.eclipse.cdt.ui" version="2">
|
||||
<resource path="src/org/eclipse/cdt/ui/Messages.java" type="org.eclipse.cdt.ui.Messages">
|
||||
<filter id="305365105">
|
||||
<message_arguments>
|
||||
<message_argument value="org.eclipse.cdt.ui.Messages"/>
|
||||
<message_argument value="org.eclipse.cdt.ui_5.4.0"/>
|
||||
</message_arguments>
|
||||
</filter>
|
||||
</resource>
|
||||
<resource path="src/org/eclipse/cdt/ui/wizards/NewClassCreationWizardPage.java" type="org.eclipse.cdt.ui.wizards.NewClassCreationWizardPage">
|
||||
<filter id="338755678">
|
||||
<message_arguments>
|
||||
<message_argument value="org.eclipse.cdt.ui.wizards.NewClassCreationWizardPage"/>
|
||||
<message_argument value="DEFAULT_METHOD_STUBS"/>
|
||||
</message_arguments>
|
||||
</filter>
|
||||
<filter id="338755678">
|
||||
<message_arguments>
|
||||
<message_argument value="org.eclipse.cdt.ui.wizards.NewClassCreationWizardPage"/>
|
||||
<message_argument value="fUseDefaultSelection"/>
|
||||
</message_arguments>
|
||||
</filter>
|
||||
<filter id="338792546">
|
||||
<message_arguments>
|
||||
<message_argument value="org.eclipse.cdt.ui.wizards.NewClassCreationWizardPage"/>
|
||||
<message_argument value="isUseDefaultSelected()"/>
|
||||
</message_arguments>
|
||||
</filter>
|
||||
<filter id="338792546">
|
||||
<message_arguments>
|
||||
<message_argument value="org.eclipse.cdt.ui.wizards.NewClassCreationWizardPage"/>
|
||||
<message_argument value="setUseDefaultSelection(boolean, boolean)"/>
|
||||
</message_arguments>
|
||||
</filter>
|
||||
<filter id="388194388">
|
||||
<message_arguments>
|
||||
<message_argument value="org.eclipse.cdt.ui.wizards.NewClassCreationWizardPage"/>
|
||||
<message_argument value="ALL_FIELDS"/>
|
||||
<message_argument value="127"/>
|
||||
</message_arguments>
|
||||
</filter>
|
||||
</resource>
|
||||
</component>
|
|
@ -2,7 +2,7 @@ Manifest-Version: 1.0
|
|||
Bundle-ManifestVersion: 2
|
||||
Bundle-Name: %pluginName
|
||||
Bundle-SymbolicName: org.eclipse.cdt.ui; singleton:=true
|
||||
Bundle-Version: 5.4.0.qualifier
|
||||
Bundle-Version: 5.5.0.qualifier
|
||||
Bundle-Activator: org.eclipse.cdt.ui.CUIPlugin
|
||||
Bundle-Vendor: %providerName
|
||||
Bundle-Localization: plugin
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
<version>5.4.0-SNAPSHOT</version>
|
||||
<version>5.5.0-SNAPSHOT</version>
|
||||
<artifactId>org.eclipse.cdt.ui</artifactId>
|
||||
<packaging>eclipse-plugin</packaging>
|
||||
</project>
|
||||
|
|
Loading…
Add table
Reference in a new issue