mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-12 19:45:22 +02:00
Code Issues Wiki Activity

Propagating bug fixes to branch.

Browse source
This commit is contained in:
Hoda Amer 2004-07-07 19:07:08 +00:00
parent c6bd3609a2
commit 4b33c0a9ef
3 changed files with 17 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
core/org.eclipse.cdt.ui/ChangeLog
View file

@ -1,3 +1,6 @@
2004-07-07 Hoda Amer
Fix for PR 69411: Bad label: WizardNewFileCreationPage.progress
2004-07-06 Chris Weibe 2004-07-06 Chris Weibe
Fix for PR 69199 Fix for PR 69199

9
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/NewWizardMessages.properties
View file

@ -430,4 +430,11 @@ OutputLocationDialog.ChooseOutputFolder.description=&Choose the folder for the b
ClasspathContainerWizard.pagecreationerror.title= Library Wizard ClasspathContainerWizard.pagecreationerror.title= Library Wizard
ClasspathContainerWizard.pagecreationerror.message=Wizard page creation failed. Check log for details. ClasspathContainerWizard.pagecreationerror.message=Wizard page creation failed. Check log for details.
# --- New File ---
WizardNewFileCreationPage.progress = Creating
WizardNewFileCreationPage.errorTitle = Creation Problems
WizardNewFileCreationPage.fileLabel = File &name:
WizardNewFileCreationPage.file = file
WizardNewFileCreationPage.internalErrorTitle = Creation problems
WizardNewFileCreationPage.internalErrorMessage = Internal error: {0}
WizardNewFileCreationPage.fileExistsMessage = A file ''{0}'' already exists in the file system.

13
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/NewClassWizardPage.java
View file

@ -84,7 +84,6 @@ import org.eclipse.swt.widgets.Event;
import org.eclipse.swt.widgets.Listener; import org.eclipse.swt.widgets.Listener;
import org.eclipse.ui.actions.WorkspaceModifyOperation; import org.eclipse.ui.actions.WorkspaceModifyOperation;
import org.eclipse.ui.dialogs.ContainerGenerator; import org.eclipse.ui.dialogs.ContainerGenerator;
import org.eclipse.ui.internal.WorkbenchMessages;
import org.eclipse.ui.internal.WorkbenchPlugin; import org.eclipse.ui.internal.WorkbenchPlugin;
/** /**
@ -684,7 +683,7 @@ public class NewClassWizardPage extends WizardPage implements Listener {
//createdClass= (IStructure)headerWC.getElement(getNewClassName()); //createdClass= (IStructure)headerWC.getElement(getNewClassName());
createdClass= headerWC.getElement(getNewClassName()); createdClass= headerWC.getElement(getNewClassName());
} catch (CModelException cme) { } catch (CModelException cme) {
MessageDialog.openError(getContainer().getShell(), WorkbenchMessages.getString("WizardNewFileCreationPage.internalErrorTitle"), cme.getMessage()); //$NON-NLS-2$ //$NON-NLS-1$ MessageDialog.openError(getContainer().getShell(), NewWizardMessages.getString("WizardNewFileCreationPage.internalErrorTitle"), cme.getMessage()); //$NON-NLS-2$ //$NON-NLS-1$
} finally { } finally {
if (headerWC != null) { if (headerWC != null) {
headerWC.destroy(); headerWC.destroy();
@ -700,7 +699,7 @@ public class NewClassWizardPage extends WizardPage implements Listener {
bodyWC.reconcile(); bodyWC.reconcile();
bodyWC.commit(true, monitor); bodyWC.commit(true, monitor);
} catch (CModelException cme) { } catch (CModelException cme) {
MessageDialog.openError(getContainer().getShell(), WorkbenchMessages.getString("WizardNewFileCreationPage.internalErrorTitle"), cme.getMessage()); //$NON-NLS-2$ //$NON-NLS-1$ MessageDialog.openError(getContainer().getShell(), NewWizardMessages.getString("WizardNewFileCreationPage.internalErrorTitle"), cme.getMessage()); //$NON-NLS-2$ //$NON-NLS-1$
} finally { } finally {
if (bodyWC != null) { if (bodyWC != null) {
bodyWC.destroy(); bodyWC.destroy();
@ -743,7 +742,7 @@ public class NewClassWizardPage extends WizardPage implements Listener {
InterruptedException InterruptedException
{ {
try { try {
monitor.beginTask(WorkbenchMessages.getString("WizardNewFileCreationPage.progress"), 2000); //$NON-NLS-1$ monitor.beginTask(NewWizardMessages.getString("WizardNewFileCreationPage.progress"), 2000); //$NON-NLS-1$
if(!(containerExists(containerPath))){ if(!(containerExists(containerPath))){
ContainerGenerator generator = new ContainerGenerator(containerPath); ContainerGenerator generator = new ContainerGenerator(containerPath);
generator.generateContainer(new SubProgressMonitor(monitor, 1000)); generator.generateContainer(new SubProgressMonitor(monitor, 1000));
@ -763,14 +762,14 @@ public class NewClassWizardPage extends WizardPage implements Listener {
if (e.getTargetException() instanceof CoreException) { if (e.getTargetException() instanceof CoreException) {
ErrorDialog.openError( ErrorDialog.openError(
getContainer().getShell(), // Was Utilities.getFocusShell() getContainer().getShell(), // Was Utilities.getFocusShell()
WorkbenchMessages.getString("WizardNewFileCreationPage.errorTitle"), //$NON-NLS-1$ NewWizardMessages.getString("WizardNewFileCreationPage.errorTitle"), //$NON-NLS-1$
null, // no special message null, // no special message
((CoreException) e.getTargetException()).getStatus()); ((CoreException) e.getTargetException()).getStatus());
} }
else { else {
// CoreExceptions are handled above, but unexpected runtime exceptions and errors may still occur. // CoreExceptions are handled above, but unexpected runtime exceptions and errors may still occur.
WorkbenchPlugin.log(MessageFormat.format("Exception in {0}.getNewFile(): {1}", new Object[] {getClass().getName(), e.getTargetException()}));//$NON-NLS-1$ CUIPlugin.getDefault().logErrorMessage(MessageFormat.format("Exception in {0}.getNewFile(): {1}", new Object[] {getClass().getName(), e.getTargetException()}));//$NON-NLS-1$
MessageDialog.openError(getContainer().getShell(), WorkbenchMessages.getString("WizardNewFileCreationPage.internalErrorTitle"), WorkbenchMessages.format("WizardNewFileCreationPage.internalErrorMessage", new Object[] {e.getTargetException().getMessage()})); //$NON-NLS-2$ //$NON-NLS-1$ MessageDialog.openError(getContainer().getShell(), NewWizardMessages.getString("WizardNewFileCreationPage.internalErrorTitle"), MessageFormat.format("WizardNewFileCreationPage.internalErrorMessage", new Object[] {e.getTargetException().getMessage()})); //$NON-NLS-2$ //$NON-NLS-1$
} }
return null; return null;
} }