[
Date Prev][
Date Next][
Thread Prev][
Thread Next][
Date Index][
Thread Index]
[
List Home]
|
[cdt-patch] Removal of warnings
|
Here is a set of patches that reduce
the number of warnings that I get when I build CDT against Eclipse M8.
(It reduces the warnings from 113 to 50, 45
of these errors are deprecated things)
When I run with the latest integration
build there are 300 additional warnings about deprecated things -- hopefully
the eclipse base guys do not remove any of these.
-
Dave
Index: plugin.xml
===================================================================
RCS file: /home/tools/org.eclipse.cdt-core/org.eclipse.cdt.ui/plugin.xml,v
retrieving revision 1.88
diff -u -r1.88 plugin.xml
--- plugin.xml 11 May 2004 05:52:51 -0000 1.88
+++ plugin.xml 12 May 2004 18:05:40 -0000
@@ -352,14 +352,16 @@
point="org.eclipse.compare.structureCreators">
<structureCreator
extensions="c,cc,cpp,cxx,h,hpp"
- class="org.eclipse.cdt.internal.ui.compare.CStructureCreator">
+ class="org.eclipse.cdt.internal.ui.compare.CStructureCreator"
+ id="org.eclipse.cdt.internal.ui.compare.CStructureCreator">
</structureCreator>
</extension>
<extension
point="org.eclipse.compare.contentMergeViewers">
<viewer
extensions="c,cc,cpp,cxx,h,c2,hpp"
- class="org.eclipse.cdt.internal.ui.compare.CContentViewerCreator">
+ class="org.eclipse.cdt.internal.ui.compare.CContentViewerCreator"
+ id="org.eclipse.cdt.internal.ui.compare.CContentViewerCreator">
</viewer>
</extension>
<extension
@@ -642,8 +644,8 @@
<extension
point="org.eclipse.search.searchResultViewPages">
<viewPage
- targetClass="org.eclipse.cdt.internal.ui.search.CSearchResult"
class="org.eclipse.cdt.internal.ui.search.CSearchResultPage"
+ targetClass="org.eclipse.cdt.internal.ui.search.CSearchResult"
id="org.eclipse.cdt.ui.CSearchResultPage">
</viewPage>
</extension>
Index: refactor/org/eclipse/cdt/internal/corext/refactoring/UndoManager.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt-core/org.eclipse.cdt.ui/refactor/org/eclipse/cdt/internal/corext/refactoring/UndoManager.java,v
retrieving revision 1.2
diff -u -r1.2 UndoManager.java
--- refactor/org/eclipse/cdt/internal/corext/refactoring/UndoManager.java 15 Mar 2004 21:17:47 -0000 1.2
+++ refactor/org/eclipse/cdt/internal/corext/refactoring/UndoManager.java 12 May 2004 18:05:40 -0000
@@ -103,7 +103,7 @@
IResource resource= delta.getResource();
if (resource.getType() == IResource.FILE && delta.getKind() == IResourceDelta.CHANGED &&
(delta.getFlags() & IResourceDelta.CONTENT) != 0) {
- if(CoreModel.getDefault().isValidTranslationUnitName(resource.getName())) {
+ if(CoreModel.isValidTranslationUnitName(resource.getName())) {
ITranslationUnit unit= (ITranslationUnit)CoreModel.getDefault().create((IFile)resource);
if (unit != null && unit.exists()) {
flush();
Index: refactor/org/eclipse/cdt/internal/ui/refactoring/RefactoringSaveHelper.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt-core/org.eclipse.cdt.ui/refactor/org/eclipse/cdt/internal/ui/refactoring/RefactoringSaveHelper.java,v
retrieving revision 1.2
diff -u -r1.2 RefactoringSaveHelper.java
--- refactor/org/eclipse/cdt/internal/ui/refactoring/RefactoringSaveHelper.java 15 Apr 2004 19:53:04 -0000 1.2
+++ refactor/org/eclipse/cdt/internal/ui/refactoring/RefactoringSaveHelper.java 12 May 2004 18:05:40 -0000
@@ -61,7 +61,7 @@
description.setAutoBuilding(false);
workspace.setDescription(description);
try {
- CUIPlugin.getDefault().getActiveWorkbenchWindow().getWorkbench().saveAllEditors(false);
+ CUIPlugin.getActiveWorkbenchWindow().getWorkbench().saveAllEditors(false);
fFilesSaved= true;
} finally {
description.setAutoBuilding(autoBuild);
@@ -77,7 +77,7 @@
public void triggerBuild() {
if (fFilesSaved && ResourcesPlugin.getWorkspace().getDescription().isAutoBuilding()) {
- new GlobalBuildAction(CUIPlugin.getDefault().getActiveWorkbenchWindow(), IncrementalProjectBuilder.INCREMENTAL_BUILD).run();
+ new GlobalBuildAction(CUIPlugin.getActiveWorkbenchWindow(), IncrementalProjectBuilder.INCREMENTAL_BUILD).run();
}
}
Index: refactor/org/eclipse/cdt/internal/ui/refactoring/RefactoringWizardDialog2.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt-core/org.eclipse.cdt.ui/refactor/org/eclipse/cdt/internal/ui/refactoring/RefactoringWizardDialog2.java,v
retrieving revision 1.2
diff -u -r1.2 RefactoringWizardDialog2.java
--- refactor/org/eclipse/cdt/internal/ui/refactoring/RefactoringWizardDialog2.java 4 May 2004 15:58:18 -0000 1.2
+++ refactor/org/eclipse/cdt/internal/ui/refactoring/RefactoringWizardDialog2.java 12 May 2004 18:05:40 -0000
@@ -25,7 +25,6 @@
import org.eclipse.jface.dialogs.IMessageProvider;
import org.eclipse.jface.operation.IRunnableWithProgress;
import org.eclipse.jface.operation.ModalContext;
-import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.util.Assert;
import org.eclipse.jface.wizard.IWizardContainer;
import org.eclipse.jface.wizard.IWizardPage;
Index: src/org/eclipse/cdt/internal/ui/cview/CViewLabelProvider.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt-core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewLabelProvider.java,v
retrieving revision 1.4
diff -u -r1.4 CViewLabelProvider.java
--- src/org/eclipse/cdt/internal/ui/cview/CViewLabelProvider.java 6 May 2004 15:51:28 -0000 1.4
+++ src/org/eclipse/cdt/internal/ui/cview/CViewLabelProvider.java 12 May 2004 18:05:41 -0000
@@ -14,7 +14,6 @@
import org.eclipse.cdt.internal.ui.IAdornmentProvider;
import org.eclipse.cdt.internal.ui.StandardCElementLabelProvider;
import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
/*
* CViewLabelProvider
Index: src/org/eclipse/cdt/internal/ui/cview/MainActionGroup.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt-core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/MainActionGroup.java,v
retrieving revision 1.13
diff -u -r1.13 MainActionGroup.java
--- src/org/eclipse/cdt/internal/ui/cview/MainActionGroup.java 5 May 2004 16:21:22 -0000 1.13
+++ src/org/eclipse/cdt/internal/ui/cview/MainActionGroup.java 12 May 2004 18:05:41 -0000
@@ -13,10 +13,7 @@
import org.eclipse.cdt.core.model.ICProject;
import org.eclipse.cdt.core.model.ITranslationUnit;
import org.eclipse.cdt.internal.ui.IContextMenuConstants;
-import org.eclipse.cdt.internal.ui.editor.FileSearchAction;
-import org.eclipse.cdt.internal.ui.editor.FileSearchActionInWorkingSet;
import org.eclipse.cdt.internal.ui.editor.OpenIncludeAction;
-import org.eclipse.cdt.internal.ui.editor.SearchDialogAction;
import org.eclipse.cdt.internal.ui.search.actions.SelectionSearchGroup;
import org.eclipse.cdt.ui.actions.CustomFiltersActionGroup;
import org.eclipse.cdt.ui.actions.RefactoringActionGroup;
Index: src/org/eclipse/cdt/internal/ui/editor/CEditor.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt-core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditor.java,v
retrieving revision 1.57
diff -u -r1.57 CEditor.java
--- src/org/eclipse/cdt/internal/ui/editor/CEditor.java 5 May 2004 16:21:22 -0000 1.57
+++ src/org/eclipse/cdt/internal/ui/editor/CEditor.java 12 May 2004 18:05:41 -0000
@@ -36,7 +36,6 @@
import org.eclipse.jface.action.IAction;
import org.eclipse.jface.action.IMenuManager;
import org.eclipse.jface.action.IStatusLineManager;
-import org.eclipse.jface.action.MenuManager;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.text.BadLocationException;
import org.eclipse.jface.text.DocumentCommand;
Index: src/org/eclipse/cdt/internal/ui/search/CSearchResultCollector.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt-core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchResultCollector.java,v
retrieving revision 1.18
diff -u -r1.18 CSearchResultCollector.java
--- src/org/eclipse/cdt/internal/ui/search/CSearchResultCollector.java 20 Apr 2004 03:52:53 -0000 1.18
+++ src/org/eclipse/cdt/internal/ui/search/CSearchResultCollector.java 12 May 2004 18:05:42 -0000
@@ -13,7 +13,6 @@
*/
package org.eclipse.cdt.internal.ui.search;
-import java.text.MessageFormat;
import java.util.HashMap;
import org.eclipse.cdt.core.CCorePlugin;
Index: src/org/eclipse/cdt/internal/ui/search/CSearchScopeFactory.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt-core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchScopeFactory.java,v
retrieving revision 1.4
diff -u -r1.4 CSearchScopeFactory.java
--- src/org/eclipse/cdt/internal/ui/search/CSearchScopeFactory.java 11 Sep 2003 17:13:00 -0000 1.4
+++ src/org/eclipse/cdt/internal/ui/search/CSearchScopeFactory.java 12 May 2004 18:05:42 -0000
@@ -123,7 +123,7 @@
public IWorkingSet[] queryWorkingSets() {
- Shell shell= CUIPlugin.getDefault().getActiveWorkbenchShell();
+ Shell shell= CUIPlugin.getActiveWorkbenchShell();
if (shell == null)
return null;
IWorkingSetSelectionDialog dialog= PlatformUI.getWorkbench().getWorkingSetManager().createWorkingSetSelectionDialog(shell, true);
Index: src/org/eclipse/cdt/internal/ui/search/OpenCSearchPageAction.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt-core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/OpenCSearchPageAction.java,v
retrieving revision 1.2
diff -u -r1.2 OpenCSearchPageAction.java
--- src/org/eclipse/cdt/internal/ui/search/OpenCSearchPageAction.java 26 Feb 2004 19:30:35 -0000 1.2
+++ src/org/eclipse/cdt/internal/ui/search/OpenCSearchPageAction.java 12 May 2004 18:05:42 -0000
@@ -46,7 +46,7 @@
}
protected void beep() {
- Shell shell= CUIPlugin.getDefault().getActiveWorkbenchShell();
+ Shell shell= CUIPlugin.getActiveWorkbenchShell();
if (shell != null && shell.getDisplay() != null)
shell.getDisplay().beep();
}
Index: src/org/eclipse/cdt/internal/ui/search/actions/OpenDeclarationsAction.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt-core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/OpenDeclarationsAction.java,v
retrieving revision 1.5
diff -u -r1.5 OpenDeclarationsAction.java
--- src/org/eclipse/cdt/internal/ui/search/actions/OpenDeclarationsAction.java 10 May 2004 22:44:31 -0000 1.5
+++ src/org/eclipse/cdt/internal/ui/search/actions/OpenDeclarationsAction.java 12 May 2004 18:05:42 -0000
@@ -510,7 +510,7 @@
}
//C or CPP?
- ParserLanguage language = CoreModel.getDefault().hasCCNature(currentProject) ? ParserLanguage.CPP : ParserLanguage.C;
+ ParserLanguage language = CoreModel.hasCCNature(currentProject) ? ParserLanguage.CPP : ParserLanguage.C;
IParser parser = null;
FileReader reader = null;Index: src/org/eclipse/cdt/managedbuilder/internal/core/Target.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt-build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Target.java,v
retrieving revision 1.19
diff -u -r1.19 Target.java
--- src/org/eclipse/cdt/managedbuilder/internal/core/Target.java 10 May 2004 15:44:31 -0000 1.19
+++ src/org/eclipse/cdt/managedbuilder/internal/core/Target.java 11 May 2004 18:37:32 -0000
@@ -26,8 +26,8 @@
import org.eclipse.cdt.managedbuilder.core.ITarget;
import org.eclipse.cdt.managedbuilder.core.ITool;
import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager;
-import org.eclipse.core.boot.BootLoader;
import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.Platform;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -671,7 +671,7 @@
return parent.getCleanCommand();
} else {
// User forgot to specify it. Guess based on OS.
- if (BootLoader.getOS().equals("OS_WIN32")) { //$NON-NLS-1$
+ if (Platform.getOS().equals("OS_WIN32")) { //$NON-NLS-1$
return new String("del"); //$NON-NLS-1$
} else {
return new String("rm"); //$NON-NLS-1$Index: plugin.xml
===================================================================
RCS file: /home/tools/org.eclipse.cdt-launch/org.eclipse.cdt.launch/plugin.xml,v
retrieving revision 1.20
diff -u -r1.20 plugin.xml
--- plugin.xml 23 Apr 2004 13:37:21 -0000 1.20
+++ plugin.xml 11 May 2004 18:34:00 -0000
@@ -80,14 +80,6 @@
class="org.eclipse.cdt.launch.internal.CApplicationLaunchShortcut"
id="org.eclipse.cdt.debug.ui.localCShortcut">
<contextualLaunch>
- <enablement>
- <with variable="selection">
- <count value="1"/>
- <iterate>
- <test property="org.eclipse.cdt.launch.isExecutable"/>
- </iterate>
- </with>
- </enablement>
<contextLabel
mode="run"
label="%ContextualRunJavaApplication.label"/>
@@ -95,9 +87,6 @@
mode="debug"
label="%ContextualDebugJavaApplication.label"/>
</contextualLaunch>
- <filter
- name="ContextualLaunchActionFilter"
- value="supportsContextualLaunch"/>
<perspective
id="org.eclipse.cdt.ui.CPerspective">
</perspective>
Index: src/org/eclipse/cdt/launch/internal/CApplicationLaunchShortcut.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt-launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/CApplicationLaunchShortcut.java,v
retrieving revision 1.21
diff -u -r1.21 CApplicationLaunchShortcut.java
--- src/org/eclipse/cdt/launch/internal/CApplicationLaunchShortcut.java 23 Apr 2004 13:37:24 -0000 1.21
+++ src/org/eclipse/cdt/launch/internal/CApplicationLaunchShortcut.java 11 May 2004 18:34:01 -0000
@@ -16,11 +16,11 @@
import org.eclipse.cdt.launch.AbstractCLaunchDelegate;
import org.eclipse.cdt.launch.internal.ui.LaunchUIPlugin;
import org.eclipse.cdt.ui.CElementLabelProvider;
-import org.eclipse.core.boot.BootLoader;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.SubProgressMonitor;
import org.eclipse.debug.core.DebugPlugin;
import org.eclipse.debug.core.ILaunchConfiguration;
@@ -113,7 +113,7 @@
ICDebugConfiguration debugConfig = null;
ICDebugConfiguration[] debugConfigs = CDebugCorePlugin.getDefault().getDebugConfigurations();
List debugList = new ArrayList(debugConfigs.length);
- String os = BootLoader.getOS();
+ String os = Platform.getOS();
for (int i = 0; i < debugConfigs.length; i++) {
String platform = debugConfigs[i].getPlatform();
if (platform == null || platform.equals(ICDebugConfiguration.PLATFORM_NATIVE) || platform.equals(os)) {
Index: src/org/eclipse/cdt/launch/ui/CDebuggerTab.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt-launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CDebuggerTab.java,v
retrieving revision 1.29
diff -u -r1.29 CDebuggerTab.java
--- src/org/eclipse/cdt/launch/ui/CDebuggerTab.java 9 Mar 2004 20:42:41 -0000 1.29
+++ src/org/eclipse/cdt/launch/ui/CDebuggerTab.java 11 May 2004 18:34:01 -0000
@@ -14,8 +14,8 @@
import org.eclipse.cdt.debug.core.ICDebugConfiguration;
import org.eclipse.cdt.launch.internal.ui.AbstractCDebuggerTab;
import org.eclipse.cdt.launch.internal.ui.LaunchUIPlugin;
-import org.eclipse.core.boot.BootLoader;
import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.Platform;
import org.eclipse.debug.core.ILaunchConfiguration;
import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
import org.eclipse.swt.SWT;
@@ -150,7 +150,7 @@
if (debugConfigs[i].supportsMode(ICDTLaunchConfigurationConstants.DEBUGGER_MODE_RUN)
|| debugConfigs[i].supportsMode(ICDTLaunchConfigurationConstants.DEBUGGER_MODE_ATTACH)) {
String debuggerPlatform = debugConfigs[i].getPlatform();
- boolean isNative = configPlatform.equals(BootLoader.getOS());
+ boolean isNative = configPlatform.equals(Platform.getOS());
if (debuggerPlatform.equalsIgnoreCase(configPlatform)
|| (isNative && debuggerPlatform.equalsIgnoreCase(ICDebugConfiguration.PLATFORM_NATIVE))) {
if (debugConfigs[i].supportsCPU(programCPU)) {
Index: src/org/eclipse/cdt/launch/ui/CLaunchConfigurationTab.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt-launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CLaunchConfigurationTab.java,v
retrieving revision 1.8
diff -u -r1.8 CLaunchConfigurationTab.java
--- src/org/eclipse/cdt/launch/ui/CLaunchConfigurationTab.java 9 Mar 2004 20:42:41 -0000 1.8
+++ src/org/eclipse/cdt/launch/ui/CLaunchConfigurationTab.java 11 May 2004 18:34:01 -0000
@@ -7,12 +7,12 @@
import org.eclipse.cdt.core.model.ICProject;
import org.eclipse.cdt.debug.core.ICDTLaunchConfigurationConstants;
import org.eclipse.cdt.launch.internal.ui.LaunchUIPlugin;
-import org.eclipse.core.boot.BootLoader;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.Platform;
import org.eclipse.debug.core.ILaunchConfiguration;
import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
import org.eclipse.debug.ui.AbstractLaunchConfigurationTab;
@@ -122,7 +122,7 @@
}
protected String getPlatform(ILaunchConfiguration config) {
- String platform = BootLoader.getOS();
+ String platform = Platform.getOS();
try {
return config.getAttribute(ICDTLaunchConfigurationConstants.ATTR_PLATFORM, platform);
}
Index: src/org/eclipse/cdt/launch/ui/CMainTab.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt-launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CMainTab.java,v
retrieving revision 1.32
diff -u -r1.32 CMainTab.java
--- src/org/eclipse/cdt/launch/ui/CMainTab.java 20 Apr 2004 00:06:12 -0000 1.32
+++ src/org/eclipse/cdt/launch/ui/CMainTab.java 11 May 2004 18:34:01 -0000
@@ -23,13 +23,13 @@
import org.eclipse.cdt.ui.CElementImageDescriptor;
import org.eclipse.cdt.ui.CElementLabelProvider;
import org.eclipse.cdt.ui.CUIPlugin;
-import org.eclipse.core.boot.BootLoader;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.Status;
import org.eclipse.debug.core.ILaunchConfiguration;
import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
@@ -421,7 +421,7 @@
protected ICProject[] getCProjects() throws CModelException {
ICProject cproject[] = CoreModel.getDefault().getCModel().getCProjects();
ArrayList list = new ArrayList(cproject.length);
- boolean isNative = filterPlatform.equals(BootLoader.getOS());
+ boolean isNative = filterPlatform.equals(Platform.getOS());
for (int i = 0; i < cproject.length; i++) {
ICDescriptor cdesciptor = null;Index: src/org/eclipse/cdt/debug/internal/ui/actions/AddAddressBreakpointActionDelegate.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt-debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AddAddressBreakpointActionDelegate.java,v
retrieving revision 1.4
diff -u -r1.4 AddAddressBreakpointActionDelegate.java
--- src/org/eclipse/cdt/debug/internal/ui/actions/AddAddressBreakpointActionDelegate.java 12 Apr 2004 22:33:47 -0000 1.4
+++ src/org/eclipse/cdt/debug/internal/ui/actions/AddAddressBreakpointActionDelegate.java 11 May 2004 18:33:36 -0000
@@ -5,7 +5,6 @@
*/
package org.eclipse.cdt.debug.internal.ui.actions;
-import org.eclipse.cdt.debug.core.CDebugModel;
import org.eclipse.cdt.debug.core.model.IExecFileInfo;
import org.eclipse.debug.core.DebugException;
import org.eclipse.debug.core.model.IDebugElement;
Index: src/org/eclipse/cdt/debug/internal/ui/wizards/SourceLocationSelectionPage.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt-debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/wizards/SourceLocationSelectionPage.java,v
retrieving revision 1.2
diff -u -r1.2 SourceLocationSelectionPage.java
--- src/org/eclipse/cdt/debug/internal/ui/wizards/SourceLocationSelectionPage.java 4 Mar 2004 19:23:14 -0000 1.2
+++ src/org/eclipse/cdt/debug/internal/ui/wizards/SourceLocationSelectionPage.java 11 May 2004 18:33:39 -0000
@@ -211,7 +211,7 @@
ArrayList result = new ArrayList( allProjects.length );
for ( int i = 0; i < allProjects.length; ++i )
{
- if ( ( CoreModel.getDefault().hasCNature( allProjects[i] ) || CoreModel.getDefault().hasCNature( allProjects[i] ) ) &&
+ if ( ( CoreModel.hasCNature( allProjects[i] ) || CoreModel.hasCNature( allProjects[i] ) ) &&
allProjects[i].isOpen() &&
!projects.contains( allProjects[i] ) )
{Index: src/org/eclipse/cdt/debug/internal/core/DebugConfiguration.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt-debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/DebugConfiguration.java,v
retrieving revision 1.9
diff -u -r1.9 DebugConfiguration.java
--- src/org/eclipse/cdt/debug/internal/core/DebugConfiguration.java 25 Mar 2004 19:36:58 -0000 1.9
+++ src/org/eclipse/cdt/debug/internal/core/DebugConfiguration.java 11 May 2004 18:33:11 -0000
@@ -10,9 +10,9 @@
import org.eclipse.cdt.debug.core.ICDebugConfiguration;
import org.eclipse.cdt.debug.core.ICDebugger;
-import org.eclipse.core.boot.BootLoader;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.core.runtime.Platform;
public class DebugConfiguration implements ICDebugConfiguration {
/**
@@ -64,7 +64,7 @@
}
public boolean supportsCPU(String cpu) {
- String nativeCPU = BootLoader.getOSArch();
+ String nativeCPU = Platform.getOSArch();
boolean ret = false;
if ( nativeCPU.startsWith(cpu) ) {
ret = getCPUs().contains(PLATFORM_NATIVE);
@@ -99,7 +99,7 @@
fCPUs.add(PLATFORM_NATIVE);
}
else {
- String nativeCPU = BootLoader.getOSArch();
+ String nativeCPU = Platform.getOSArch();
StringTokenizer tokenizer = new StringTokenizer(cpus, ","); //$NON-NLS-1$
fCPUs = new HashSet(tokenizer.countTokens());
while (tokenizer.hasMoreTokens()) {
Index: src/org/eclipse/cdt/debug/internal/core/DisassemblyStorage.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt-debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/DisassemblyStorage.java,v
retrieving revision 1.11
diff -u -r1.11 DisassemblyStorage.java
--- src/org/eclipse/cdt/debug/internal/core/DisassemblyStorage.java 10 Mar 2004 19:41:10 -0000 1.11
+++ src/org/eclipse/cdt/debug/internal/core/DisassemblyStorage.java 11 May 2004 18:33:11 -0000
@@ -10,7 +10,6 @@
import java.io.InputStream;
import java.util.Arrays;
-import org.eclipse.cdt.debug.core.*;
import org.eclipse.cdt.debug.core.cdi.model.ICDIInstruction;
import org.eclipse.cdt.debug.core.model.IExecFileInfo;
import org.eclipse.cdt.debug.core.sourcelookup.IDisassemblyStorage;Index: browser/org/eclipse/cdt/internal/core/browser/cache/TypeMatchLocator.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt-core/org.eclipse.cdt.core/browser/org/eclipse/cdt/internal/core/browser/cache/TypeMatchLocator.java,v
retrieving revision 1.5
diff -u -r1.5 TypeMatchLocator.java
--- browser/org/eclipse/cdt/internal/core/browser/cache/TypeMatchLocator.java 16 Apr 2004 00:35:42 -0000 1.5
+++ browser/org/eclipse/cdt/internal/core/browser/cache/TypeMatchLocator.java 11 May 2004 18:06:41 -0000
@@ -499,7 +499,7 @@
ParserLanguage language = null;
if( project != null ){
- language = CoreModel.getDefault().hasCCNature( project ) ? ParserLanguage.CPP : ParserLanguage.C;
+ language = CoreModel.hasCCNature( project ) ? ParserLanguage.CPP : ParserLanguage.C;
} else {
//TODO no project, what language do we use?
language = ParserLanguage.CPP;
Index: index/org/eclipse/cdt/internal/core/search/indexing/AbstractIndexer.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt-core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/search/indexing/AbstractIndexer.java,v
retrieving revision 1.23
diff -u -r1.23 AbstractIndexer.java
--- index/org/eclipse/cdt/internal/core/search/indexing/AbstractIndexer.java 7 May 2004 16:37:35 -0000 1.23
+++ index/org/eclipse/cdt/internal/core/search/indexing/AbstractIndexer.java 11 May 2004 18:06:41 -0000
@@ -18,7 +18,6 @@
import org.eclipse.cdt.core.parser.ast.ASTNotImplementedException;
import org.eclipse.cdt.core.parser.ast.IASTBaseSpecifier;
import org.eclipse.cdt.core.parser.ast.IASTClassSpecifier;
-import org.eclipse.cdt.core.parser.ast.IASTDeclaration;
import org.eclipse.cdt.core.parser.ast.IASTElaboratedTypeSpecifier;
import org.eclipse.cdt.core.parser.ast.IASTEnumerationSpecifier;
import org.eclipse.cdt.core.parser.ast.IASTEnumerator;
Index: index/org/eclipse/cdt/internal/core/search/indexing/SourceIndexer.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt-core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/search/indexing/SourceIndexer.java,v
retrieving revision 1.26
diff -u -r1.26 SourceIndexer.java
--- index/org/eclipse/cdt/internal/core/search/indexing/SourceIndexer.java 30 Apr 2004 00:21:48 -0000 1.26
+++ index/org/eclipse/cdt/internal/core/search/indexing/SourceIndexer.java 11 May 2004 18:06:41 -0000
@@ -98,7 +98,7 @@
}
//C or CPP?
- ParserLanguage language = CoreModel.getDefault().hasCCNature(currentProject) ? ParserLanguage.CPP : ParserLanguage.C;
+ ParserLanguage language = CoreModel.hasCCNature(currentProject) ? ParserLanguage.CPP : ParserLanguage.C;
IParser parser = null;
Index: model/org/eclipse/cdt/internal/core/model/CModelManager.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt-core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CModelManager.java,v
retrieving revision 1.75
diff -u -r1.75 CModelManager.java
--- model/org/eclipse/cdt/internal/core/model/CModelManager.java 5 May 2004 00:08:57 -0000 1.75
+++ model/org/eclipse/cdt/internal/core/model/CModelManager.java 11 May 2004 18:06:44 -0000
@@ -766,13 +766,14 @@
switch (eventType) {
case DEFAULT_CHANGE_EVENT:
- firePreAutoBuildDelta(deltaToNotify, listeners, listenerMask, listenerCount);
+// firePreAutoBuildDelta(deltaToNotify, listeners, listenerMask, listenerCount);
firePostChangeDelta(deltaToNotify, listeners, listenerMask, listenerCount);
fireReconcileDelta(listeners, listenerMask, listenerCount);
break;
- case ElementChangedEvent.PRE_AUTO_BUILD:
- firePreAutoBuildDelta(deltaToNotify, listeners, listenerMask, listenerCount);
- break;
+// deprecated event! POST_CHANGE is raised instead.
+// case ElementChangedEvent.PRE_AUTO_BUILD:
+// firePreAutoBuildDelta(deltaToNotify, listeners, listenerMask, listenerCount);
+// break;
case ElementChangedEvent.POST_CHANGE:
firePostChangeDelta(deltaToNotify, listeners, listenerMask, listenerCount);
fireReconcileDelta(listeners, listenerMask, listenerCount);
@@ -784,17 +785,17 @@
}
}
- private void firePreAutoBuildDelta(ICElementDelta deltaToNotify,
- IElementChangedListener[] listeners, int[] listenerMask, int listenerCount) {
-
- if (VERBOSE) {
- System.out.println("FIRING PRE_AUTO_BUILD Delta ["+Thread.currentThread()+"]:"); //$NON-NLS-1$//$NON-NLS-2$
- System.out.println(deltaToNotify == null ? "<NONE>" : deltaToNotify.toString()); //$NON-NLS-1$
- }
- if (deltaToNotify != null) {
- notifyListeners(deltaToNotify, ElementChangedEvent.PRE_AUTO_BUILD, listeners, listenerMask, listenerCount);
- }
- }
+// private void firePreAutoBuildDelta(ICElementDelta deltaToNotify,
+// IElementChangedListener[] listeners, int[] listenerMask, int listenerCount) {
+//
+// if (VERBOSE) {
+// System.out.println("FIRING PRE_AUTO_BUILD Delta ["+Thread.currentThread()+"]:"); //$NON-NLS-1$//$NON-NLS-2$
+// System.out.println(deltaToNotify == null ? "<NONE>" : deltaToNotify.toString()); //$NON-NLS-1$
+// }
+// if (deltaToNotify != null) {
+// notifyListeners(deltaToNotify, ElementChangedEvent.PRE_AUTO_BUILD, listeners, listenerMask, listenerCount);
+// }
+// }
private void firePostChangeDelta(ICElementDelta deltaToNotify, IElementChangedListener[] listeners, int[] listenerMask, int listenerCount) {
Index: search/org/eclipse/cdt/internal/core/search/matching/DerivedTypesPattern.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt-core/org.eclipse.cdt.core/search/org/eclipse/cdt/internal/core/search/matching/DerivedTypesPattern.java,v
retrieving revision 1.1
diff -u -r1.1 DerivedTypesPattern.java
--- search/org/eclipse/cdt/internal/core/search/matching/DerivedTypesPattern.java 12 Apr 2004 17:43:20 -0000 1.1
+++ search/org/eclipse/cdt/internal/core/search/matching/DerivedTypesPattern.java 11 May 2004 18:06:46 -0000
@@ -9,16 +9,10 @@
import java.util.Iterator;
import org.eclipse.cdt.core.parser.ISourceElementCallbackDelegate;
-import org.eclipse.cdt.core.parser.ast.ASTClassKind;
import org.eclipse.cdt.core.parser.ast.ASTNotImplementedException;
import org.eclipse.cdt.core.parser.ast.IASTBaseSpecifier;
import org.eclipse.cdt.core.parser.ast.IASTClassSpecifier;
-import org.eclipse.cdt.core.parser.ast.IASTElaboratedTypeSpecifier;
-import org.eclipse.cdt.core.parser.ast.IASTEnumerationSpecifier;
-import org.eclipse.cdt.core.parser.ast.IASTOffsetableNamedElement;
-import org.eclipse.cdt.core.parser.ast.IASTQualifiedNameElement;
import org.eclipse.cdt.core.parser.ast.IASTTypeSpecifier;
-import org.eclipse.cdt.core.search.ICSearchConstants;
import org.eclipse.cdt.internal.core.search.indexing.AbstractIndexer;
/**
Index: search/org/eclipse/cdt/internal/core/search/matching/FriendPattern.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt-core/org.eclipse.cdt.core/search/org/eclipse/cdt/internal/core/search/matching/FriendPattern.java,v
retrieving revision 1.2
diff -u -r1.2 FriendPattern.java
--- search/org/eclipse/cdt/internal/core/search/matching/FriendPattern.java 7 May 2004 16:37:35 -0000 1.2
+++ search/org/eclipse/cdt/internal/core/search/matching/FriendPattern.java 11 May 2004 18:06:46 -0000
@@ -9,11 +9,8 @@
import java.util.Iterator;
import org.eclipse.cdt.core.parser.ISourceElementCallbackDelegate;
-import org.eclipse.cdt.core.parser.ast.ASTNotImplementedException;
-import org.eclipse.cdt.core.parser.ast.IASTBaseSpecifier;
import org.eclipse.cdt.core.parser.ast.IASTClassSpecifier;
import org.eclipse.cdt.core.parser.ast.IASTElaboratedTypeSpecifier;
-import org.eclipse.cdt.core.parser.ast.IASTTypeSpecifier;
import org.eclipse.cdt.internal.core.search.indexing.AbstractIndexer;
/**
Index: search/org/eclipse/cdt/internal/core/search/matching/MatchLocator.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt-core/org.eclipse.cdt.core/search/org/eclipse/cdt/internal/core/search/matching/MatchLocator.java,v
retrieving revision 1.53
diff -u -r1.53 MatchLocator.java
--- search/org/eclipse/cdt/internal/core/search/matching/MatchLocator.java 6 May 2004 18:33:01 -0000 1.53
+++ search/org/eclipse/cdt/internal/core/search/matching/MatchLocator.java 11 May 2004 18:06:47 -0000
@@ -39,10 +39,8 @@
import org.eclipse.cdt.core.parser.ParserMode;
import org.eclipse.cdt.core.parser.ParserUtil;
import org.eclipse.cdt.core.parser.ScannerInfo;
-import org.eclipse.cdt.core.parser.ast.ASTNotImplementedException;
import org.eclipse.cdt.core.parser.ast.IASTASMDefinition;
import org.eclipse.cdt.core.parser.ast.IASTAbstractTypeSpecifierDeclaration;
-import org.eclipse.cdt.core.parser.ast.IASTBaseSpecifier;
import org.eclipse.cdt.core.parser.ast.IASTClassReference;
import org.eclipse.cdt.core.parser.ast.IASTClassSpecifier;
import org.eclipse.cdt.core.parser.ast.IASTCodeScope;
@@ -72,7 +70,6 @@
import org.eclipse.cdt.core.parser.ast.IASTTemplateInstantiation;
import org.eclipse.cdt.core.parser.ast.IASTTemplateParameterReference;
import org.eclipse.cdt.core.parser.ast.IASTTemplateSpecialization;
-import org.eclipse.cdt.core.parser.ast.IASTTypeSpecifier;
import org.eclipse.cdt.core.parser.ast.IASTTypedefDeclaration;
import org.eclipse.cdt.core.parser.ast.IASTTypedefReference;
import org.eclipse.cdt.core.parser.ast.IASTUsingDeclaration;
@@ -447,7 +444,7 @@
ParserLanguage language = null;
if( project != null ){
- language = CoreModel.getDefault().hasCCNature( project ) ? ParserLanguage.CPP : ParserLanguage.C;
+ language = CoreModel.hasCCNature( project ) ? ParserLanguage.CPP : ParserLanguage.C;
} else {
//TODO no project, what language do we use?
language = ParserLanguage.CPP;Index: failures/org/eclipse/cdt/core/parser/failedTests/FailedCompleteParseASTTest.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt-core/org.eclipse.cdt.core.tests/failures/org/eclipse/cdt/core/parser/failedTests/FailedCompleteParseASTTest.java,v
retrieving revision 1.7
diff -u -r1.7 FailedCompleteParseASTTest.java
--- failures/org/eclipse/cdt/core/parser/failedTests/FailedCompleteParseASTTest.java 23 Apr 2004 03:49:01 -0000 1.7
+++ failures/org/eclipse/cdt/core/parser/failedTests/FailedCompleteParseASTTest.java 12 May 2004 18:06:02 -0000
@@ -12,8 +12,6 @@
import java.util.Iterator;
-import org.eclipse.cdt.core.parser.ast.IASTAbstractTypeSpecifierDeclaration;
-import org.eclipse.cdt.core.parser.ast.IASTClassSpecifier;
import org.eclipse.cdt.core.parser.ast.IASTFunction;
import org.eclipse.cdt.core.parser.ast.IASTVariable;
import org.eclipse.cdt.core.parser.tests.CompleteParseBaseTest;
Index: model/org/eclipse/cdt/core/model/tests/CModelTests.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt-core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/CModelTests.java,v
retrieving revision 1.6
diff -u -r1.6 CModelTests.java
--- model/org/eclipse/cdt/core/model/tests/CModelTests.java 21 Feb 2004 22:03:50 -0000 1.6
+++ model/org/eclipse/cdt/core/model/tests/CModelTests.java 12 May 2004 18:06:03 -0000
@@ -112,17 +112,17 @@
testProject=CProjectHelper.createCProject("naturetest", "none");
if (testProject==null)
fail("Unable to create project");
- assertTrue("hasCNature works", CoreModel.getDefault().hasCNature(testProject.getProject()));
- assertTrue("hasCCNature works without ccnature", !(CoreModel.getDefault().hasCCNature(testProject.getProject())));
+ assertTrue("hasCNature works", CoreModel.hasCNature(testProject.getProject()));
+ assertTrue("hasCCNature works without ccnature", !(CoreModel.hasCCNature(testProject.getProject())));
CCProjectNature.addCCNature(testProject.getProject(), monitor);
- assertTrue("hasCCNature works", (CoreModel.getDefault().hasCCNature(testProject.getProject())));
+ assertTrue("hasCCNature works", (CoreModel.hasCCNature(testProject.getProject())));
CCProjectNature.removeCCNature(testProject.getProject(), monitor);
CCProjectNature.removeCNature(testProject.getProject(), monitor);
- assertTrue("hasCNature works without cnature", !CoreModel.getDefault().hasCNature(testProject.getProject()));
- assertTrue("hasCCNature works without ccnature or cnature", !(CoreModel.getDefault().hasCCNature(testProject.getProject())));
+ assertTrue("hasCNature works without cnature", !CoreModel.hasCNature(testProject.getProject()));
+ assertTrue("hasCCNature works without ccnature or cnature", !(CoreModel.hasCCNature(testProject.getProject())));
try{
testProject.getProject().delete(true,true,monitor);
}
@@ -154,7 +154,7 @@
assertTrue("isSharedLib", !CoreModel.getDefault().isSharedLib(file));
assertTrue("isArchive", !CoreModel.getDefault().isArchive(file));
assertTrue("isObject", !CoreModel.getDefault().isObject(file));
- assertTrue("isTranslationUnit", !CoreModel.getDefault().isTranslationUnit(file));
+ assertTrue("isTranslationUnit", !CoreModel.isTranslationUnit(file));
file = testProject.getProject().getFile("exetest.c");
@@ -171,7 +171,7 @@
assertTrue("isSharedLib", !CoreModel.getDefault().isSharedLib(file));
assertTrue("isArchive", !CoreModel.getDefault().isArchive(file));
assertTrue("isObject", !CoreModel.getDefault().isObject(file));
- assertTrue("isTranslationUnit", CoreModel.getDefault().isTranslationUnit(file));
+ assertTrue("isTranslationUnit", CoreModel.isTranslationUnit(file));
file = testProject.getProject().getFile("exetest.o");
if (!file.exists()) {
@@ -187,7 +187,7 @@
assertTrue("isSharedLib", !CoreModel.getDefault().isSharedLib(file));
assertTrue("isArchive", !CoreModel.getDefault().isArchive(file));
assertTrue("isObject", CoreModel.getDefault().isObject(file));
- assertTrue("isTranslationUnit", !CoreModel.getDefault().isTranslationUnit(file));
+ assertTrue("isTranslationUnit", !CoreModel.isTranslationUnit(file));
file = testProject.getProject().getFile("liblibtest_g.so");
if (!file.exists()) {
@@ -203,7 +203,7 @@
assertTrue("isSharedLib", CoreModel.getDefault().isSharedLib(file));
assertTrue("isArchive", !CoreModel.getDefault().isArchive(file));
assertTrue("isObject", !CoreModel.getDefault().isObject(file));
- assertTrue("isTranslationUnit", !CoreModel.getDefault().isTranslationUnit(file));
+ assertTrue("isTranslationUnit", !CoreModel.isTranslationUnit(file));
file = testProject.getProject().getFile("liblibtest_g.a");
if (!file.exists()) {
@@ -222,7 +222,7 @@
assertTrue("isSharedLib", !CoreModel.getDefault().isSharedLib(file));
assertTrue("isArchive", CoreModel.getDefault().isArchive(file));
assertTrue("isObject", !CoreModel.getDefault().isObject(file));
- assertTrue("isTranslationUnit", !CoreModel.getDefault().isTranslationUnit(file));
+ assertTrue("isTranslationUnit", !CoreModel.isTranslationUnit(file));
@@ -237,9 +237,9 @@
* Some simple tests for isValidTranslationUnitName
*/
public void testIsValidTranslationUnitName() throws CoreException {
- assertTrue("Invalid C file", !CoreModel.getDefault().isValidTranslationUnitName("notcfile"));
- assertTrue("Invalid C file", !CoreModel.getDefault().isValidTranslationUnitName("not.c.file"));
- assertTrue("Invalid C file", !CoreModel.getDefault().isValidTranslationUnitName("not.ca"));
- assertTrue("Valid C file", CoreModel.getDefault().isValidTranslationUnitName("areal.c"));
+ assertTrue("Invalid C file", !CoreModel.isValidTranslationUnitName("notcfile"));
+ assertTrue("Invalid C file", !CoreModel.isValidTranslationUnitName("not.c.file"));
+ assertTrue("Invalid C file", !CoreModel.isValidTranslationUnitName("not.ca"));
+ assertTrue("Valid C file", CoreModel.isValidTranslationUnitName("areal.c"));
}
}
Index: parser/org/eclipse/cdt/core/parser/tests/SelectionParseTest.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt-core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/SelectionParseTest.java,v
retrieving revision 1.13
diff -u -r1.13 SelectionParseTest.java
--- parser/org/eclipse/cdt/core/parser/tests/SelectionParseTest.java 11 May 2004 20:21:55 -0000 1.13
+++ parser/org/eclipse/cdt/core/parser/tests/SelectionParseTest.java 12 May 2004 18:06:03 -0000
@@ -14,7 +14,6 @@
import java.io.Writer;
import org.eclipse.cdt.core.parser.ast.IASTClassSpecifier;
-import org.eclipse.cdt.core.parser.ast.IASTField;
import org.eclipse.cdt.core.parser.ast.IASTFunction;
import org.eclipse.cdt.core.parser.ast.IASTMethod;
import org.eclipse.cdt.core.parser.ast.IASTNamespaceDefinition;
Index: parser/org/eclipse/cdt/core/parser/tests/XMLDumper.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt-core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/XMLDumper.java,v
retrieving revision 1.2
diff -u -r1.2 XMLDumper.java
--- parser/org/eclipse/cdt/core/parser/tests/XMLDumper.java 2 Apr 2004 01:35:22 -0000 1.2
+++ parser/org/eclipse/cdt/core/parser/tests/XMLDumper.java 12 May 2004 18:06:03 -0000
@@ -1,6 +1,5 @@
package org.eclipse.cdt.core.parser.tests;
-import java.io.IOException;
import java.io.StringWriter;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
@@ -8,7 +7,6 @@
import java.util.HashMap;
import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.FactoryConfigurationError;
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.transform.Transformer;
import javax.xml.transform.TransformerException;
