From 374be72cf526262b5b05f2fbf9cba3a1bb3000c8 Mon Sep 17 00:00:00 2001 From: Anton Leherbauer Date: Fri, 29 Jul 2011 09:42:50 +0200 Subject: [PATCH] Fix compile error in RegisterManager and bundle versions --- core/org.eclipse.cdt.core/META-INF/MANIFEST.MF | 2 +- core/org.eclipse.cdt.core/pom.xml | 2 +- core/org.eclipse.cdt.ui.tests/META-INF/MANIFEST.MF | 3 +-- core/org.eclipse.cdt.ui.tests/pom.xml | 2 +- core/org.eclipse.cdt.ui/META-INF/MANIFEST.MF | 2 +- core/org.eclipse.cdt.ui/pom.xml | 2 +- .../org/eclipse/cdt/debug/mi/core/cdi/RegisterManager.java | 7 +++++-- debug/org.eclipse.cdt.debug.mi.core/pom.xml | 2 +- debug/org.eclipse.cdt.debug.ui/META-INF/MANIFEST.MF | 2 +- debug/org.eclipse.cdt.debug.ui/pom.xml | 2 +- 10 files changed, 14 insertions(+), 12 deletions(-) diff --git a/core/org.eclipse.cdt.core/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.core/META-INF/MANIFEST.MF index 238adb9b4f9..ac3cf8759fb 100644 --- a/core/org.eclipse.cdt.core/META-INF/MANIFEST.MF +++ b/core/org.eclipse.cdt.core/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.cdt.core; singleton:=true -Bundle-Version: 5.3.0.qualifier +Bundle-Version: 5.3.1.qualifier Bundle-Activator: org.eclipse.cdt.core.CCorePlugin Bundle-Vendor: %providerName Bundle-Localization: plugin diff --git a/core/org.eclipse.cdt.core/pom.xml b/core/org.eclipse.cdt.core/pom.xml index 4e06491c8b8..33f7bb2f403 100644 --- a/core/org.eclipse.cdt.core/pom.xml +++ b/core/org.eclipse.cdt.core/pom.xml @@ -11,7 +11,7 @@ ../../pom.xml - 5.3.0-SNAPSHOT + 5.3.1-SNAPSHOT org.eclipse.cdt.core eclipse-plugin diff --git a/core/org.eclipse.cdt.ui.tests/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.ui.tests/META-INF/MANIFEST.MF index 2f0e0fc8e5a..476ee2a978f 100644 --- a/core/org.eclipse.cdt.ui.tests/META-INF/MANIFEST.MF +++ b/core/org.eclipse.cdt.ui.tests/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.cdt.ui.tests Bundle-SymbolicName: org.eclipse.cdt.ui.tests; singleton:=true -Bundle-Version: 5.3.0.qualifier +Bundle-Version: 5.3.1.qualifier Bundle-Activator: org.eclipse.cdt.ui.testplugin.CTestPlugin Export-Package: org.eclipse.cdt.ui.testplugin, org.eclipse.cdt.ui.testplugin.util, @@ -32,7 +32,6 @@ Require-Bundle: org.eclipse.jface.text, org.eclipse.compare, org.eclipse.ui.console, org.eclipse.core.expressions, - org.eclipse.cdt.make.core, com.ibm.icu, org.eclipse.ltk.core.refactoring;bundle-version="3.4.0", org.eclipse.core.filesystem;bundle-version="1.2.0" diff --git a/core/org.eclipse.cdt.ui.tests/pom.xml b/core/org.eclipse.cdt.ui.tests/pom.xml index 4c37196df56..73fb949b090 100644 --- a/core/org.eclipse.cdt.ui.tests/pom.xml +++ b/core/org.eclipse.cdt.ui.tests/pom.xml @@ -11,7 +11,7 @@ ../../pom.xml - 5.3.0-SNAPSHOT + 5.3.1-SNAPSHOT org.eclipse.cdt.ui.tests eclipse-test-plugin diff --git a/core/org.eclipse.cdt.ui/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.ui/META-INF/MANIFEST.MF index 643438de4c3..fd69f84f243 100644 --- a/core/org.eclipse.cdt.ui/META-INF/MANIFEST.MF +++ b/core/org.eclipse.cdt.ui/META-INF/MANIFEST.MF @@ -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.3.0.qualifier +Bundle-Version: 5.3.1.qualifier Bundle-Activator: org.eclipse.cdt.ui.CUIPlugin Bundle-Vendor: %providerName Bundle-Localization: plugin diff --git a/core/org.eclipse.cdt.ui/pom.xml b/core/org.eclipse.cdt.ui/pom.xml index 0f84ce7b152..04a7dffad45 100644 --- a/core/org.eclipse.cdt.ui/pom.xml +++ b/core/org.eclipse.cdt.ui/pom.xml @@ -11,7 +11,7 @@ ../../pom.xml - 5.3.0-SNAPSHOT + 5.3.1-SNAPSHOT org.eclipse.cdt.ui eclipse-plugin diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/RegisterManager.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/RegisterManager.java index 17591318453..e825d864166 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/RegisterManager.java +++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/RegisterManager.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2010 QNX Software Systems and others. + * Copyright (c) 2000, 2011 QNX Software Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -69,7 +69,8 @@ public class RegisterManager extends Manager { /* (non-Javadoc) * @see java.util.LinkedHashMap#removeEldestEntry(java.util.Map.Entry) */ - protected boolean removeEldestEntry(Entry eldest) { + @Override + protected boolean removeEldestEntry(Map.Entry eldest) { boolean toRemove = size() > MAX_ENTRIES; if (toRemove) { ShadowRegister v = (ShadowRegister)eldest.getValue(); @@ -110,6 +111,7 @@ public class RegisterManager extends Manager { /* (non-Javadoc) * @see org.eclipse.cdt.debug.mi.core.cdi.model.Variable#getMIVar() */ + @Override public MIVar getMIVar() throws CDIException { if (fMIVar == null) { fMIVar = createMiVar((StackFrame)getStackFrame(), getName()); @@ -371,6 +373,7 @@ public class RegisterManager extends Manager { return null; } + @Override public void update(Target target) throws CDIException { MISession mi = target.getMISession(); CommandFactory factory = mi.getCommandFactory(); diff --git a/debug/org.eclipse.cdt.debug.mi.core/pom.xml b/debug/org.eclipse.cdt.debug.mi.core/pom.xml index ba9e57cbaae..413f395f13b 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/pom.xml +++ b/debug/org.eclipse.cdt.debug.mi.core/pom.xml @@ -11,7 +11,7 @@ ../../pom.xml - 7.1.0-SNAPSHOT + 7.1.1-SNAPSHOT org.eclipse.cdt.debug.mi.core eclipse-plugin diff --git a/debug/org.eclipse.cdt.debug.ui/META-INF/MANIFEST.MF b/debug/org.eclipse.cdt.debug.ui/META-INF/MANIFEST.MF index 99a17dc184d..98be198ad14 100644 --- a/debug/org.eclipse.cdt.debug.ui/META-INF/MANIFEST.MF +++ b/debug/org.eclipse.cdt.debug.ui/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.cdt.debug.ui; singleton:=true -Bundle-Version: 7.1.0.qualifier +Bundle-Version: 7.1.1.qualifier Bundle-Activator: org.eclipse.cdt.debug.ui.CDebugUIPlugin Bundle-Vendor: %providerName Bundle-Localization: plugin diff --git a/debug/org.eclipse.cdt.debug.ui/pom.xml b/debug/org.eclipse.cdt.debug.ui/pom.xml index 829b9e4aafc..57f1f256caf 100644 --- a/debug/org.eclipse.cdt.debug.ui/pom.xml +++ b/debug/org.eclipse.cdt.debug.ui/pom.xml @@ -11,7 +11,7 @@ ../../pom.xml - 7.1.0-SNAPSHOT + 7.1.1-SNAPSHOT org.eclipse.cdt.debug.ui eclipse-plugin