diff options
74 files changed, 253 insertions, 562 deletions
diff --git a/build/org.eclipse.cdt.make.core/.classpath b/build/org.eclipse.cdt.make.core/.classpath index 0aeb87a163a..065ac06e197 100644 --- a/build/org.eclipse.cdt.make.core/.classpath +++ b/build/org.eclipse.cdt.make.core/.classpath @@ -1,15 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="src" path="src/"/> - <classpathentry kind="src" path="/org.eclipse.core.resources"/> - <classpathentry kind="src" path="/org.eclipse.cdt.core"/> - <classpathentry kind="src" path="/org.eclipse.cdt.core.linux"/> - <classpathentry kind="src" path="/org.eclipse.cdt.core.qnx"/> - <classpathentry kind="src" path="/org.eclipse.cdt.core.solaris"/> - <classpathentry kind="src" path="/org.eclipse.cdt.core.win32"/> - <classpathentry kind="src" path="/org.apache.xerces"/> - <classpathentry kind="src" path="/org.eclipse.core.boot"/> - <classpathentry kind="src" path="/org.eclipse.core.runtime"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="output" path="bin"/> + <classpathentry kind="src" path="src"/> + <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry kind="output" path="bin"/> </classpath> diff --git a/build/org.eclipse.cdt.make.core/.project b/build/org.eclipse.cdt.make.core/.project index 01c697756df..8a04c072ab5 100644 --- a/build/org.eclipse.cdt.make.core/.project +++ b/build/org.eclipse.cdt.make.core/.project @@ -3,15 +3,7 @@ <name>org.eclipse.cdt.make.core</name> <comment></comment> <projects> - <project>org.apache.xerces</project> <project>org.eclipse.cdt.core</project> - <project>org.eclipse.cdt.core.linux</project> - <project>org.eclipse.cdt.core.qnx</project> - <project>org.eclipse.cdt.core.solaris</project> - <project>org.eclipse.cdt.core.win32</project> - <project>org.eclipse.core.boot</project> - <project>org.eclipse.core.resources</project> - <project>org.eclipse.core.runtime</project> </projects> <buildSpec> <buildCommand> diff --git a/build/org.eclipse.cdt.make.core/plugin.xml b/build/org.eclipse.cdt.make.core/plugin.xml index d0d4ca08a20..77f57f4f6f8 100644 --- a/build/org.eclipse.cdt.make.core/plugin.xml +++ b/build/org.eclipse.cdt.make.core/plugin.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<?eclipse version="3.0"?> <plugin id="org.eclipse.cdt.make.core" name="%pluginName" diff --git a/build/org.eclipse.cdt.make.ui/.classpath b/build/org.eclipse.cdt.make.ui/.classpath index 06335bb89f8..065ac06e197 100644 --- a/build/org.eclipse.cdt.make.ui/.classpath +++ b/build/org.eclipse.cdt.make.ui/.classpath @@ -1,17 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="src" path="src/"/> - <classpathentry kind="src" path="/org.eclipse.core.resources"/> - <classpathentry kind="src" path="/org.eclipse.ui"/> - <classpathentry kind="src" path="/org.eclipse.cdt.core"/> - <classpathentry kind="src" path="/org.eclipse.cdt.core.linux"/> - <classpathentry kind="src" path="/org.eclipse.cdt.core.qnx"/> - <classpathentry kind="src" path="/org.eclipse.cdt.core.solaris"/> - <classpathentry kind="src" path="/org.eclipse.cdt.core.win32"/> - <classpathentry kind="src" path="/org.eclipse.cdt.ui"/> - <classpathentry kind="src" path="/org.eclipse.cdt.make.core"/> - <classpathentry kind="src" path="/org.eclipse.core.boot"/> - <classpathentry kind="src" path="/org.eclipse.core.runtime"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="output" path="bin"/> + <classpathentry kind="src" path="src"/> + <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry kind="output" path="bin"/> </classpath> diff --git a/build/org.eclipse.cdt.make.ui/.project b/build/org.eclipse.cdt.make.ui/.project index 36dd5636da8..1b1d4a96461 100644 --- a/build/org.eclipse.cdt.make.ui/.project +++ b/build/org.eclipse.cdt.make.ui/.project @@ -4,16 +4,8 @@ <comment></comment> <projects> <project>org.eclipse.cdt.core</project> - <project>org.eclipse.cdt.core.linux</project> - <project>org.eclipse.cdt.core.qnx</project> - <project>org.eclipse.cdt.core.solaris</project> - <project>org.eclipse.cdt.core.win32</project> <project>org.eclipse.cdt.make.core</project> <project>org.eclipse.cdt.ui</project> - <project>org.eclipse.core.boot</project> - <project>org.eclipse.core.resources</project> - <project>org.eclipse.core.runtime</project> - <project>org.eclipse.ui</project> </projects> <buildSpec> <buildCommand> diff --git a/build/org.eclipse.cdt.make.ui/plugin.xml b/build/org.eclipse.cdt.make.ui/plugin.xml index cf411450d64..ee5c4156e81 100644 --- a/build/org.eclipse.cdt.make.ui/plugin.xml +++ b/build/org.eclipse.cdt.make.ui/plugin.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<?eclipse version="3.0"?> <plugin id="org.eclipse.cdt.make.ui" name="%pluginName" @@ -12,6 +13,11 @@ </library> </runtime> <requires> + <import plugin="org.eclipse.ui.ide"/> + <import plugin="org.eclipse.ui.views"/> + <import plugin="org.eclipse.jface.text"/> + <import plugin="org.eclipse.ui.workbench.texteditor"/> + <import plugin="org.eclipse.ui.editors"/> <import plugin="org.eclipse.core.resources"/> <import plugin="org.eclipse.ui"/> <import plugin="org.eclipse.cdt.core"/> diff --git a/build/org.eclipse.cdt.managedbuilder.core/.classpath b/build/org.eclipse.cdt.managedbuilder.core/.classpath index 37a7e5c72df..065ac06e197 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/.classpath +++ b/build/org.eclipse.cdt.managedbuilder.core/.classpath @@ -1,15 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="src" path="src/"/> - <classpathentry kind="src" path="/org.apache.xerces"/> - <classpathentry kind="src" path="/org.eclipse.cdt.core"/> - <classpathentry kind="src" path="/org.eclipse.cdt.core.linux"/> - <classpathentry kind="src" path="/org.eclipse.cdt.core.qnx"/> - <classpathentry kind="src" path="/org.eclipse.cdt.core.solaris"/> - <classpathentry kind="src" path="/org.eclipse.cdt.core.win32"/> - <classpathentry kind="src" path="/org.eclipse.core.resources"/> - <classpathentry kind="src" path="/org.eclipse.core.runtime"/> - <classpathentry kind="src" path="/org.eclipse.core.boot"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="output" path="bin"/> + <classpathentry kind="src" path="src"/> + <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry kind="output" path="bin"/> </classpath> diff --git a/build/org.eclipse.cdt.managedbuilder.core/.project b/build/org.eclipse.cdt.managedbuilder.core/.project index fe252f677b2..35661dd74df 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/.project +++ b/build/org.eclipse.cdt.managedbuilder.core/.project @@ -3,15 +3,7 @@ <name>org.eclipse.cdt.managedbuilder.core</name> <comment></comment> <projects> - <project>org.apache.xerces</project> <project>org.eclipse.cdt.core</project> - <project>org.eclipse.cdt.core.linux</project> - <project>org.eclipse.cdt.core.qnx</project> - <project>org.eclipse.cdt.core.solaris</project> - <project>org.eclipse.cdt.core.win32</project> - <project>org.eclipse.core.boot</project> - <project>org.eclipse.core.resources</project> - <project>org.eclipse.core.runtime</project> </projects> <buildSpec> <buildCommand> diff --git a/build/org.eclipse.cdt.managedbuilder.core/plugin.xml b/build/org.eclipse.cdt.managedbuilder.core/plugin.xml index aa65e7256d2..e7ad4a393c1 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/plugin.xml +++ b/build/org.eclipse.cdt.managedbuilder.core/plugin.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<?eclipse version="3.0"?> <plugin id="org.eclipse.cdt.managedbuilder.core" name="%pluginName" diff --git a/build/org.eclipse.cdt.managedbuilder.ui/.classpath b/build/org.eclipse.cdt.managedbuilder.ui/.classpath index 35da7f95d3a..065ac06e197 100644 --- a/build/org.eclipse.cdt.managedbuilder.ui/.classpath +++ b/build/org.eclipse.cdt.managedbuilder.ui/.classpath @@ -1,17 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="src" path="src/"/> - <classpathentry kind="src" path="/org.eclipse.core.resources"/> - <classpathentry kind="src" path="/org.eclipse.ui"/> - <classpathentry kind="src" path="/org.eclipse.cdt.core"/> - <classpathentry kind="src" path="/org.eclipse.cdt.core.linux"/> - <classpathentry kind="src" path="/org.eclipse.cdt.core.qnx"/> - <classpathentry kind="src" path="/org.eclipse.cdt.core.solaris"/> - <classpathentry kind="src" path="/org.eclipse.cdt.core.win32"/> - <classpathentry kind="src" path="/org.eclipse.cdt.ui"/> - <classpathentry kind="src" path="/org.eclipse.cdt.managedbuilder.core"/> - <classpathentry kind="src" path="/org.eclipse.core.boot"/> - <classpathentry kind="src" path="/org.eclipse.core.runtime"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="output" path="bin"/> + <classpathentry kind="src" path="src"/> + <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry kind="output" path="bin"/> </classpath> diff --git a/build/org.eclipse.cdt.managedbuilder.ui/.project b/build/org.eclipse.cdt.managedbuilder.ui/.project index 9091b32f7a0..859042cc435 100644 --- a/build/org.eclipse.cdt.managedbuilder.ui/.project +++ b/build/org.eclipse.cdt.managedbuilder.ui/.project @@ -4,16 +4,8 @@ <comment></comment> <projects> <project>org.eclipse.cdt.core</project> - <project>org.eclipse.cdt.core.linux</project> - <project>org.eclipse.cdt.core.qnx</project> - <project>org.eclipse.cdt.core.solaris</project> - <project>org.eclipse.cdt.core.win32</project> <project>org.eclipse.cdt.managedbuilder.core</project> <project>org.eclipse.cdt.ui</project> - <project>org.eclipse.core.boot</project> - <project>org.eclipse.core.resources</project> - <project>org.eclipse.core.runtime</project> - <project>org.eclipse.ui</project> </projects> <buildSpec> <buildCommand> diff --git a/build/org.eclipse.cdt.managedbuilder.ui/plugin.xml b/build/org.eclipse.cdt.managedbuilder.ui/plugin.xml index c9a1bdd752f..e9041e41a2f 100644 --- a/build/org.eclipse.cdt.managedbuilder.ui/plugin.xml +++ b/build/org.eclipse.cdt.managedbuilder.ui/plugin.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<?eclipse version="3.0"?> <plugin id="org.eclipse.cdt.managedbuilder.ui" name="%pluginName" @@ -12,6 +13,11 @@ </library> </runtime> <requires> + <import plugin="org.eclipse.ui.ide"/> + <import plugin="org.eclipse.ui.views"/> + <import plugin="org.eclipse.jface.text"/> + <import plugin="org.eclipse.ui.workbench.texteditor"/> + <import plugin="org.eclipse.ui.editors"/> <import plugin="org.eclipse.core.resources"/> <import plugin="org.eclipse.ui"/> <import plugin="org.eclipse.cdt.core"/> diff --git a/core/org.eclipse.cdt.core.aix/.classpath b/core/org.eclipse.cdt.core.aix/.classpath index 2f498f50b33..065ac06e197 100644 --- a/core/org.eclipse.cdt.core.aix/.classpath +++ b/core/org.eclipse.cdt.core.aix/.classpath @@ -1,16 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="src" path="src/"/> - <classpathentry kind="src" path="/org.eclipse.cdt.core"/> - <classpathentry kind="src" path="/org.eclipse.core.resources"/> - <classpathentry kind="src" path="/org.eclipse.core.runtime"/> - <classpathentry kind="src" path="/org.apache.xerces"/> - <classpathentry kind="src" path="/org.eclipse.search"/> - <classpathentry kind="src" path="/org.eclipse.compare"/> - <classpathentry kind="src" path="/org.eclipse.debug.core"/> - <classpathentry kind="src" path="/org.eclipse.team.core"/> - <classpathentry kind="src" path="/org.eclipse.ui"/> - <classpathentry kind="src" path="/org.eclipse.core.boot"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="output" path="bin"/> + <classpathentry kind="src" path="src"/> + <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry kind="output" path="bin"/> </classpath> diff --git a/core/org.eclipse.cdt.core.aix/.project b/core/org.eclipse.cdt.core.aix/.project index 8c2ed1f29a4..8edd1404d74 100644 --- a/core/org.eclipse.cdt.core.aix/.project +++ b/core/org.eclipse.cdt.core.aix/.project @@ -3,16 +3,7 @@ <name>org.eclipse.cdt.core.aix</name> <comment></comment> <projects> - <project>org.apache.xerces</project> <project>org.eclipse.cdt.core</project> - <project>org.eclipse.compare</project> - <project>org.eclipse.core.boot</project> - <project>org.eclipse.core.resources</project> - <project>org.eclipse.core.runtime</project> - <project>org.eclipse.debug.core</project> - <project>org.eclipse.search</project> - <project>org.eclipse.team.core</project> - <project>org.eclipse.ui</project> </projects> <buildSpec> <buildCommand> diff --git a/core/org.eclipse.cdt.core.aix/fragment.xml b/core/org.eclipse.cdt.core.aix/fragment.xml index 040152b7c9f..9824916abbf 100644 --- a/core/org.eclipse.cdt.core.aix/fragment.xml +++ b/core/org.eclipse.cdt.core.aix/fragment.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<?eclipse version="3.0"?> <fragment id="org.eclipse.cdt.core.aix" name="%fragmentName" diff --git a/core/org.eclipse.cdt.core.linux/.classpath b/core/org.eclipse.cdt.core.linux/.classpath index d2b793e8a1f..065ac06e197 100644 --- a/core/org.eclipse.cdt.core.linux/.classpath +++ b/core/org.eclipse.cdt.core.linux/.classpath @@ -1,14 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="src" path="/org.eclipse.cdt.core"/> - <classpathentry kind="src" path="/org.eclipse.core.resources"/> - <classpathentry kind="src" path="/org.eclipse.core.runtime"/> - <classpathentry kind="src" path="/org.apache.xerces"/> - <classpathentry kind="src" path="/org.eclipse.search"/> - <classpathentry kind="src" path="/org.eclipse.compare"/> - <classpathentry kind="src" path="/org.eclipse.debug.core"/> - <classpathentry kind="src" path="/org.eclipse.core.boot"/> - <classpathentry kind="var" path="JRE_LIB" rootpath="JRE_SRCROOT" sourcepath="JRE_SRC"/> - <classpathentry kind="src" path="src"/> - <classpathentry kind="output" path="bin"/> + <classpathentry kind="src" path="src"/> + <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry kind="output" path="bin"/> </classpath> diff --git a/core/org.eclipse.cdt.core.linux/.project b/core/org.eclipse.cdt.core.linux/.project index fe06d602a6d..43f20bda72b 100644 --- a/core/org.eclipse.cdt.core.linux/.project +++ b/core/org.eclipse.cdt.core.linux/.project @@ -3,14 +3,7 @@ <name>org.eclipse.cdt.core.linux</name> <comment></comment> <projects> - <project>org.apache.xerces</project> <project>org.eclipse.cdt.core</project> - <project>org.eclipse.compare</project> - <project>org.eclipse.core.boot</project> - <project>org.eclipse.core.resources</project> - <project>org.eclipse.core.runtime</project> - <project>org.eclipse.debug.core</project> - <project>org.eclipse.search</project> </projects> <buildSpec> <buildCommand> diff --git a/core/org.eclipse.cdt.core.linux/fragment.xml b/core/org.eclipse.cdt.core.linux/fragment.xml index 08cc3ea37d2..989c14ab6e7 100644 --- a/core/org.eclipse.cdt.core.linux/fragment.xml +++ b/core/org.eclipse.cdt.core.linux/fragment.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<?eclipse version="3.0"?> <fragment id="org.eclipse.cdt.core.linux" name="%fragmentName" diff --git a/core/org.eclipse.cdt.core.qnx/.classpath b/core/org.eclipse.cdt.core.qnx/.classpath index d317cd64b8f..065ac06e197 100644 --- a/core/org.eclipse.cdt.core.qnx/.classpath +++ b/core/org.eclipse.cdt.core.qnx/.classpath @@ -1,14 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="src" path="src"/> - <classpathentry kind="src" path="/org.eclipse.cdt.core"/> - <classpathentry kind="src" path="/org.eclipse.core.resources"/> - <classpathentry kind="src" path="/org.eclipse.core.runtime"/> - <classpathentry kind="src" path="/org.apache.xerces"/> - <classpathentry kind="src" path="/org.eclipse.search"/> - <classpathentry kind="src" path="/org.eclipse.compare"/> - <classpathentry kind="src" path="/org.eclipse.debug.core"/> - <classpathentry kind="src" path="/org.eclipse.core.boot"/> - <classpathentry kind="var" path="JRE_LIB" rootpath="JRE_SRCROOT" sourcepath="JRE_SRC"/> - <classpathentry kind="output" path="bin"/> + <classpathentry kind="src" path="src"/> + <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry kind="output" path="bin"/> </classpath> diff --git a/core/org.eclipse.cdt.core.qnx/.project b/core/org.eclipse.cdt.core.qnx/.project index 7e3a64e9bd3..9aa2652590a 100644 --- a/core/org.eclipse.cdt.core.qnx/.project +++ b/core/org.eclipse.cdt.core.qnx/.project @@ -3,14 +3,7 @@ <name>org.eclipse.cdt.core.qnx</name> <comment></comment> <projects> - <project>org.apache.xerces</project> <project>org.eclipse.cdt.core</project> - <project>org.eclipse.compare</project> - <project>org.eclipse.core.boot</project> - <project>org.eclipse.core.resources</project> - <project>org.eclipse.core.runtime</project> - <project>org.eclipse.debug.core</project> - <project>org.eclipse.search</project> </projects> <buildSpec> <buildCommand> diff --git a/core/org.eclipse.cdt.core.qnx/fragment.xml b/core/org.eclipse.cdt.core.qnx/fragment.xml index b6feb38bb44..11745e6d5dd 100644 --- a/core/org.eclipse.cdt.core.qnx/fragment.xml +++ b/core/org.eclipse.cdt.core.qnx/fragment.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<?eclipse version="3.0"?> <fragment id="org.eclipse.cdt.core.qnx" name="%fragmentName" diff --git a/core/org.eclipse.cdt.core.solaris/.classpath b/core/org.eclipse.cdt.core.solaris/.classpath index d317cd64b8f..065ac06e197 100644 --- a/core/org.eclipse.cdt.core.solaris/.classpath +++ b/core/org.eclipse.cdt.core.solaris/.classpath @@ -1,14 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="src" path="src"/> - <classpathentry kind="src" path="/org.eclipse.cdt.core"/> - <classpathentry kind="src" path="/org.eclipse.core.resources"/> - <classpathentry kind="src" path="/org.eclipse.core.runtime"/> - <classpathentry kind="src" path="/org.apache.xerces"/> - <classpathentry kind="src" path="/org.eclipse.search"/> - <classpathentry kind="src" path="/org.eclipse.compare"/> - <classpathentry kind="src" path="/org.eclipse.debug.core"/> - <classpathentry kind="src" path="/org.eclipse.core.boot"/> - <classpathentry kind="var" path="JRE_LIB" rootpath="JRE_SRCROOT" sourcepath="JRE_SRC"/> - <classpathentry kind="output" path="bin"/> + <classpathentry kind="src" path="src"/> + <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry kind="output" path="bin"/> </classpath> diff --git a/core/org.eclipse.cdt.core.solaris/.project b/core/org.eclipse.cdt.core.solaris/.project index 7b718d54ba7..d02ba7f9f05 100644 --- a/core/org.eclipse.cdt.core.solaris/.project +++ b/core/org.eclipse.cdt.core.solaris/.project @@ -3,14 +3,7 @@ <name>org.eclipse.cdt.core.solaris</name> <comment></comment> <projects> - <project>org.apache.xerces</project> <project>org.eclipse.cdt.core</project> - <project>org.eclipse.compare</project> - <project>org.eclipse.core.boot</project> - <project>org.eclipse.core.resources</project> - <project>org.eclipse.core.runtime</project> - <project>org.eclipse.debug.core</project> - <project>org.eclipse.search</project> </projects> <buildSpec> <buildCommand> diff --git a/core/org.eclipse.cdt.core.solaris/fragment.xml b/core/org.eclipse.cdt.core.solaris/fragment.xml index 3ea0df9dfef..495da0f7b5e 100644 --- a/core/org.eclipse.cdt.core.solaris/fragment.xml +++ b/core/org.eclipse.cdt.core.solaris/fragment.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<?eclipse version="3.0"?> <fragment id="org.eclipse.cdt.core.solaris" name="%fragmentName" diff --git a/core/org.eclipse.cdt.core.tests/.classpath b/core/org.eclipse.cdt.core.tests/.classpath index cdd4b6956fe..362b81cae72 100644 --- a/core/org.eclipse.cdt.core.tests/.classpath +++ b/core/org.eclipse.cdt.core.tests/.classpath @@ -1,28 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="src" path="build/"/> - <classpathentry kind="src" path="failures/"/> - <classpathentry kind="src" path="model/"/> - <classpathentry kind="src" path="parser/"/> - <classpathentry kind="src" path="resources/"/> - <classpathentry kind="src" path="suite/"/> - <classpathentry kind="src" path="indexer/"/> - <classpathentry kind="src" path="search/"/> - <classpathentry kind="src" path="/org.apache.xerces"/> - <classpathentry kind="src" path="/org.eclipse.core.resources"/> - <classpathentry kind="src" path="/org.eclipse.core.runtime"/> - <classpathentry kind="src" path="/org.eclipse.cdt.core"/> - <classpathentry kind="src" path="/org.eclipse.cdt.core.linux"/> - <classpathentry kind="src" path="/org.eclipse.cdt.core.qnx"/> - <classpathentry kind="src" path="/org.eclipse.cdt.core.solaris"/> - <classpathentry kind="src" path="/org.eclipse.cdt.core.win32"/> - <classpathentry kind="src" path="/org.eclipse.cdt.ui"/> - <classpathentry kind="src" path="/org.eclipse.swt"/> - <classpathentry kind="src" path="/org.eclipse.ui"/> - <classpathentry kind="src" path="/org.junit"/> - <classpathentry kind="src" path="/org.eclipse.cdt.managedbuilder.core"/> - <classpathentry kind="src" path="/org.eclipse.cdt.make.core"/> - <classpathentry kind="src" path="/org.eclipse.core.boot"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="output" path="bin"/> + <classpathentry kind="src" path="build"/> + <classpathentry kind="src" path="failures"/> + <classpathentry kind="src" path="model"/> + <classpathentry kind="src" path="parser"/> + <classpathentry kind="src" path="resources"/> + <classpathentry kind="src" path="suite"/> + <classpathentry kind="src" path="indexer"/> + <classpathentry kind="src" path="search"/> + <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry kind="output" path="bin"/> </classpath> diff --git a/core/org.eclipse.cdt.core.tests/.project b/core/org.eclipse.cdt.core.tests/.project index 85e78223521..873e177f7c8 100644 --- a/core/org.eclipse.cdt.core.tests/.project +++ b/core/org.eclipse.cdt.core.tests/.project @@ -3,21 +3,10 @@ <name>org.eclipse.cdt.core.tests</name> <comment></comment> <projects> - <project>org.apache.xerces</project> <project>org.eclipse.cdt.core</project> - <project>org.eclipse.cdt.core.linux</project> - <project>org.eclipse.cdt.core.qnx</project> - <project>org.eclipse.cdt.core.solaris</project> - <project>org.eclipse.cdt.core.win32</project> <project>org.eclipse.cdt.make.core</project> <project>org.eclipse.cdt.managedbuilder.core</project> <project>org.eclipse.cdt.ui</project> - <project>org.eclipse.core.boot</project> - <project>org.eclipse.core.resources</project> - <project>org.eclipse.core.runtime</project> - <project>org.eclipse.swt</project> - <project>org.eclipse.ui</project> - <project>org.junit</project> </projects> <buildSpec> <buildCommand> diff --git a/core/org.eclipse.cdt.core.tests/plugin.xml b/core/org.eclipse.cdt.core.tests/plugin.xml index cccbd12232e..fe0fd3442e1 100644 --- a/core/org.eclipse.cdt.core.tests/plugin.xml +++ b/core/org.eclipse.cdt.core.tests/plugin.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<?eclipse version="3.0"?> <plugin id="org.eclipse.cdt.core.tests" name="org.eclipse.cdt.core.tests" @@ -11,6 +12,11 @@ </library> </runtime> <requires> + <import plugin="org.eclipse.ui.ide"/> + <import plugin="org.eclipse.ui.views"/> + <import plugin="org.eclipse.jface.text"/> + <import plugin="org.eclipse.ui.workbench.texteditor"/> + <import plugin="org.eclipse.ui.editors"/> <import plugin="org.apache.xerces"/> <import plugin="org.eclipse.core.resources"/> <import plugin="org.eclipse.core.runtime"/> diff --git a/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/testplugin/TestWorkbench.java b/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/testplugin/TestWorkbench.java deleted file mode 100644 index 0222d528e3d..00000000000 --- a/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/testplugin/TestWorkbench.java +++ /dev/null @@ -1,79 +0,0 @@ -/* - * (c) Copyright IBM Corp. 2000, 2001. - * All Rights Reserved. - */ -package org.eclipse.cdt.testplugin; - -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; - -import junit.framework.Test; -import junit.framework.TestSuite; -import junit.textui.TestRunner; - -import org.eclipse.core.runtime.IPath; - -import org.eclipse.swt.widgets.Display; - -import org.eclipse.ui.internal.Workbench; - -public class TestWorkbench extends Workbench { - - /** - * Run an event loop for the workbench. - */ - protected void runEventLoop() { - // Dispatch all events. - Display display = Display.getCurrent(); - while (true) { - try { - if (!display.readAndDispatch()) - break; - } catch (Throwable e) { - break; - } - } - IPath location= CTestPlugin.getWorkspace().getRoot().getLocation(); - System.out.println("Workspace-location: " + location.toString()); - - - try { - String[] args= getCommandLineArgs(); - if (args.length > 0) { - Test test= getTest(args[0]); - TestRunner.run(test); - } else { - System.out.println("TestWorkbench: Argument must be class name"); - } - } catch (Exception e) { - e.printStackTrace(); - } - - - // Close the workbench. - close(); - } - - public Test getTest(String className) throws Exception { - Class testClass= getClass().getClassLoader().loadClass(className); - - Method suiteMethod= null; - try { - suiteMethod= testClass.getMethod(TestRunner.SUITE_METHODNAME, new Class[0]); - } catch (Exception e) { - // try to extract a test suite automatically - return new TestSuite(testClass); - } - try { - return (Test) suiteMethod.invoke(null, new Class[0]); // static method - } catch (InvocationTargetException e) { - System.out.println("Failed to invoke suite():" + e.getTargetException().toString()); - } catch (IllegalAccessException e) { - System.out.println("Failed to invoke suite():" + e.toString()); - } - return null; - - } - - -}
\ No newline at end of file diff --git a/core/org.eclipse.cdt.core.win32/.classpath b/core/org.eclipse.cdt.core.win32/.classpath index d2b793e8a1f..065ac06e197 100644 --- a/core/org.eclipse.cdt.core.win32/.classpath +++ b/core/org.eclipse.cdt.core.win32/.classpath @@ -1,14 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="src" path="/org.eclipse.cdt.core"/> - <classpathentry kind="src" path="/org.eclipse.core.resources"/> - <classpathentry kind="src" path="/org.eclipse.core.runtime"/> - <classpathentry kind="src" path="/org.apache.xerces"/> - <classpathentry kind="src" path="/org.eclipse.search"/> - <classpathentry kind="src" path="/org.eclipse.compare"/> - <classpathentry kind="src" path="/org.eclipse.debug.core"/> - <classpathentry kind="src" path="/org.eclipse.core.boot"/> - <classpathentry kind="var" path="JRE_LIB" rootpath="JRE_SRCROOT" sourcepath="JRE_SRC"/> - <classpathentry kind="src" path="src"/> - <classpathentry kind="output" path="bin"/> + <classpathentry kind="src" path="src"/> + <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry kind="output" path="bin"/> </classpath> diff --git a/core/org.eclipse.cdt.core.win32/.project b/core/org.eclipse.cdt.core.win32/.project index c0dc3c4eb89..0c2dc05e8ad 100644 --- a/core/org.eclipse.cdt.core.win32/.project +++ b/core/org.eclipse.cdt.core.win32/.project @@ -3,14 +3,7 @@ <name>org.eclipse.cdt.core.win32</name> <comment></comment> <projects> - <project>org.apache.xerces</project> <project>org.eclipse.cdt.core</project> - <project>org.eclipse.compare</project> - <project>org.eclipse.core.boot</project> - <project>org.eclipse.core.resources</project> - <project>org.eclipse.core.runtime</project> - <project>org.eclipse.debug.core</project> - <project>org.eclipse.search</project> </projects> <buildSpec> <buildCommand> diff --git a/core/org.eclipse.cdt.core.win32/fragment.xml b/core/org.eclipse.cdt.core.win32/fragment.xml index 8af9d240a15..d56f46969d6 100644 --- a/core/org.eclipse.cdt.core.win32/fragment.xml +++ b/core/org.eclipse.cdt.core.win32/fragment.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<?eclipse version="3.0"?> <fragment id="org.eclipse.cdt.core.win32" name="%fragmentName" diff --git a/core/org.eclipse.cdt.core/.classpath b/core/org.eclipse.cdt.core/.classpath index f0d083f5476..dd175003f60 100644 --- a/core/org.eclipse.cdt.core/.classpath +++ b/core/org.eclipse.cdt.core/.classpath @@ -1,21 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="src" path="build/"/> - <classpathentry kind="src" path="index/"/> - <classpathentry kind="src" path="model/"/> - <classpathentry kind="src" path="src/"/> - <classpathentry kind="src" path="utils/"/> - <classpathentry kind="src" path="search/"/> - <classpathentry kind="src" path="dependency/"/> - <classpathentry kind="src" path="parser"/> - <classpathentry kind="src" path="/org.eclipse.core.resources"/> - <classpathentry kind="src" path="/org.eclipse.core.runtime"/> - <classpathentry kind="src" path="/org.apache.xerces"/> - <classpathentry kind="src" path="/org.eclipse.search"/> - <classpathentry kind="src" path="/org.eclipse.compare"/> - <classpathentry kind="src" path="/org.eclipse.debug.core"/> - <classpathentry kind="src" path="/org.eclipse.team.core"/> - <classpathentry kind="src" path="/org.eclipse.core.boot"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="output" path="bin"/> + <classpathentry kind="src" path="build"/> + <classpathentry kind="src" path="index"/> + <classpathentry kind="src" path="model"/> + <classpathentry kind="src" path="src"/> + <classpathentry kind="src" path="utils"/> + <classpathentry kind="src" path="search"/> + <classpathentry kind="src" path="dependency"/> + <classpathentry kind="src" path="parser"/> + <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry kind="output" path="bin"/> </classpath> diff --git a/core/org.eclipse.cdt.core/.project b/core/org.eclipse.cdt.core/.project index ba2680f0072..95eceb11fac 100644 --- a/core/org.eclipse.cdt.core/.project +++ b/core/org.eclipse.cdt.core/.project @@ -3,14 +3,6 @@ <name>org.eclipse.cdt.core</name> <comment></comment> <projects> - <project>org.apache.xerces</project> - <project>org.eclipse.compare</project> - <project>org.eclipse.core.boot</project> - <project>org.eclipse.core.resources</project> - <project>org.eclipse.core.runtime</project> - <project>org.eclipse.debug.core</project> - <project>org.eclipse.search</project> - <project>org.eclipse.team.core</project> </projects> <buildSpec> <buildCommand> diff --git a/core/org.eclipse.cdt.core/plugin.xml b/core/org.eclipse.cdt.core/plugin.xml index 8c73a6e619c..f31224caffb 100644 --- a/core/org.eclipse.cdt.core/plugin.xml +++ b/core/org.eclipse.cdt.core/plugin.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<?eclipse version="3.0"?> <plugin id="org.eclipse.cdt.core" name="%pluginName" diff --git a/core/org.eclipse.cdt.ui.tests/.classpath b/core/org.eclipse.cdt.ui.tests/.classpath index 8dc73d06a59..7b90a41c7e6 100644 --- a/core/org.eclipse.cdt.ui.tests/.classpath +++ b/core/org.eclipse.cdt.ui.tests/.classpath @@ -1,16 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="src" path="src/"/> - <classpathentry kind="src" path="ui/"/> - <classpathentry kind="src" path="core/"/> - <classpathentry kind="src" path="/org.apache.xerces"/> - <classpathentry kind="src" path="/org.eclipse.core.resources"/> - <classpathentry kind="src" path="/org.eclipse.core.runtime"/> - <classpathentry kind="src" path="/org.eclipse.cdt.ui"/> - <classpathentry kind="src" path="/org.eclipse.swt"/> - <classpathentry kind="src" path="/org.eclipse.ui"/> - <classpathentry kind="src" path="/org.junit"/> - <classpathentry kind="src" path="/org.eclipse.core.boot"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="output" path="bin"/> + <classpathentry kind="src" path="src"/> + <classpathentry kind="src" path="ui"/> + <classpathentry kind="src" path="core"/> + <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry kind="output" path="bin"/> </classpath> diff --git a/core/org.eclipse.cdt.ui.tests/.project b/core/org.eclipse.cdt.ui.tests/.project index 3f4f6406025..de367d9e4cb 100644 --- a/core/org.eclipse.cdt.ui.tests/.project +++ b/core/org.eclipse.cdt.ui.tests/.project @@ -3,14 +3,8 @@ <name>org.eclipse.cdt.ui.tests</name> <comment></comment> <projects> - <project>org.apache.xerces</project> + <project>org.eclipse.cdt.core</project> <project>org.eclipse.cdt.ui</project> - <project>org.eclipse.core.boot</project> - <project>org.eclipse.core.resources</project> - <project>org.eclipse.core.runtime</project> - <project>org.eclipse.swt</project> - <project>org.eclipse.ui</project> - <project>org.junit</project> </projects> <buildSpec> <buildCommand> diff --git a/core/org.eclipse.cdt.ui.tests/plugin.xml b/core/org.eclipse.cdt.ui.tests/plugin.xml index e1f3ce42b85..054005b77fa 100644 --- a/core/org.eclipse.cdt.ui.tests/plugin.xml +++ b/core/org.eclipse.cdt.ui.tests/plugin.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<?eclipse version="3.0"?> <plugin id="org.eclipse.cdt.ui.tests" name="org.eclipse.cdt.ui.tests" @@ -11,6 +12,11 @@ </library> </runtime> <requires> + <import plugin="org.eclipse.ui.ide"/> + <import plugin="org.eclipse.ui.views"/> + <import plugin="org.eclipse.jface.text"/> + <import plugin="org.eclipse.ui.workbench.texteditor"/> + <import plugin="org.eclipse.ui.editors"/> <import plugin="org.apache.xerces"/> <import plugin="org.eclipse.core.resources"/> <import plugin="org.eclipse.core.runtime"/> diff --git a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/testplugin/TestWorkbench.java b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/testplugin/TestWorkbench.java deleted file mode 100644 index 0222d528e3d..00000000000 --- a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/testplugin/TestWorkbench.java +++ /dev/null @@ -1,79 +0,0 @@ -/* - * (c) Copyright IBM Corp. 2000, 2001. - * All Rights Reserved. - */ -package org.eclipse.cdt.testplugin; - -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; - -import junit.framework.Test; -import junit.framework.TestSuite; -import junit.textui.TestRunner; - -import org.eclipse.core.runtime.IPath; - -import org.eclipse.swt.widgets.Display; - -import org.eclipse.ui.internal.Workbench; - -public class TestWorkbench extends Workbench { - - /** - * Run an event loop for the workbench. - */ - protected void runEventLoop() { - // Dispatch all events. - Display display = Display.getCurrent(); - while (true) { - try { - if (!display.readAndDispatch()) - break; - } catch (Throwable e) { - break; - } - } - IPath location= CTestPlugin.getWorkspace().getRoot().getLocation(); - System.out.println("Workspace-location: " + location.toString()); - - - try { - String[] args= getCommandLineArgs(); - if (args.length > 0) { - Test test= getTest(args[0]); - TestRunner.run(test); - } else { - System.out.println("TestWorkbench: Argument must be class name"); - } - } catch (Exception e) { - e.printStackTrace(); - } - - - // Close the workbench. - close(); - } - - public Test getTest(String className) throws Exception { - Class testClass= getClass().getClassLoader().loadClass(className); - - Method suiteMethod= null; - try { - suiteMethod= testClass.getMethod(TestRunner.SUITE_METHODNAME, new Class[0]); - } catch (Exception e) { - // try to extract a test suite automatically - return new TestSuite(testClass); - } - try { - return (Test) suiteMethod.invoke(null, new Class[0]); // static method - } catch (InvocationTargetException e) { - System.out.println("Failed to invoke suite():" + e.getTargetException().toString()); - } catch (IllegalAccessException e) { - System.out.println("Failed to invoke suite():" + e.toString()); - } - return null; - - } - - -}
\ No newline at end of file diff --git a/core/org.eclipse.cdt.ui/.classpath b/core/org.eclipse.cdt.ui/.classpath index 0bcc542d2a9..d585f114592 100644 --- a/core/org.eclipse.cdt.ui/.classpath +++ b/core/org.eclipse.cdt.ui/.classpath @@ -1,17 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="src" path="src/"/> - <classpathentry kind="src" path="utils.ui/"/> - <classpathentry kind="src" path="/org.eclipse.ui"/> - <classpathentry kind="src" path="/org.eclipse.core.resources"/> - <classpathentry kind="src" path="/org.apache.xerces"/> - <classpathentry kind="src" path="/org.eclipse.search"/> - <classpathentry kind="src" path="/org.eclipse.compare"/> - <classpathentry kind="src" path="/org.eclipse.debug.ui"/> - <classpathentry kind="src" path="/org.eclipse.debug.core"/> - <classpathentry kind="src" path="/org.eclipse.cdt.core"/> - <classpathentry kind="src" path="/org.eclipse.core.runtime"/> - <classpathentry kind="src" path="/org.eclipse.core.boot"/> - <classpathentry kind="var" path="JRE_LIB" rootpath="JRE_SRCROOT" sourcepath="JRE_SRC"/> - <classpathentry kind="output" path="bin"/> + <classpathentry kind="src" path="src"/> + <classpathentry kind="src" path="utils.ui"/> + <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry kind="output" path="bin"/> </classpath> diff --git a/core/org.eclipse.cdt.ui/.project b/core/org.eclipse.cdt.ui/.project index 3b1e639d37a..04403a7b87c 100644 --- a/core/org.eclipse.cdt.ui/.project +++ b/core/org.eclipse.cdt.ui/.project @@ -3,16 +3,7 @@ <name>org.eclipse.cdt.ui</name> <comment></comment> <projects> - <project>org.apache.xerces</project> <project>org.eclipse.cdt.core</project> - <project>org.eclipse.compare</project> - <project>org.eclipse.core.boot</project> - <project>org.eclipse.core.resources</project> - <project>org.eclipse.core.runtime</project> - <project>org.eclipse.debug.core</project> - <project>org.eclipse.debug.ui</project> - <project>org.eclipse.search</project> - <project>org.eclipse.ui</project> </projects> <buildSpec> <buildCommand> diff --git a/core/org.eclipse.cdt.ui/plugin.xml b/core/org.eclipse.cdt.ui/plugin.xml index d1df4c836e5..a17ff02d33d 100644 --- a/core/org.eclipse.cdt.ui/plugin.xml +++ b/core/org.eclipse.cdt.ui/plugin.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<?eclipse version="3.0"?> <plugin id="org.eclipse.cdt.ui" name="%pluginName" @@ -12,6 +13,11 @@ </library> </runtime> <requires> + <import plugin="org.eclipse.ui.ide"/> + <import plugin="org.eclipse.ui.views"/> + <import plugin="org.eclipse.jface.text"/> + <import plugin="org.eclipse.ui.workbench.texteditor"/> + <import plugin="org.eclipse.ui.editors"/> <import plugin="org.eclipse.ui"/> <import plugin="org.eclipse.core.resources"/> <import plugin="org.apache.xerces"/> @@ -336,7 +342,7 @@ </actionSet> </extension> <extension - point="org.eclipse.ui.projectNatureImages"> + point="org.eclipse.ui.ide.projectNatureImages"> <image icon="icons/full/ovr16/c_ovr.gif" natureId="org.eclipse.cdt.core.cnature" diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/GotoMarkerAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/GotoMarkerAction.java index 539f211cbf0..c32010233d6 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/GotoMarkerAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/GotoMarkerAction.java @@ -27,6 +27,7 @@ import org.eclipse.search.ui.ISearchResultViewEntry; import org.eclipse.search.ui.SearchUI; import org.eclipse.ui.IEditorPart; import org.eclipse.ui.IWorkbenchPage; +import org.eclipse.ui.ide.IDE; /** * @author aniefer @@ -74,7 +75,7 @@ public class GotoMarkerAction extends Action { //boo } if( editor != null ){ - editor.gotoMarker( marker ); + IDE.gotoMarker(editor, marker); } } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/EditorUtility.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/EditorUtility.java index 70fe9d0ccf8..7110fb5ffa3 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/EditorUtility.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/EditorUtility.java @@ -32,6 +32,7 @@ import org.eclipse.ui.IFileEditorInput; import org.eclipse.ui.IWorkbenchPage; import org.eclipse.ui.PartInitException; import org.eclipse.ui.PlatformUI; +import org.eclipse.ui.ide.IDE; import org.eclipse.ui.part.FileEditorInput; import org.eclipse.ui.texteditor.ITextEditor; @@ -109,7 +110,7 @@ public class EditorUtility { if (file != null) { IWorkbenchPage p= CUIPlugin.getActivePage(); if (p != null) { - IEditorPart editorPart= p.openEditor(file, null, activate); + IEditorPart editorPart = IDE.openEditor(p, file, activate); initializeHighlightRange(editorPart); return editorPart; } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/dialogfields/LinkToFileGroup.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/dialogfields/LinkToFileGroup.java index d7597c72f6f..15146e86cef 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/dialogfields/LinkToFileGroup.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/dialogfields/LinkToFileGroup.java @@ -40,7 +40,7 @@ import org.eclipse.swt.widgets.Listener; import org.eclipse.swt.widgets.Text; import org.eclipse.ui.internal.WorkbenchMessages; import org.eclipse.ui.internal.WorkbenchPlugin; -import org.eclipse.ui.internal.dialogs.PathVariableSelectionDialog; +import org.eclipse.ui.internal.ide.dialogs.PathVariableSelectionDialog; /** */ @@ -358,7 +358,7 @@ public class LinkToFileGroup extends StringButtonDialogField { if (linkTargetField == null || linkTargetField.isDisposed()) return createStatus(IStatus.OK, ""); //$NON-NLS-1$ - IWorkspace workspace = WorkbenchPlugin.getPluginWorkspace(); + IWorkspace workspace = ResourcesPlugin.getWorkspace(); String linkTargetName = linkTargetField.getText(); IPath path = new Path(linkTargetName); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CProjectWizard.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CProjectWizard.java index 52baf8d5cea..aaa1bbd4701 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CProjectWizard.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CProjectWizard.java @@ -42,6 +42,7 @@ import org.eclipse.ui.IWorkbenchPage; import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.PartInitException; import org.eclipse.ui.actions.WorkspaceModifyDelegatingOperation; +import org.eclipse.ui.ide.IDE; import org.eclipse.ui.wizards.newresource.BasicNewProjectResourceWizard; import org.eclipse.ui.wizards.newresource.BasicNewResourceWizard; @@ -189,7 +190,7 @@ public abstract class CProjectWizard extends BasicNewResourceWizard implements I try { IWorkbenchPage page = dw.getActivePage(); if (page != null) - page.openEditor(file); + IDE.openEditor(page, file, true); } catch (PartInitException e) { MessageDialog.openError(dw.getShell(), CUIPlugin.getResourceString(OP_ERROR), e.getMessage()); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/NewCProjectWizard.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/NewCProjectWizard.java index 1701efd7106..9632001d92f 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/NewCProjectWizard.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/NewCProjectWizard.java @@ -37,6 +37,7 @@ import org.eclipse.ui.IWorkbenchPage; import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.PartInitException; import org.eclipse.ui.actions.WorkspaceModifyDelegatingOperation; +import org.eclipse.ui.ide.IDE; import org.eclipse.ui.wizards.newresource.BasicNewProjectResourceWizard; import org.eclipse.ui.wizards.newresource.BasicNewResourceWizard; @@ -165,7 +166,7 @@ public abstract class NewCProjectWizard extends BasicNewResourceWizard implement try { IWorkbenchPage page = dw.getActivePage(); if (page != null) - page.openEditor(file); + IDE.openEditor(page, file, true); } catch (PartInitException e) { MessageDialog.openError(dw.getShell(), CUIPlugin.getResourceString(OP_ERROR), e.getMessage()); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/NewClassWizard.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/NewClassWizard.java index 08b3cbe756f..d477edb1c4b 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/NewClassWizard.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/NewClassWizard.java @@ -19,6 +19,7 @@ import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.INewWizard; import org.eclipse.ui.IWorkbenchPage; import org.eclipse.ui.PartInitException; +import org.eclipse.ui.ide.IDE; import org.eclipse.ui.wizards.newresource.BasicNewResourceWizard; /** @@ -113,7 +114,7 @@ public class NewClassWizard extends BasicNewResourceWizard implements INewWizard display.asyncExec(new Runnable() { public void run() { try { - activePage.openEditor(resource); + IDE.openEditor(activePage, resource, true); } catch (PartInitException e) { CUIPlugin.getDefault().log(e); } diff --git a/debug/org.eclipse.cdt.debug.core/.classpath b/debug/org.eclipse.cdt.debug.core/.classpath index c7ba04bb859..5e28d3dce23 100644 --- a/debug/org.eclipse.cdt.debug.core/.classpath +++ b/debug/org.eclipse.cdt.debug.core/.classpath @@ -1,13 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="src" path="src"/> - <classpathentry kind="src" path="schema"/> - <classpathentry kind="src" path="/org.eclipse.core.resources"/> - <classpathentry kind="src" path="/org.eclipse.debug.core"/> - <classpathentry kind="src" path="/org.eclipse.cdt.core"/> - <classpathentry kind="src" path="/org.apache.xerces"/> - <classpathentry kind="src" path="/org.eclipse.core.runtime"/> - <classpathentry kind="src" path="/org.eclipse.core.boot"/> - <classpathentry kind="var" path="JRE_LIB" rootpath="JRE_SRCROOT" sourcepath="JRE_SRC"/> - <classpathentry kind="output" path="bin"/> + <classpathentry kind="src" path="src"/> + <classpathentry kind="src" path="schema"/> + <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry kind="output" path="bin"/> </classpath> diff --git a/debug/org.eclipse.cdt.debug.core/.project b/debug/org.eclipse.cdt.debug.core/.project index 730404d6973..a0751078e2e 100644 --- a/debug/org.eclipse.cdt.debug.core/.project +++ b/debug/org.eclipse.cdt.debug.core/.project @@ -3,12 +3,7 @@ <name>org.eclipse.cdt.debug.core</name> <comment></comment> <projects> - <project>org.apache.xerces</project> <project>org.eclipse.cdt.core</project> - <project>org.eclipse.core.boot</project> - <project>org.eclipse.core.resources</project> - <project>org.eclipse.core.runtime</project> - <project>org.eclipse.debug.core</project> </projects> <buildSpec> <buildCommand> diff --git a/debug/org.eclipse.cdt.debug.core/plugin.xml b/debug/org.eclipse.cdt.debug.core/plugin.xml index 8db11ec524e..786994fe9c3 100644 --- a/debug/org.eclipse.cdt.debug.core/plugin.xml +++ b/debug/org.eclipse.cdt.debug.core/plugin.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<?eclipse version="3.0"?> <plugin id="org.eclipse.cdt.debug.core" name="%pluginName" diff --git a/debug/org.eclipse.cdt.debug.mi.core/.classpath b/debug/org.eclipse.cdt.debug.mi.core/.classpath index 43c9b09db27..065ac06e197 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/.classpath +++ b/debug/org.eclipse.cdt.debug.mi.core/.classpath @@ -1,12 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="src" path="src/"/> - <classpathentry kind="src" path="/org.eclipse.cdt.debug.core"/> - <classpathentry kind="src" path="/org.eclipse.core.resources"/> - <classpathentry kind="src" path="/org.eclipse.debug.core"/> - <classpathentry kind="src" path="/org.eclipse.cdt.core"/> - <classpathentry kind="src" path="/org.eclipse.core.runtime"/> - <classpathentry kind="src" path="/org.eclipse.core.boot"/> - <classpathentry kind="var" path="JRE_LIB" rootpath="JRE_SRCROOT" sourcepath="JRE_SRC"/> - <classpathentry kind="output" path="bin"/> + <classpathentry kind="src" path="src"/> + <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry kind="output" path="bin"/> </classpath> diff --git a/debug/org.eclipse.cdt.debug.mi.core/.project b/debug/org.eclipse.cdt.debug.mi.core/.project index 7434461909b..016309439c3 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/.project +++ b/debug/org.eclipse.cdt.debug.mi.core/.project @@ -5,10 +5,6 @@ <projects> <project>org.eclipse.cdt.core</project> <project>org.eclipse.cdt.debug.core</project> - <project>org.eclipse.core.boot</project> - <project>org.eclipse.core.resources</project> - <project>org.eclipse.core.runtime</project> - <project>org.eclipse.debug.core</project> </projects> <buildSpec> <buildCommand> diff --git a/debug/org.eclipse.cdt.debug.mi.core/plugin.xml b/debug/org.eclipse.cdt.debug.mi.core/plugin.xml index 45ac5cfec97..b33467db189 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/plugin.xml +++ b/debug/org.eclipse.cdt.debug.mi.core/plugin.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<?eclipse version="3.0"?> <plugin id="org.eclipse.cdt.debug.mi.core" name="%pluginName" diff --git a/debug/org.eclipse.cdt.debug.mi.ui/.classpath b/debug/org.eclipse.cdt.debug.mi.ui/.classpath index 8b37395920f..065ac06e197 100644 --- a/debug/org.eclipse.cdt.debug.mi.ui/.classpath +++ b/debug/org.eclipse.cdt.debug.mi.ui/.classpath @@ -1,17 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="src" path="src/"/> - <classpathentry kind="src" path="/org.eclipse.core.resources"/> - <classpathentry kind="src" path="/org.eclipse.ui"/> - <classpathentry kind="src" path="/org.eclipse.cdt.debug.mi.core"/> - <classpathentry kind="src" path="/org.eclipse.cdt.debug.ui"/> - <classpathentry kind="src" path="/org.eclipse.cdt.debug.core"/> - <classpathentry kind="src" path="/org.eclipse.cdt.launch"/> - <classpathentry kind="src" path="/org.eclipse.cdt.ui"/> - <classpathentry kind="src" path="/org.eclipse.debug.core"/> - <classpathentry kind="src" path="/org.eclipse.debug.ui"/> - <classpathentry kind="src" path="/org.eclipse.core.runtime"/> - <classpathentry kind="src" path="/org.eclipse.core.boot"/> - <classpathentry kind="var" path="JRE_LIB" rootpath="JRE_SRCROOT" sourcepath="JRE_SRC"/> - <classpathentry kind="output" path="bin"/> + <classpathentry kind="src" path="src"/> + <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry kind="output" path="bin"/> </classpath> diff --git a/debug/org.eclipse.cdt.debug.mi.ui/.project b/debug/org.eclipse.cdt.debug.mi.ui/.project index 97bee48cc25..ee92c3d5275 100644 --- a/debug/org.eclipse.cdt.debug.mi.ui/.project +++ b/debug/org.eclipse.cdt.debug.mi.ui/.project @@ -8,12 +8,6 @@ <project>org.eclipse.cdt.debug.ui</project> <project>org.eclipse.cdt.launch</project> <project>org.eclipse.cdt.ui</project> - <project>org.eclipse.core.boot</project> - <project>org.eclipse.core.resources</project> - <project>org.eclipse.core.runtime</project> - <project>org.eclipse.debug.core</project> - <project>org.eclipse.debug.ui</project> - <project>org.eclipse.ui</project> </projects> <buildSpec> <buildCommand> diff --git a/debug/org.eclipse.cdt.debug.mi.ui/plugin.xml b/debug/org.eclipse.cdt.debug.mi.ui/plugin.xml index 4dbd7e2a110..48d01ffcda7 100644 --- a/debug/org.eclipse.cdt.debug.mi.ui/plugin.xml +++ b/debug/org.eclipse.cdt.debug.mi.ui/plugin.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<?eclipse version="3.0"?> <plugin id="org.eclipse.cdt.debug.mi.ui" name="%pluginName" @@ -12,6 +13,11 @@ </library> </runtime> <requires> + <import plugin="org.eclipse.ui.ide"/> + <import plugin="org.eclipse.ui.views"/> + <import plugin="org.eclipse.jface.text"/> + <import plugin="org.eclipse.ui.workbench.texteditor"/> + <import plugin="org.eclipse.ui.editors"/> <import plugin="org.eclipse.core.resources"/> <import plugin="org.eclipse.ui"/> <import plugin="org.eclipse.cdt.debug.mi.core"/> diff --git a/debug/org.eclipse.cdt.debug.ui.tests/.classpath b/debug/org.eclipse.cdt.debug.ui.tests/.classpath index f106e2d20bd..d16b7548c1d 100644 --- a/debug/org.eclipse.cdt.debug.ui.tests/.classpath +++ b/debug/org.eclipse.cdt.debug.ui.tests/.classpath @@ -1,22 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="src" path="src/"/> - <classpathentry kind="src" path="core/"/> - <classpathentry kind="src" path="/org.apache.xerces"/> - <classpathentry kind="src" path="/org.eclipse.core.boot"/> - <classpathentry kind="src" path="/org.eclipse.core.resources"/> - <classpathentry kind="src" path="/org.eclipse.core.runtime"/> - <classpathentry kind="src" path="/org.eclipse.swt"/> - <classpathentry kind="src" path="/org.junit"/> - <classpathentry kind="src" path="/org.eclipse.cdt.debug.core"/> - <classpathentry kind="src" path="/org.eclipse.cdt.debug.mi.core"/> - <classpathentry kind="src" path="/org.eclipse.cdt.core"/> - <classpathentry kind="src" path="/org.eclipse.cdt.core.linux"/> - <classpathentry kind="src" path="/org.eclipse.cdt.core.qnx"/> - <classpathentry kind="src" path="/org.eclipse.cdt.core.solaris"/> - <classpathentry kind="src" path="/org.eclipse.cdt.core.win32"/> - <classpathentry kind="src" path="/org.eclipse.ui"/> - <classpathentry kind="src" path="/org.eclipse.update.core"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="output" path="bin"/> + <classpathentry kind="src" path="src"/> + <classpathentry kind="src" path="core"/> + <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry kind="output" path="bin"/> </classpath> diff --git a/debug/org.eclipse.cdt.debug.ui.tests/.project b/debug/org.eclipse.cdt.debug.ui.tests/.project index 891a6c4d5f5..bec51f088aa 100644 --- a/debug/org.eclipse.cdt.debug.ui.tests/.project +++ b/debug/org.eclipse.cdt.debug.ui.tests/.project @@ -3,21 +3,9 @@ <name>org.eclipse.cdt.debug.ui.tests</name> <comment></comment> <projects> - <project>org.apache.xerces</project> <project>org.eclipse.cdt.core</project> - <project>org.eclipse.cdt.core.linux</project> - <project>org.eclipse.cdt.core.qnx</project> - <project>org.eclipse.cdt.core.solaris</project> - <project>org.eclipse.cdt.core.win32</project> <project>org.eclipse.cdt.debug.core</project> <project>org.eclipse.cdt.debug.mi.core</project> - <project>org.eclipse.core.boot</project> - <project>org.eclipse.core.resources</project> - <project>org.eclipse.core.runtime</project> - <project>org.eclipse.swt</project> - <project>org.eclipse.ui</project> - <project>org.eclipse.update.core</project> - <project>org.junit</project> </projects> <buildSpec> <buildCommand> diff --git a/debug/org.eclipse.cdt.debug.ui.tests/plugin.xml b/debug/org.eclipse.cdt.debug.ui.tests/plugin.xml index f97864993cb..525a8a55b67 100644 --- a/debug/org.eclipse.cdt.debug.ui.tests/plugin.xml +++ b/debug/org.eclipse.cdt.debug.ui.tests/plugin.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<?eclipse version="3.0"?> <plugin id="org.eclipse.cdt.debug.ui.tests" name="org.eclipse.cdt.debug.ui.tests" @@ -11,6 +12,11 @@ </library> </runtime> <requires> + <import plugin="org.eclipse.ui.ide"/> + <import plugin="org.eclipse.ui.views"/> + <import plugin="org.eclipse.jface.text"/> + <import plugin="org.eclipse.ui.workbench.texteditor"/> + <import plugin="org.eclipse.ui.editors"/> <import plugin="org.apache.xerces"/> <import plugin="org.eclipse.core.boot"/> <import plugin="org.eclipse.core.resources"/> diff --git a/debug/org.eclipse.cdt.debug.ui/.classpath b/debug/org.eclipse.cdt.debug.ui/.classpath index 712ef3d8f53..065ac06e197 100644 --- a/debug/org.eclipse.cdt.debug.ui/.classpath +++ b/debug/org.eclipse.cdt.debug.ui/.classpath @@ -1,16 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="src" path="src/"/> - <classpathentry kind="src" path="/org.eclipse.core.resources"/> - <classpathentry kind="src" path="/org.eclipse.ui"/> - <classpathentry kind="src" path="/org.eclipse.debug.ui"/> - <classpathentry kind="src" path="/org.eclipse.debug.core"/> - <classpathentry kind="src" path="/org.eclipse.cdt.debug.core"/> - <classpathentry kind="src" path="/org.eclipse.cdt.ui"/> - <classpathentry kind="src" path="/org.eclipse.cdt.core"/> - <classpathentry kind="src" path="/org.apache.xerces"/> - <classpathentry kind="src" path="/org.eclipse.core.runtime"/> - <classpathentry kind="src" path="/org.eclipse.core.boot"/> - <classpathentry kind="var" path="JRE_LIB" rootpath="JRE_SRCROOT" sourcepath="JRE_SRC"/> - <classpathentry kind="output" path="bin"/> + <classpathentry kind="src" path="src"/> + <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry kind="output" path="bin"/> </classpath> diff --git a/debug/org.eclipse.cdt.debug.ui/.project b/debug/org.eclipse.cdt.debug.ui/.project index f5ffeabe9d4..9786a16312f 100644 --- a/debug/org.eclipse.cdt.debug.ui/.project +++ b/debug/org.eclipse.cdt.debug.ui/.project @@ -3,16 +3,9 @@ <name>org.eclipse.cdt.debug.ui</name> <comment></comment> <projects> - <project>org.apache.xerces</project> <project>org.eclipse.cdt.core</project> <project>org.eclipse.cdt.debug.core</project> <project>org.eclipse.cdt.ui</project> - <project>org.eclipse.core.boot</project> - <project>org.eclipse.core.resources</project> - <project>org.eclipse.core.runtime</project> - <project>org.eclipse.debug.core</project> - <project>org.eclipse.debug.ui</project> - <project>org.eclipse.ui</project> </projects> <buildSpec> <buildCommand> diff --git a/debug/org.eclipse.cdt.debug.ui/plugin.xml b/debug/org.eclipse.cdt.debug.ui/plugin.xml index 58ce745ff35..d4a02b348b9 100644 --- a/debug/org.eclipse.cdt.debug.ui/plugin.xml +++ b/debug/org.eclipse.cdt.debug.ui/plugin.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<?eclipse version="3.0"?> <plugin id="org.eclipse.cdt.debug.ui" name="%pluginName" @@ -12,6 +13,11 @@ </library> </runtime> <requires> + <import plugin="org.eclipse.ui.ide"/> + <import plugin="org.eclipse.ui.views"/> + <import plugin="org.eclipse.jface.text"/> + <import plugin="org.eclipse.ui.workbench.texteditor"/> + <import plugin="org.eclipse.ui.editors"/> <import plugin="org.eclipse.core.resources"/> <import plugin="org.eclipse.ui"/> <import plugin="org.eclipse.debug.ui"/> diff --git a/doc/org.eclipse.cdt.doc.user/.project b/doc/org.eclipse.cdt.doc.user/.project index d137829266b..6fffba66603 100644 --- a/doc/org.eclipse.cdt.doc.user/.project +++ b/doc/org.eclipse.cdt.doc.user/.project @@ -5,7 +5,18 @@ <projects> </projects> <buildSpec> + <buildCommand> + <name>org.eclipse.pde.ManifestBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.SchemaBuilder</name> + <arguments> + </arguments> + </buildCommand> </buildSpec> <natures> + <nature>org.eclipse.pde.PluginNature</nature> </natures> </projectDescription> diff --git a/doc/org.eclipse.cdt.doc.user/plugin.xml b/doc/org.eclipse.cdt.doc.user/plugin.xml index e52cb71e732..2c44b5689af 100644 --- a/doc/org.eclipse.cdt.doc.user/plugin.xml +++ b/doc/org.eclipse.cdt.doc.user/plugin.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<?eclipse version="3.0"?> <plugin id="org.eclipse.cdt.doc.user" name="C/C++ Development User Guide" diff --git a/launch/org.eclipse.cdt.launch/.classpath b/launch/org.eclipse.cdt.launch/.classpath index 0bf3d237864..065ac06e197 100644 --- a/launch/org.eclipse.cdt.launch/.classpath +++ b/launch/org.eclipse.cdt.launch/.classpath @@ -1,17 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="src" path="src/"/> - <classpathentry kind="src" path="/org.eclipse.core.resources"/> - <classpathentry kind="src" path="/org.eclipse.debug.core"/> - <classpathentry kind="src" path="/org.eclipse.debug.ui"/> - <classpathentry kind="src" path="/org.eclipse.ui"/> - <classpathentry kind="src" path="/org.eclipse.cdt.core"/> - <classpathentry kind="src" path="/org.eclipse.cdt.ui"/> - <classpathentry kind="src" path="/org.eclipse.cdt.debug.core"/> - <classpathentry kind="src" path="/org.eclipse.cdt.debug.ui"/> - <classpathentry kind="src" path="/org.apache.xerces"/> - <classpathentry kind="src" path="/org.eclipse.core.runtime"/> - <classpathentry kind="src" path="/org.eclipse.core.boot"/> - <classpathentry kind="var" path="JRE_LIB" rootpath="JRE_SRCROOT" sourcepath="JRE_SRC"/> - <classpathentry kind="output" path="bin"/> + <classpathentry kind="src" path="src"/> + <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry kind="output" path="bin"/> </classpath> diff --git a/launch/org.eclipse.cdt.launch/plugin.xml b/launch/org.eclipse.cdt.launch/plugin.xml index 9d61e8bbe75..5cb787fc227 100644 --- a/launch/org.eclipse.cdt.launch/plugin.xml +++ b/launch/org.eclipse.cdt.launch/plugin.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<?eclipse version="3.0"?> <plugin id="org.eclipse.cdt.launch" name="%pluginName" @@ -12,6 +13,11 @@ </library> </runtime> <requires> + <import plugin="org.eclipse.ui.ide"/> + <import plugin="org.eclipse.ui.views"/> + <import plugin="org.eclipse.jface.text"/> + <import plugin="org.eclipse.ui.workbench.texteditor"/> + <import plugin="org.eclipse.ui.editors"/> <import plugin="org.eclipse.core.resources"/> <import plugin="org.eclipse.debug.core"/> <import plugin="org.eclipse.debug.ui"/> diff --git a/releng/org.eclipse.cdt-feature/.project b/releng/org.eclipse.cdt-feature/.project index d5b49216e39..514cc100664 100644 --- a/releng/org.eclipse.cdt-feature/.project +++ b/releng/org.eclipse.cdt-feature/.project @@ -10,8 +10,19 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.pde.ManifestBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.SchemaBuilder</name> + <arguments> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.pde.FeatureNature</nature> + <nature>org.eclipse.pde.PluginNature</nature> </natures> </projectDescription> diff --git a/releng/org.eclipse.cdt-feature/plugin.xml b/releng/org.eclipse.cdt-feature/plugin.xml new file mode 100644 index 00000000000..38beabb52f2 --- /dev/null +++ b/releng/org.eclipse.cdt-feature/plugin.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?eclipse version="3.0"?> +<plugin + id="org.eclipse.cdt-feature" + name="Cdt-feature" + version="1.0.0"> + + <runtime> + </runtime> + +</plugin> diff --git a/releng/org.eclipse.cdt.testing-feature/.project b/releng/org.eclipse.cdt.testing-feature/.project index 4699c7217c6..63f3a231d39 100644 --- a/releng/org.eclipse.cdt.testing-feature/.project +++ b/releng/org.eclipse.cdt.testing-feature/.project @@ -5,7 +5,18 @@ <projects> </projects> <buildSpec> + <buildCommand> + <name>org.eclipse.pde.ManifestBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.SchemaBuilder</name> + <arguments> + </arguments> + </buildCommand> </buildSpec> <natures> + <nature>org.eclipse.pde.PluginNature</nature> </natures> </projectDescription> diff --git a/releng/org.eclipse.cdt.testing-feature/plugin.xml b/releng/org.eclipse.cdt.testing-feature/plugin.xml new file mode 100644 index 00000000000..7f9a5d27890 --- /dev/null +++ b/releng/org.eclipse.cdt.testing-feature/plugin.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?eclipse version="3.0"?> +<plugin + id="org.eclipse.cdt.testing-feature" + name="Testing-feature" + version="1.0.0"> + + <runtime> + </runtime> + +</plugin> diff --git a/releng/org.eclipse.cdt.testing/.project b/releng/org.eclipse.cdt.testing/.project index c31e57e455c..162151c68c5 100644 --- a/releng/org.eclipse.cdt.testing/.project +++ b/releng/org.eclipse.cdt.testing/.project @@ -5,7 +5,18 @@ <projects> </projects> <buildSpec> + <buildCommand> + <name>org.eclipse.pde.ManifestBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.SchemaBuilder</name> + <arguments> + </arguments> + </buildCommand> </buildSpec> <natures> + <nature>org.eclipse.pde.PluginNature</nature> </natures> </projectDescription> diff --git a/releng/org.eclipse.cdt.testing/plugin.xml b/releng/org.eclipse.cdt.testing/plugin.xml index f4a973bd113..0b524685bb0 100644 --- a/releng/org.eclipse.cdt.testing/plugin.xml +++ b/releng/org.eclipse.cdt.testing/plugin.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<?eclipse version="3.0"?> <plugin id="org.eclipse.cdt.testing" name="%pluginName" diff --git a/releng/org.eclipse.cdt/.project b/releng/org.eclipse.cdt/.project index 40cbf6c58b6..c5baad78ec3 100644 --- a/releng/org.eclipse.cdt/.project +++ b/releng/org.eclipse.cdt/.project @@ -5,7 +5,18 @@ <projects> </projects> <buildSpec> + <buildCommand> + <name>org.eclipse.pde.ManifestBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.SchemaBuilder</name> + <arguments> + </arguments> + </buildCommand> </buildSpec> <natures> + <nature>org.eclipse.pde.PluginNature</nature> </natures> </projectDescription> diff --git a/releng/org.eclipse.cdt/plugin.xml b/releng/org.eclipse.cdt/plugin.xml index 839d4fee9e5..6bd4a83e39b 100644 --- a/releng/org.eclipse.cdt/plugin.xml +++ b/releng/org.eclipse.cdt/plugin.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<?eclipse version="3.0"?> <plugin id="org.eclipse.cdt" name="%pluginName" |