From 69a42e9342b680d7164ed0389d0f4b796719e803 Mon Sep 17 00:00:00 2001 From: Alain Magloire Date: Wed, 27 Nov 2002 04:45:01 +0000 Subject: [PATCH] Reorganize imports. --- .../cdt/internal/core/model/ArchiveInfo.java | 10 +++++----- .../cdt/internal/core/model/BinaryInfo.java | 14 +++++++------- .../core/model/parser/BinaryContainerAdapter.java | 4 ++-- .../core/model/parser/BinaryFileAdapter.java | 2 +- .../core/model/parser/ElfBinaryArchive.java | 6 +++--- .../internal/core/model/parser/ElfBinaryFile.java | 10 +++++----- .../cdt/internal/core/model/parser/ElfParser.java | 2 +- .../core/model/parser/PEBinaryArchive.java | 6 +++--- .../internal/core/model/parser/PEBinaryFile.java | 10 +++++----- .../cdt/internal/core/model/parser/PEParser.java | 2 +- .../cdt/internal/core/model/parser/Symbol.java | 2 +- 11 files changed, 34 insertions(+), 34 deletions(-) diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/ArchiveInfo.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/ArchiveInfo.java index ecb84d7db27..fc0d8de3570 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/ArchiveInfo.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/ArchiveInfo.java @@ -7,12 +7,12 @@ package org.eclipse.cdt.internal.core.model; import java.io.IOException; +import org.eclipse.cdt.core.IBinaryParser; +import org.eclipse.cdt.core.IBinaryParser.IBinaryArchive; +import org.eclipse.cdt.core.IBinaryParser.IBinaryFile; +import org.eclipse.cdt.core.IBinaryParser.IBinaryObject; import org.eclipse.cdt.core.model.CModelException; -import org.eclipse.cdt.core.model.IBinaryParser; import org.eclipse.cdt.core.model.ICElement; -import org.eclipse.cdt.core.model.IBinaryParser.IBinaryArchive; -import org.eclipse.cdt.core.model.IBinaryParser.IBinaryFile; -import org.eclipse.cdt.core.model.IBinaryParser.IBinaryObject; import org.eclipse.cdt.internal.core.model.parser.BinaryFileAdapter; import org.eclipse.core.resources.IContainer; import org.eclipse.core.resources.IFile; @@ -74,7 +74,7 @@ class ArchiveInfo extends CFileInfo { IBinaryArchive getBinaryArchive() { if (archive == null) { IProject project = getElement().getCProject().getProject(); - IBinaryParser parser = CModelManager.getBinaryParser(project); + IBinaryParser parser = CModelManager.getDefault().getBinaryParser(project); if (parser != null) { try { IFile file = (IFile) getElement().getUnderlyingResource(); diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/BinaryInfo.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/BinaryInfo.java index 915bd652ded..9c94c387cbe 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/BinaryInfo.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/BinaryInfo.java @@ -10,14 +10,14 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.Map; +import org.eclipse.cdt.core.IBinaryParser; +import org.eclipse.cdt.core.IBinaryParser.IBinaryExecutable; +import org.eclipse.cdt.core.IBinaryParser.IBinaryFile; +import org.eclipse.cdt.core.IBinaryParser.IBinaryObject; +import org.eclipse.cdt.core.IBinaryParser.IBinaryShared; +import org.eclipse.cdt.core.IBinaryParser.ISymbol; import org.eclipse.cdt.core.model.CModelException; -import org.eclipse.cdt.core.model.IBinaryParser; import org.eclipse.cdt.core.model.ICElement; -import org.eclipse.cdt.core.model.IBinaryParser.IBinaryExecutable; -import org.eclipse.cdt.core.model.IBinaryParser.IBinaryFile; -import org.eclipse.cdt.core.model.IBinaryParser.IBinaryObject; -import org.eclipse.cdt.core.model.IBinaryParser.IBinaryShared; -import org.eclipse.cdt.core.model.IBinaryParser.ISymbol; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.IPath; @@ -160,7 +160,7 @@ class BinaryInfo extends CFileInfo { IBinaryObject getBinaryObject() { if (binary == null) { IProject project = getElement().getCProject().getProject(); - IBinaryParser parser = CModelManager.getBinaryParser(project); + IBinaryParser parser = CModelManager.getDefault().getBinaryParser(project); if (parser != null) { try { IFile file = (IFile) getElement().getUnderlyingResource(); diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/parser/BinaryContainerAdapter.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/parser/BinaryContainerAdapter.java index d9ef3b255d1..f3bf96fdaf2 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/parser/BinaryContainerAdapter.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/parser/BinaryContainerAdapter.java @@ -7,8 +7,8 @@ package org.eclipse.cdt.internal.core.model.parser; import java.util.ArrayList; -import org.eclipse.cdt.core.model.IBinaryParser.IBinaryArchive; -import org.eclipse.cdt.core.model.IBinaryParser.IBinaryObject; +import org.eclipse.cdt.core.IBinaryParser.IBinaryArchive; +import org.eclipse.cdt.core.IBinaryParser.IBinaryObject; import org.eclipse.cdt.internal.core.model.Container; import org.eclipse.core.resources.IContainer; import org.eclipse.core.resources.IFile; diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/parser/BinaryFileAdapter.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/parser/BinaryFileAdapter.java index 4ce133a767a..1ea84b1f411 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/parser/BinaryFileAdapter.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/parser/BinaryFileAdapter.java @@ -7,7 +7,7 @@ package org.eclipse.cdt.internal.core.model.parser; import java.io.InputStream; -import org.eclipse.cdt.core.model.IBinaryParser.IBinaryObject; +import org.eclipse.cdt.core.IBinaryParser.IBinaryObject; import org.eclipse.cdt.internal.core.model.Resource; import org.eclipse.core.resources.IContainer; import org.eclipse.core.resources.IFile; diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/parser/ElfBinaryArchive.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/parser/ElfBinaryArchive.java index 94886493e39..a0102710ff2 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/parser/ElfBinaryArchive.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/parser/ElfBinaryArchive.java @@ -10,9 +10,9 @@ import java.io.IOException; import java.io.InputStream; import java.util.ArrayList; -import org.eclipse.cdt.core.model.IBinaryParser.IBinaryArchive; -import org.eclipse.cdt.core.model.IBinaryParser.IBinaryFile; -import org.eclipse.cdt.core.model.IBinaryParser.IBinaryObject; +import org.eclipse.cdt.core.IBinaryParser.IBinaryArchive; +import org.eclipse.cdt.core.IBinaryParser.IBinaryFile; +import org.eclipse.cdt.core.IBinaryParser.IBinaryObject; import org.eclipse.cdt.utils.elf.AR; import org.eclipse.core.resources.IFile; import org.eclipse.core.runtime.CoreException; diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/parser/ElfBinaryFile.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/parser/ElfBinaryFile.java index 22ffa0a528f..74d5a89f6d4 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/parser/ElfBinaryFile.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/parser/ElfBinaryFile.java @@ -10,11 +10,11 @@ import java.io.IOException; import java.io.InputStream; import java.util.ArrayList; -import org.eclipse.cdt.core.model.IBinaryParser.IBinaryExecutable; -import org.eclipse.cdt.core.model.IBinaryParser.IBinaryFile; -import org.eclipse.cdt.core.model.IBinaryParser.IBinaryObject; -import org.eclipse.cdt.core.model.IBinaryParser.IBinaryShared; -import org.eclipse.cdt.core.model.IBinaryParser.ISymbol; +import org.eclipse.cdt.core.IBinaryParser.IBinaryExecutable; +import org.eclipse.cdt.core.IBinaryParser.IBinaryFile; +import org.eclipse.cdt.core.IBinaryParser.IBinaryObject; +import org.eclipse.cdt.core.IBinaryParser.IBinaryShared; +import org.eclipse.cdt.core.IBinaryParser.ISymbol; import org.eclipse.cdt.utils.elf.AR; import org.eclipse.cdt.utils.elf.Elf; import org.eclipse.cdt.utils.elf.ElfHelper; diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/parser/ElfParser.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/parser/ElfParser.java index 21cc7dda02a..da46d199af4 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/parser/ElfParser.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/parser/ElfParser.java @@ -7,7 +7,7 @@ package org.eclipse.cdt.internal.core.model.parser; import java.io.IOException; -import org.eclipse.cdt.core.model.IBinaryParser; +import org.eclipse.cdt.core.IBinaryParser; import org.eclipse.cdt.utils.elf.AR; import org.eclipse.cdt.utils.elf.Elf; import org.eclipse.core.resources.IFile; diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/parser/PEBinaryArchive.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/parser/PEBinaryArchive.java index 67d2f219117..ddb564d148a 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/parser/PEBinaryArchive.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/parser/PEBinaryArchive.java @@ -10,9 +10,9 @@ import java.io.IOException; import java.io.InputStream; import java.util.ArrayList; -import org.eclipse.cdt.core.model.IBinaryParser.IBinaryArchive; -import org.eclipse.cdt.core.model.IBinaryParser.IBinaryFile; -import org.eclipse.cdt.core.model.IBinaryParser.IBinaryObject; +import org.eclipse.cdt.core.IBinaryParser.IBinaryArchive; +import org.eclipse.cdt.core.IBinaryParser.IBinaryFile; +import org.eclipse.cdt.core.IBinaryParser.IBinaryObject; import org.eclipse.cdt.utils.coff.PEArchive; import org.eclipse.core.resources.IFile; import org.eclipse.core.runtime.CoreException; diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/parser/PEBinaryFile.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/parser/PEBinaryFile.java index 34c9b0deb01..6a6d08ac76c 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/parser/PEBinaryFile.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/parser/PEBinaryFile.java @@ -9,11 +9,11 @@ import java.io.IOException; import java.io.InputStream; import java.util.ArrayList; -import org.eclipse.cdt.core.model.IBinaryParser.IBinaryExecutable; -import org.eclipse.cdt.core.model.IBinaryParser.IBinaryFile; -import org.eclipse.cdt.core.model.IBinaryParser.IBinaryObject; -import org.eclipse.cdt.core.model.IBinaryParser.IBinaryShared; -import org.eclipse.cdt.core.model.IBinaryParser.ISymbol; +import org.eclipse.cdt.core.IBinaryParser.IBinaryExecutable; +import org.eclipse.cdt.core.IBinaryParser.IBinaryFile; +import org.eclipse.cdt.core.IBinaryParser.IBinaryObject; +import org.eclipse.cdt.core.IBinaryParser.IBinaryShared; +import org.eclipse.cdt.core.IBinaryParser.ISymbol; import org.eclipse.cdt.utils.coff.Coff; import org.eclipse.cdt.utils.coff.PE; import org.eclipse.cdt.utils.coff.PEArchive; diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/parser/PEParser.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/parser/PEParser.java index 168f312df8a..4af962020df 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/parser/PEParser.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/parser/PEParser.java @@ -7,7 +7,7 @@ package org.eclipse.cdt.internal.core.model.parser; import java.io.IOException; -import org.eclipse.cdt.core.model.IBinaryParser; +import org.eclipse.cdt.core.IBinaryParser; import org.eclipse.cdt.utils.coff.PE; import org.eclipse.cdt.utils.coff.PEArchive; import org.eclipse.core.resources.IFile; diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/parser/Symbol.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/parser/Symbol.java index cc55d01fe66..a26ba87dfea 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/parser/Symbol.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/parser/Symbol.java @@ -1,6 +1,6 @@ package org.eclipse.cdt.internal.core.model.parser; -import org.eclipse.cdt.core.model.IBinaryParser.ISymbol; +import org.eclipse.cdt.core.IBinaryParser.ISymbol; /* * (c) Copyright IBM Corp. 2000, 2001.