From 7b8b0c57a7d518f66223c86efe2f1d751d52c48e Mon Sep 17 00:00:00 2001 From: Oleg Krasilnikov Date: Fri, 16 Mar 2007 15:35:49 +0000 Subject: [PATCH] Localization changes --- .../ui/newui/PreferredToolchainsTab.java | 11 +++-- .../ui/newui/messages.properties | 44 +++++++++++++++++++ .../ui/wizards/CCProjectWizard.java | 3 +- .../ui/wizards/CConfigWizardPage.java | 25 ++++++----- .../ui/wizards/CDTProjectWizard.java | 3 +- .../ui/wizards/CMainWizardPage.java | 30 ++++++++++--- .../managedbuilder/ui/wizards/CNewWizard.java | 3 +- .../ui/wizards/CProjectWizard.java | 5 ++- .../ui/wizards/CWizardHandler.java | 15 ++++--- .../managedbuilder/ui/wizards/CfgHolder.java | 3 +- .../ui/wizards/IDEWorkbenchMessages.java | 31 ------------- .../managedbuilder/ui/wizards/Messages.java | 31 ------------- .../ui/wizards/NewModelProjectWizard.java | 3 +- .../ui/wizards/StdBuildWizard.java | 3 +- .../ui/wizards/StdProjectTypeHandler.java | 5 ++- .../ui/wizards/messages.properties | 42 ------------------ 16 files changed, 111 insertions(+), 146 deletions(-) delete mode 100644 build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/IDEWorkbenchMessages.java delete mode 100644 build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/Messages.java delete mode 100644 build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/messages.properties diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/newui/PreferredToolchainsTab.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/newui/PreferredToolchainsTab.java index ad910088126..0023a8c0eb9 100644 --- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/newui/PreferredToolchainsTab.java +++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/newui/PreferredToolchainsTab.java @@ -14,7 +14,6 @@ import org.eclipse.cdt.core.settings.model.ICResourceDescription; import org.eclipse.cdt.managedbuilder.core.IToolChain; import org.eclipse.cdt.managedbuilder.ui.wizards.CMainWizardPage; import org.eclipse.cdt.managedbuilder.ui.wizards.ICWizardHandler; -import org.eclipse.cdt.managedbuilder.ui.wizards.IDEWorkbenchMessages; import org.eclipse.cdt.ui.newui.CDTPrefUtil; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionAdapter; @@ -48,7 +47,7 @@ public class PreferredToolchainsTab extends AbstractCBuildPropertyTab { c.setLayout(new GridLayout(2, true)); Label l1 = new Label(c, SWT.NONE); - l1.setText(org.eclipse.cdt.managedbuilder.ui.wizards.IDEWorkbenchMessages.getString("CMainWizardPage.0")); //$NON-NLS-1$ + l1.setText(Messages.getString("CMainWizardPage.0")); //$NON-NLS-1$ l1.setFont(parent.getFont()); l1.setLayoutData(new GridData(GridData.BEGINNING)); @@ -70,28 +69,28 @@ public class PreferredToolchainsTab extends AbstractCBuildPropertyTab { right.setLayout(new PageLayout()); Label l = new Label(c,SWT.WRAP | SWT.CENTER); - l.setText(IDEWorkbenchMessages.getString("PreferredToolchainsTab.0")); //$NON-NLS-1$ + l.setText(Messages.getString("PreferredToolchainsTab.0")); //$NON-NLS-1$ GridData gd = new GridData(GridData.CENTER); gd.horizontalSpan = 2; l.setLayoutData(gd); new Label(c,0).setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); pref1 = new Button(c, SWT.PUSH); - pref1.setText(IDEWorkbenchMessages.getString("PreferredToolchainsTab.1")); //$NON-NLS-1$ + pref1.setText(Messages.getString("PreferredToolchainsTab.1")); //$NON-NLS-1$ pref1.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); pref1.addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent e) { setPref(true); }} ); new Label(c,0).setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); pref0 = new Button(c, SWT.PUSH); - pref0.setText(IDEWorkbenchMessages.getString("PreferredToolchainsTab.2")); //$NON-NLS-1$ + pref0.setText(Messages.getString("PreferredToolchainsTab.2")); //$NON-NLS-1$ pref0.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); pref0.addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent e) { setPref(false); }} ); show_sup = new Button(c, SWT.CHECK); show_sup.setSelection(true); - show_sup.setText(org.eclipse.cdt.managedbuilder.ui.wizards.IDEWorkbenchMessages.getString("CMainWizardPage.1")); //$NON-NLS-1$ + show_sup.setText(Messages.getString("CMainWizardPage.1")); //$NON-NLS-1$ gd = new GridData(GridData.FILL_HORIZONTAL); gd.horizontalSpan = 2; show_sup.setLayoutData(gd); diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/newui/messages.properties b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/newui/messages.properties index 1f2e4e28dfc..a175d6b1c7c 100644 --- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/newui/messages.properties +++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/newui/messages.properties @@ -73,3 +73,47 @@ PrefPage_NewCDTWizard.1=\nduring project creation process WizardDefaultsTab.0=Show only supported toolchains, by default WizardDefaultsTab.1=Group old-style toolchains to folder WizardDefaultsTab.2=Show button on property pages +PreferredToolchainsTab.0=Preferred toolchain will be selected by default in Wizard +PreferredToolchainsTab.1=Make toolhain(s) preferred +PreferredToolchainsTab.2=Make toolhain(s) unpreferred +StdProjectTypeHandler.0=-- No toolchain -- +StdProjectTypeHandler.2=Default +StdProjectTypeHandler.3=creation Make project: IBuilder is null +CConfigWizardPage.0=Select Configurations +CConfigWizardPage.1=Select platforms and configurations you wish to deploy on +CConfigWizardPage.4=Project type: +CConfigWizardPage.5=Tool-chains: +CConfigWizardPage.6=Configurations: +CConfigWizardPage.7=Select all +CConfigWizardPage.8=Deselect all +CConfigWizardPage.9=Edit properties after project creation +CConfigWizardPage.10=At least one configuration should be available. Project cannot be created. +CConfigWizardPage.11=At least one configuration should be selected. Please check needed configurations. +CConfigWizardPage.12=Use "Advanced settings" button to edit project's properties.\n\nAdditional configurations can be added after project creation.\nUse "Manage configurations" buttons either on toolbar or on property pages. +CConfigWizardPage.13=Advanced settings... +CMainWizardPage.0=Project types: +CMainWizardPage.1=Show project types and toolchains only if they are supported on the platform +CMainWizardPage.2=Edit properties after project creation +CMainWizardPage.3=No project types available. Project cannot be created +CMainWizardPage.4=At least one toolchain should be selected \! +CMainWizardPage.5=Cannot create ICProjectTypeHandler : +CMainWizardPage.6=File with specified name already exists \! +CMainWizardPage.7=Directory with specified name already exists \! +WizardNewProjectCreationPage_nameLabel= +WizardNewProjectCreationPage_projectNameEmpty= +WizardNewProjectCreationPage_projectExistsMessage= +CNewWizard.0=Others +CWizardHandler.0=Toolchain: +CWizardHandler.1=Tool chain is a set of tools\n +CWizardHandler.2=(compiler, linker, assembler)\n +CWizardHandler.3=intended to build your project.\n +CWizardHandler.4=Additional tools, like debugger,\n +CWizardHandler.5=can be assotiated with tool chain. +CWizardHandler.6=Cannot create managed project with NULL configuration +NewModelProjectWizard.0=CDT project +NewModelProjectWizard.1=Create CDT project of selected type +NewModelProjectWizard.2=C++ project +NewModelProjectWizard.3=Create C++ project of selected type +NewModelProjectWizard.4=C project +NewModelProjectWizard.5=Create C project of selected type +StdBuildWizard.0=Makefile project diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/CCProjectWizard.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/CCProjectWizard.java index ad1d847bfdb..a69bb64a5f7 100644 --- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/CCProjectWizard.java +++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/CCProjectWizard.java @@ -12,6 +12,7 @@ package org.eclipse.cdt.managedbuilder.ui.wizards; import org.eclipse.cdt.core.CCProjectNature; import org.eclipse.cdt.core.CProjectNature; +import org.eclipse.cdt.managedbuilder.ui.newui.Messages; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.NullProgressMonitor; @@ -19,7 +20,7 @@ import org.eclipse.core.runtime.NullProgressMonitor; public class CCProjectWizard extends NewModelProjectWizard { public CCProjectWizard() { - super(IDEWorkbenchMessages.getString("NewModelProjectWizard.2"), IDEWorkbenchMessages.getString("NewModelProjectWizard.3")); //$NON-NLS-1$ //$NON-NLS-2$ + super(Messages.getString("NewModelProjectWizard.2"), Messages.getString("NewModelProjectWizard.3")); //$NON-NLS-1$ //$NON-NLS-2$ } protected String[] getNatures() { diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/CConfigWizardPage.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/CConfigWizardPage.java index 2f596bdff9e..8c9a579711d 100644 --- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/CConfigWizardPage.java +++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/CConfigWizardPage.java @@ -16,6 +16,7 @@ import org.eclipse.cdt.managedbuilder.core.IProjectType; import org.eclipse.cdt.managedbuilder.core.IToolChain; import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager; import org.eclipse.cdt.managedbuilder.ui.newui.ManagedBuilderUIImages; +import org.eclipse.cdt.managedbuilder.ui.newui.Messages; import org.eclipse.cdt.ui.newui.CDTPrefUtil; import org.eclipse.core.resources.IProject; import org.eclipse.jface.resource.ImageDescriptor; @@ -46,9 +47,9 @@ public class CConfigWizardPage extends MBSCustomPage { public static final String PAGE_ID = "org.eclipse.cdt.managedbuilder.ui.wizard.CConfigWizardPage"; //$NON-NLS-1$ private static final Image IMG = ManagedBuilderUIImages.get(ManagedBuilderUIImages.IMG_BUILD_CONFIG); - private static final String TITLE = IDEWorkbenchMessages.getString("CConfigWizardPage.0"); //$NON-NLS-1$ - private static final String MESSAGE = IDEWorkbenchMessages.getString("CConfigWizardPage.1"); //$NON-NLS-1$ - private static final String COMMENT = IDEWorkbenchMessages.getString("CConfigWizardPage.12"); //$NON-NLS-1$ + private static final String TITLE = Messages.getString("CConfigWizardPage.0"); //$NON-NLS-1$ + private static final String MESSAGE = Messages.getString("CConfigWizardPage.1"); //$NON-NLS-1$ + private static final String COMMENT = Messages.getString("CConfigWizardPage.12"); //$NON-NLS-1$ private static final String EMPTY_STR = ""; //$NON-NLS-1$ private ICWizardHandler handler; @@ -87,11 +88,11 @@ public class CConfigWizardPage extends MBSCustomPage { parent.setLayoutData(new GridData(GridData.FILL_BOTH)); parent.setLayout(new GridLayout(3, false)); - setupLabel(parent, IDEWorkbenchMessages.getString("CConfigWizardPage.4"), 1, GridData.BEGINNING); //$NON-NLS-1$ + setupLabel(parent, Messages.getString("CConfigWizardPage.4"), 1, GridData.BEGINNING); //$NON-NLS-1$ l_projtype = setupLabel(parent, EMPTY_STR, 2, GridData.FILL_HORIZONTAL); - setupLabel(parent, IDEWorkbenchMessages.getString("CConfigWizardPage.5"), 1, GridData.BEGINNING); //$NON-NLS-1$ + setupLabel(parent, Messages.getString("CConfigWizardPage.5"), 1, GridData.BEGINNING); //$NON-NLS-1$ l_chains = setupLabel(parent, EMPTY_STR, 2, GridData.FILL_HORIZONTAL); - setupLabel(parent, IDEWorkbenchMessages.getString("CConfigWizardPage.6"), 3, GridData.BEGINNING); //$NON-NLS-1$ + setupLabel(parent, Messages.getString("CConfigWizardPage.6"), 3, GridData.BEGINNING); //$NON-NLS-1$ table = new Table(parent, SWT.BORDER | SWT.CHECK); GridData gd = new GridData(GridData.FILL_BOTH); @@ -122,7 +123,7 @@ public class CConfigWizardPage extends MBSCustomPage { c.setLayout(new GridLayout(1, false)); Button b1 = new Button(c, SWT.PUSH); - b1.setText(IDEWorkbenchMessages.getString("CConfigWizardPage.7")); //$NON-NLS-1$ + b1.setText(Messages.getString("CConfigWizardPage.7")); //$NON-NLS-1$ b1.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); b1.addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent e) { @@ -132,7 +133,7 @@ public class CConfigWizardPage extends MBSCustomPage { }}); Button b2 = new Button(c, SWT.PUSH); - b2.setText(IDEWorkbenchMessages.getString("CConfigWizardPage.8")); //$NON-NLS-1$ + b2.setText(Messages.getString("CConfigWizardPage.8")); //$NON-NLS-1$ b2.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); b2.addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent e) { @@ -145,7 +146,7 @@ public class CConfigWizardPage extends MBSCustomPage { new Label(c, 0).setLayoutData(new GridData(GridData.FILL_BOTH)); Button b3 = new Button(c, SWT.PUSH); - b3.setText(IDEWorkbenchMessages.getString("CConfigWizardPage.13")); //$NON-NLS-1$ + b3.setText(Messages.getString("CConfigWizardPage.13")); //$NON-NLS-1$ b3.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); b3.addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent e) { @@ -202,12 +203,12 @@ public class CConfigWizardPage extends MBSCustomPage { if (!isVisible) return true; if (table.getItemCount() == 0) { - errorMessage = IDEWorkbenchMessages.getString("CConfigWizardPage.10"); //$NON-NLS-1$ + errorMessage = Messages.getString("CConfigWizardPage.10"); //$NON-NLS-1$ message = errorMessage; return false; } if (tv.getCheckedElements().length == 0) { - errorMessage = IDEWorkbenchMessages.getString("CConfigWizardPage.11"); //$NON-NLS-1$ + errorMessage = Messages.getString("CConfigWizardPage.11"); //$NON-NLS-1$ message = errorMessage; return false; } @@ -228,7 +229,7 @@ public class CConfigWizardPage extends MBSCustomPage { IToolChain[] tc = handler.getSelectedToolChains(); for (int i=0; i < tc.length; i++) { s = s + ((tc[i] == null) ? - IDEWorkbenchMessages.getString("StdProjectTypeHandler.0") : //$NON-NLS-1$ + Messages.getString("StdProjectTypeHandler.0") : //$NON-NLS-1$ tc[i].getName()); if (i < tc.length - 1) s = s + ", "; //$NON-NLS-1$ } diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/CDTProjectWizard.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/CDTProjectWizard.java index 8b87504e80d..ac4fb26a00d 100644 --- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/CDTProjectWizard.java +++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/CDTProjectWizard.java @@ -10,12 +10,13 @@ *******************************************************************************/ package org.eclipse.cdt.managedbuilder.ui.wizards; +import org.eclipse.cdt.managedbuilder.ui.newui.Messages; import org.eclipse.core.resources.IProject; public class CDTProjectWizard extends NewModelProjectWizard { public CDTProjectWizard() { - super(IDEWorkbenchMessages.getString("NewModelProjectWizard.0"), IDEWorkbenchMessages.getString("NewModelProjectWizard.1")); //$NON-NLS-1$ //$NON-NLS-2$ + super(Messages.getString("NewModelProjectWizard.0"), Messages.getString("NewModelProjectWizard.1")); //$NON-NLS-1$ //$NON-NLS-2$ } protected String[] getNatures() { diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/CMainWizardPage.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/CMainWizardPage.java index 21de7f36132..cfa1d79b4b7 100644 --- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/CMainWizardPage.java +++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/CMainWizardPage.java @@ -9,10 +9,12 @@ * Intel Corporation - initial API and implementation *******************************************************************************/ package org.eclipse.cdt.managedbuilder.ui.wizards; - import java.util.Set; + import java.io.File; +import java.util.Set; import java.util.TreeSet; import org.eclipse.cdt.managedbuilder.core.IToolChain; +import org.eclipse.cdt.managedbuilder.ui.newui.Messages; import org.eclipse.cdt.managedbuilder.ui.newui.PageLayout; import org.eclipse.cdt.ui.newui.CDTPrefUtil; import org.eclipse.core.resources.IProject; @@ -134,7 +136,7 @@ import org.eclipse.ui.internal.ide.dialogs.ProjectContentsLocationArea.IErrorMes c.setLayout(new GridLayout(2, true)); Label l1 = new Label(c, SWT.NONE); - l1.setText(org.eclipse.cdt.managedbuilder.ui.wizards.IDEWorkbenchMessages.getString("CMainWizardPage.0")); //$NON-NLS-1$ + l1.setText(Messages.getString("CMainWizardPage.0")); //$NON-NLS-1$ l1.setFont(parent.getFont()); l1.setLayoutData(new GridData(GridData.BEGINNING)); @@ -157,7 +159,7 @@ import org.eclipse.ui.internal.ide.dialogs.ProjectContentsLocationArea.IErrorMes right.setLayout(new PageLayout()); show_sup = new Button(c, SWT.CHECK); - show_sup.setText(org.eclipse.cdt.managedbuilder.ui.wizards.IDEWorkbenchMessages.getString("CMainWizardPage.1")); //$NON-NLS-1$ + show_sup.setText(Messages.getString("CMainWizardPage.1")); //$NON-NLS-1$ GridData gd = new GridData(GridData.FILL_HORIZONTAL); gd.horizontalSpan = 2; show_sup.setLayoutData(gd); @@ -337,9 +339,10 @@ import org.eclipse.ui.internal.ide.dialogs.ProjectContentsLocationArea.IErrorMes return false; } + boolean bad = true; // should we treat existing project as error + IProject handle = getProjectHandle(); if (handle.exists()) { - boolean bad = true; if (getWizard() instanceof NewModelProjectWizard) { NewModelProjectWizard w = (NewModelProjectWizard)getWizard(); if (w.lastProjectName != null && w.lastProjectName.equals(getProjectName())) @@ -347,6 +350,19 @@ import org.eclipse.ui.internal.ide.dialogs.ProjectContentsLocationArea.IErrorMes } if (bad) { setErrorMessage(IDEWorkbenchMessages.WizardNewProjectCreationPage_projectExistsMessage); + return false; + } + } + + if (bad) { // skip this check if project already created + IPath p = getProjectLocation(); + if (p == null) p = ResourcesPlugin.getWorkspace().getRoot().getLocation(); + File f = p.append(getProjectName()).toFile(); + if (f.exists()) { + if (f.isDirectory()) + setErrorMessage(Messages.getString("CMainWizardPage.6")); //$NON-NLS-1$ + else + setErrorMessage(Messages.getString("CMainWizardPage.7")); //$NON-NLS-1$ return false; } } @@ -361,7 +377,7 @@ import org.eclipse.ui.internal.ide.dialogs.ProjectContentsLocationArea.IErrorMes } if (tree.getItemCount() == 0) { - setErrorMessage(org.eclipse.cdt.managedbuilder.ui.wizards.IDEWorkbenchMessages.getString("CMainWizardPage.3")); //$NON-NLS-1$ + setErrorMessage(Messages.getString("CMainWizardPage.3")); //$NON-NLS-1$ return false; } @@ -375,7 +391,7 @@ import org.eclipse.ui.internal.ide.dialogs.ProjectContentsLocationArea.IErrorMes IToolChain tcs[] = h_selected.getSelectedToolChains(); int cnt = tcs != null ? tcs.length : 0; if (cnt == 0) { - setErrorMessage(org.eclipse.cdt.managedbuilder.ui.wizards.IDEWorkbenchMessages.getString("CMainWizardPage.4")); //$NON-NLS-1$ + setErrorMessage(Messages.getString("CMainWizardPage.4")); //$NON-NLS-1$ return false; } } @@ -419,7 +435,7 @@ import org.eclipse.ui.internal.ide.dialogs.ProjectContentsLocationArea.IErrorMes try { w = (ICNewWizard) elements[k].createExecutableExtension(CLASS_NAME); } catch (CoreException e) { - System.out.println(org.eclipse.cdt.managedbuilder.ui.wizards.IDEWorkbenchMessages.getString("CMainWizardPage.5") + e.getLocalizedMessage()); //$NON-NLS-1$ + System.out.println(Messages.getString("CMainWizardPage.5") + e.getLocalizedMessage()); //$NON-NLS-1$ return null; } if (w == null) return null; diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/CNewWizard.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/CNewWizard.java index 271bc066045..caee4aff806 100644 --- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/CNewWizard.java +++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/CNewWizard.java @@ -20,6 +20,7 @@ import org.eclipse.cdt.managedbuilder.core.IConfiguration; import org.eclipse.cdt.managedbuilder.core.IProjectType; import org.eclipse.cdt.managedbuilder.core.IToolChain; import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager; +import org.eclipse.cdt.managedbuilder.ui.newui.Messages; import org.eclipse.cdt.ui.newui.CDTPrefUtil; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Tree; @@ -83,7 +84,7 @@ public class CNewWizard extends AbstractCWizard { if (CDTPrefUtil.getBool(CDTPrefUtil.KEY_OTHERS)) { if (oldsRoot == null) { oldsRoot = new TreeItem(tree, SWT.NONE); - oldsRoot.setText(IDEWorkbenchMessages.getString("CNewWizard.0")); //$NON-NLS-1$ + oldsRoot.setText(Messages.getString("CNewWizard.0")); //$NON-NLS-1$ oldsRoot.setData(new DummyHandler(parent)); oldsRoot.setImage(IMG0); } diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/CProjectWizard.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/CProjectWizard.java index 2f666a2bf68..2a10b15cd07 100644 --- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/CProjectWizard.java +++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/CProjectWizard.java @@ -11,6 +11,7 @@ package org.eclipse.cdt.managedbuilder.ui.wizards; import org.eclipse.cdt.core.CProjectNature; +import org.eclipse.cdt.managedbuilder.ui.newui.Messages; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.NullProgressMonitor; @@ -18,8 +19,8 @@ import org.eclipse.core.runtime.NullProgressMonitor; public class CProjectWizard extends NewModelProjectWizard { public CProjectWizard() { - super(IDEWorkbenchMessages.getString("NewModelProjectWizard.4"), //$NON-NLS-1$ - IDEWorkbenchMessages.getString("NewModelProjectWizard.5")); //$NON-NLS-1$ + super(Messages.getString("NewModelProjectWizard.4"), //$NON-NLS-1$ + Messages.getString("NewModelProjectWizard.5")); //$NON-NLS-1$ } protected String[] getNatures() { diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/CWizardHandler.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/CWizardHandler.java index 9ca7229f406..9a41787df80 100644 --- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/CWizardHandler.java +++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/CWizardHandler.java @@ -30,6 +30,7 @@ import org.eclipse.cdt.managedbuilder.internal.core.ManagedBuildInfo; import org.eclipse.cdt.managedbuilder.internal.core.ManagedProject; import org.eclipse.cdt.managedbuilder.ui.newui.ManagedBuilderUIImages; import org.eclipse.cdt.managedbuilder.ui.newui.ManagedBuilderUIPlugin; +import org.eclipse.cdt.managedbuilder.ui.newui.Messages; import org.eclipse.cdt.ui.newui.CDTPrefUtil; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.CoreException; @@ -55,13 +56,13 @@ public class CWizardHandler implements ICWizardHandler { private static final Image IMG0 = ManagedBuilderUIImages.get(ManagedBuilderUIImages.IMG_EMPTY); private static final Image IMG1 = ManagedBuilderUIImages.get(ManagedBuilderUIImages.IMG_PREFERRED); - private static final String head = IDEWorkbenchMessages.getString("CWizardHandler.0"); //$NON-NLS-1$ + private static final String head = Messages.getString("CWizardHandler.0"); //$NON-NLS-1$ private static final String tooltip = - IDEWorkbenchMessages.getString("CWizardHandler.1")+ //$NON-NLS-1$ - IDEWorkbenchMessages.getString("CWizardHandler.2") + //$NON-NLS-1$ - IDEWorkbenchMessages.getString("CWizardHandler.3") + //$NON-NLS-1$ - IDEWorkbenchMessages.getString("CWizardHandler.4") + //$NON-NLS-1$ - IDEWorkbenchMessages.getString("CWizardHandler.5"); //$NON-NLS-1$ + Messages.getString("CWizardHandler.1")+ //$NON-NLS-1$ + Messages.getString("CWizardHandler.2") + //$NON-NLS-1$ + Messages.getString("CWizardHandler.3") + //$NON-NLS-1$ + Messages.getString("CWizardHandler.4") + //$NON-NLS-1$ + Messages.getString("CWizardHandler.5"); //$NON-NLS-1$ protected SortedMap tcs; private String name; @@ -175,7 +176,7 @@ public class CWizardHandler implements ICWizardHandler { if (cfgs[0].cfg == null) { throw new CoreException(new Status(IStatus.ERROR, ManagedBuilderUIPlugin.getUniqueIdentifier(), - IDEWorkbenchMessages.getString("CWizardHandler.6"))); //$NON-NLS-1$ + Messages.getString("CWizardHandler.6"))); //$NON-NLS-1$ } ManagedProject mProj = new ManagedProject(project, cfgs[0].cfg.getProjectType()); diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/CfgHolder.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/CfgHolder.java index 8c7065a06e5..db1fd7d9b3a 100644 --- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/CfgHolder.java +++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/CfgHolder.java @@ -14,6 +14,7 @@ import java.util.ArrayList; import org.eclipse.cdt.managedbuilder.core.IConfiguration; import org.eclipse.cdt.managedbuilder.core.IToolChain; +import org.eclipse.cdt.managedbuilder.ui.newui.Messages; /* * This class is intended for data exchange between @@ -33,7 +34,7 @@ public class CfgHolder { cfg = _cfg; if (cfg == null) { if (tc == null) - name = IDEWorkbenchMessages.getString("StdProjectTypeHandler.2"); //$NON-NLS-1$ + name = Messages.getString("StdProjectTypeHandler.2"); //$NON-NLS-1$ else name = tc.getName(); } else diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/IDEWorkbenchMessages.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/IDEWorkbenchMessages.java deleted file mode 100644 index 0583bd327d8..00000000000 --- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/IDEWorkbenchMessages.java +++ /dev/null @@ -1,31 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 Intel Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Intel Corporation - initial API and implementation - *******************************************************************************/package org.eclipse.cdt.managedbuilder.ui.wizards; - -import java.util.MissingResourceException; -import java.util.ResourceBundle; - -public class IDEWorkbenchMessages { - private static final String BUNDLE_NAME = "org.eclipse.cdt.managedbuilder.ui.wizards.messages"; //$NON-NLS-1$ - - private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle - .getBundle(BUNDLE_NAME); - - private IDEWorkbenchMessages() { - } - - public static String getString(String key) { - try { - return RESOURCE_BUNDLE.getString(key); - } catch (MissingResourceException e) { - return '!' + key + '!'; - } - } -} diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/Messages.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/Messages.java deleted file mode 100644 index eb6c28b1a68..00000000000 --- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/Messages.java +++ /dev/null @@ -1,31 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 Intel Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Intel Corporation - initial API and implementation - *******************************************************************************/package org.eclipse.cdt.managedbuilder.ui.wizards; - -import java.util.MissingResourceException; -import java.util.ResourceBundle; - -public class Messages { - private static final String BUNDLE_NAME = "org.eclipse.cdt.managedbuilder.ui.wizards.messages"; //$NON-NLS-1$ - - private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle - .getBundle(BUNDLE_NAME); - - private Messages() { - } - - public static String getString(String key) { - try { - return RESOURCE_BUNDLE.getString(key); - } catch (MissingResourceException e) { - return '!' + key + '!'; - } - } -} diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/NewModelProjectWizard.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/NewModelProjectWizard.java index 53eb079fc43..27e154156f5 100644 --- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/NewModelProjectWizard.java +++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/NewModelProjectWizard.java @@ -24,6 +24,7 @@ import org.eclipse.cdt.core.settings.model.ICProjectDescription; import org.eclipse.cdt.managedbuilder.core.BuildException; import org.eclipse.cdt.managedbuilder.core.IToolChain; import org.eclipse.cdt.managedbuilder.ui.newui.ManagedBuilderUIPlugin; +import org.eclipse.cdt.managedbuilder.ui.newui.Messages; import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IProjectDescription; @@ -68,7 +69,7 @@ public abstract class NewModelProjectWizard extends BasicNewResourceWizard imple protected List localPages = new ArrayList(); // replacing Wizard.pages since we have to delete them public NewModelProjectWizard() { - this(IDEWorkbenchMessages.getString("NewModelProjectWizard.0"),IDEWorkbenchMessages.getString("NewModelProjectWizard.1")); //$NON-NLS-1$ //$NON-NLS-2$ + this(Messages.getString("NewModelProjectWizard.0"),Messages.getString("NewModelProjectWizard.1")); //$NON-NLS-1$ //$NON-NLS-2$ } public NewModelProjectWizard(String title, String desc) { diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/StdBuildWizard.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/StdBuildWizard.java index 7793ffde4d8..a9b05e9133a 100644 --- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/StdBuildWizard.java +++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/StdBuildWizard.java @@ -12,6 +12,7 @@ package org.eclipse.cdt.managedbuilder.ui.wizards; import org.eclipse.cdt.managedbuilder.core.IToolChain; import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager; +import org.eclipse.cdt.managedbuilder.ui.newui.Messages; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Tree; import org.eclipse.swt.widgets.TreeItem; @@ -19,7 +20,7 @@ import org.eclipse.swt.widgets.TreeItem; public class StdBuildWizard extends AbstractCWizard { public void createItems(Tree tree, boolean supportedOnly) { - StdProjectTypeHandler h = new StdProjectTypeHandler(IDEWorkbenchMessages.getString("StdBuildWizard.0"), IMG0, parent); //$NON-NLS-1$ + StdProjectTypeHandler h = new StdProjectTypeHandler(Messages.getString("StdBuildWizard.0"), IMG0, parent); //$NON-NLS-1$ h.addTc(null); // add default toolchain IToolChain[] tcs = ManagedBuildManager.getRealToolChains(); for (int i=0; i