From 3c6df724087bcb644882db21a813c504d89aa954 Mon Sep 17 00:00:00 2001 From: Mike Kucera Date: Thu, 14 Aug 2008 19:12:05 +0000 Subject: [PATCH] updated UI plugin version to 5.1 --- core/org.eclipse.cdt.ui/META-INF/MANIFEST.MF | 2 +- .../wizards/settingswizards/IProjectSettingsWizardPage.java | 1 + .../settingswizards/IProjectSettingsWizardPageStrategy.java | 2 +- .../ui/wizards/settingswizards/ISettingsProcessor.java | 1 + .../settingswizards/IncludePathsSettingsProcessor.java | 1 + .../ui/wizards/settingswizards/MacroSettingsProcessor.java | 1 + .../settingswizards/ProjectSettingsExportStrategy.java | 2 ++ .../settingswizards/ProjectSettingsExportWizard.java | 3 +++ .../settingswizards/ProjectSettingsImportStrategy.java | 1 + .../settingswizards/ProjectSettingsImportWizard.java | 3 +++ .../ui/wizards/settingswizards/ProjectSettingsWizard.java | 3 +++ .../wizards/settingswizards/ProjectSettingsWizardPage.java | 2 +- .../settingswizards/SettingsImportExportException.java | 6 ++++++ .../ui/wizards/settingswizards/SettingsProcessor.java | 5 +++++ .../src/org/eclipse/cdt/ui/refactoring/CTextFileChange.java | 3 +++ 15 files changed, 33 insertions(+), 3 deletions(-) diff --git a/core/org.eclipse.cdt.ui/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.ui/META-INF/MANIFEST.MF index b65e1fcf0f9..b0aaf7b00ba 100644 --- a/core/org.eclipse.cdt.ui/META-INF/MANIFEST.MF +++ b/core/org.eclipse.cdt.ui/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.cdt.ui; singleton:=true -Bundle-Version: 5.0.0.qualifier +Bundle-Version: 5.1.0.qualifier Bundle-Activator: org.eclipse.cdt.ui.CUIPlugin Bundle-Vendor: %providerName Bundle-Localization: plugin diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/settingswizards/IProjectSettingsWizardPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/settingswizards/IProjectSettingsWizardPage.java index 798daa818c1..113eb453d96 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/settingswizards/IProjectSettingsWizardPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/settingswizards/IProjectSettingsWizardPage.java @@ -12,6 +12,7 @@ import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; * mock object, which makes testing the strategies easy. * * @author Mike Kucera + * @since 5.1 */ public interface IProjectSettingsWizardPage { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/settingswizards/IProjectSettingsWizardPageStrategy.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/settingswizards/IProjectSettingsWizardPageStrategy.java index c4ac71bd6f7..4868b9726b9 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/settingswizards/IProjectSettingsWizardPageStrategy.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/settingswizards/IProjectSettingsWizardPageStrategy.java @@ -16,7 +16,7 @@ package org.eclipse.cdt.internal.ui.wizards.settingswizards; * the behavior that is specific to import and export. * * @author Mike Kucera - * + * @since 5.1 */ public interface IProjectSettingsWizardPageStrategy { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/settingswizards/ISettingsProcessor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/settingswizards/ISettingsProcessor.java index 77c1c689d6d..31d6ebfc660 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/settingswizards/ISettingsProcessor.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/settingswizards/ISettingsProcessor.java @@ -30,6 +30,7 @@ import org.eclipse.cdt.core.settings.model.ICFolderDescription; * * * @author Mike Kucera + * @since 5.1 */ public interface ISettingsProcessor { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/settingswizards/IncludePathsSettingsProcessor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/settingswizards/IncludePathsSettingsProcessor.java index 6428aa7d747..f1d54995e35 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/settingswizards/IncludePathsSettingsProcessor.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/settingswizards/IncludePathsSettingsProcessor.java @@ -31,6 +31,7 @@ import org.eclipse.cdt.internal.ui.CPluginImages; * A settings processor that imports and exports include paths. * * @author Mike Kucera + * @since 5.1 * */ public class IncludePathsSettingsProcessor extends SettingsProcessor { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/settingswizards/MacroSettingsProcessor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/settingswizards/MacroSettingsProcessor.java index ff8a3dca163..d9436d6f6c3 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/settingswizards/MacroSettingsProcessor.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/settingswizards/MacroSettingsProcessor.java @@ -35,6 +35,7 @@ import org.eclipse.cdt.internal.ui.CPluginImages; * A settings processor that imports and exports symbols. * * @author Mike Kucera + * @since 5.1 * */ public class MacroSettingsProcessor extends SettingsProcessor { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/settingswizards/ProjectSettingsExportStrategy.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/settingswizards/ProjectSettingsExportStrategy.java index 62b8a60f009..f45fff8b5aa 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/settingswizards/ProjectSettingsExportStrategy.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/settingswizards/ProjectSettingsExportStrategy.java @@ -33,10 +33,12 @@ import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; import org.eclipse.cdt.core.settings.model.ICFolderDescription; import org.eclipse.cdt.ui.CUIPlugin; + /** * Custom behavior for the Export wizard. * * @author Mike Kucera + * @since 5.1 * */ public class ProjectSettingsExportStrategy implements IProjectSettingsWizardPageStrategy { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/settingswizards/ProjectSettingsExportWizard.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/settingswizards/ProjectSettingsExportWizard.java index 9fd894e722f..86173b8bc88 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/settingswizards/ProjectSettingsExportWizard.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/settingswizards/ProjectSettingsExportWizard.java @@ -14,6 +14,9 @@ import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.ui.IExportWizard; import org.eclipse.ui.IWorkbench; +/** + * @since 5.1 + */ public class ProjectSettingsExportWizard extends ProjectSettingsWizard implements IExportWizard { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/settingswizards/ProjectSettingsImportStrategy.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/settingswizards/ProjectSettingsImportStrategy.java index a51dae49fd5..2d02b400779 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/settingswizards/ProjectSettingsImportStrategy.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/settingswizards/ProjectSettingsImportStrategy.java @@ -42,6 +42,7 @@ import org.eclipse.cdt.ui.CUIPlugin; * Custom behavior for the Import wizard. * * @author Mike Kucera + * @since 5.1 * */ public class ProjectSettingsImportStrategy implements IProjectSettingsWizardPageStrategy { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/settingswizards/ProjectSettingsImportWizard.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/settingswizards/ProjectSettingsImportWizard.java index ce80d7a1bc9..11900a15012 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/settingswizards/ProjectSettingsImportWizard.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/settingswizards/ProjectSettingsImportWizard.java @@ -14,6 +14,9 @@ import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.ui.IImportWizard; import org.eclipse.ui.IWorkbench; +/** + * @since 5.1 + */ public class ProjectSettingsImportWizard extends ProjectSettingsWizard implements IImportWizard { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/settingswizards/ProjectSettingsWizard.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/settingswizards/ProjectSettingsWizard.java index 80a1519819a..a144e0984b1 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/settingswizards/ProjectSettingsWizard.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/settingswizards/ProjectSettingsWizard.java @@ -15,6 +15,9 @@ import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.wizard.Wizard; import org.eclipse.ui.IWorkbench; +/** + * @since 5.1 + */ public abstract class ProjectSettingsWizard extends Wizard { private ProjectSettingsWizardPage mainPage; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/settingswizards/ProjectSettingsWizardPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/settingswizards/ProjectSettingsWizardPage.java index 0eb31c9a9d8..c930e96d0b3 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/settingswizards/ProjectSettingsWizardPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/settingswizards/ProjectSettingsWizardPage.java @@ -56,7 +56,7 @@ import org.eclipse.cdt.internal.ui.viewsupport.ListContentProvider; import org.eclipse.cdt.internal.ui.wizards.settingswizards.IProjectSettingsWizardPageStrategy.MessageType; /** - * + * @since 5.1 */ abstract public class ProjectSettingsWizardPage extends WizardPage implements IProjectSettingsWizardPage { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/settingswizards/SettingsImportExportException.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/settingswizards/SettingsImportExportException.java index 6de12451587..561f46368e4 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/settingswizards/SettingsImportExportException.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/settingswizards/SettingsImportExportException.java @@ -10,6 +10,12 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.wizards.settingswizards; +/** + * An exception that represents a problem with importing or exporting + * settings. + * + * @since 5.1 + */ public class SettingsImportExportException extends Exception { public SettingsImportExportException() { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/settingswizards/SettingsProcessor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/settingswizards/SettingsProcessor.java index 4b97e6e784e..813b0c06394 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/settingswizards/SettingsProcessor.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/settingswizards/SettingsProcessor.java @@ -22,12 +22,14 @@ import org.xml.sax.helpers.AttributesImpl; import org.eclipse.cdt.core.settings.model.ICFolderDescription; import org.eclipse.cdt.core.settings.model.ICLanguageSetting; import org.eclipse.cdt.core.settings.model.ICLanguageSettingEntry; +import org.eclipse.cdt.core.settings.model.ICSettingEntry; /** * Base class implementing standard import and export functionality * for a section of the file. * * @author Mike Kucera + * @since 5.1 */ public abstract class SettingsProcessor implements ISettingsProcessor { @@ -39,12 +41,15 @@ public abstract class SettingsProcessor implements ISettingsProcessor { /** + * Returns a constant from the ICSettingEntry interface. */ protected abstract int getSettingsType(); + protected abstract void writeSettings(ContentHandler content, ICLanguageSettingEntry setting) throws SettingsImportExportException; + protected abstract void readSettings(ICLanguageSetting setting, Element language) throws SettingsImportExportException; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/refactoring/CTextFileChange.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/refactoring/CTextFileChange.java index 8df6f81029e..018dabcf7b7 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/refactoring/CTextFileChange.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/refactoring/CTextFileChange.java @@ -50,6 +50,9 @@ public class CTextFileChange extends TextFileChange { } } + /** + * @since 5.1 + */ public CTextFileChange(String name, ITranslationUnit tu) { super(name, getFile(tu)); fTranslationUnit = tu;