Attachment 3633 Details for Bug 32319 – Patch to be applied post RC1

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Patch to be applied post RC1

32319.txt (text/plain), 5.07 KB, created by Tod Creasey

on 2003-02-21 11:29:22 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Tod Creasey

Created: 2003-02-21 11:29:22 EST

Size: 5.07 KB

patch

obsolete

>Index: Eclipse UI/org/eclipse/ui/actions/Messages.java
>===================================================================
>RCS file: Eclipse UI/org/eclipse/ui/actions/Messages.java
>diff -N Eclipse UI/org/eclipse/ui/actions/Messages.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ Eclipse UI/org/eclipse/ui/actions/Messages.java	21 Feb 2003 16:28:37 -0000
>@@ -0,0 +1,35 @@
>+/*
>+ * Created on Feb 21, 2003
>+ *
>+ * To change this generated comment go to 
>+ * Window>Preferences>Java>Code Generation>Code and Comments
>+ */
>+package org.eclipse.ui.actions;
>+
>+import java.util.MissingResourceException;
>+import java.util.ResourceBundle;
>+
>+/**
>+ * @author tod
>+ *
>+ * To change this generated comment go to 
>+ * Window>Preferences>Java>Code Generation>Code and Comments
>+ */
>+public class Messages {
>+
>+	private static final String BUNDLE_NAME = "org.eclipse.jface.wizard.test"; //$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 + '!';
>+		}
>+	}
>+}
>Index: Eclipse UI/org/eclipse/ui/actions/NewExampleAction.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/actions/NewExampleAction.java,v
>retrieving revision 1.3
>diff -u -r1.3 NewExampleAction.java
>--- Eclipse UI/org/eclipse/ui/actions/NewExampleAction.java	17 Feb 2003 23:51:27 -0000	1.3
>+++ Eclipse UI/org/eclipse/ui/actions/NewExampleAction.java	21 Feb 2003 16:28:37 -0000
>@@ -111,6 +111,7 @@
> 		Shell parent = window.getShell();
> 		WizardDialog dialog = new WizardDialog(parent, wizard);
> 		dialog.create();
>+		wizard.setWindowTitle(WorkbenchMessages.getString(Messages.getString("NewExampleAction.NewExample.title_1"))); //$NON-NLS-1$
> 		dialog.getShell().setSize(
> 			Math.max(SIZING_WIZARD_WIDTH, dialog.getShell().getSize().x),
> 			SIZING_WIZARD_HEIGHT);
>Index: Eclipse UI/org/eclipse/ui/internal/messages.properties
>===================================================================
>RCS file: /home/eclipse/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/messages.properties,v
>retrieving revision 1.83
>diff -u -r1.83 messages.properties
>--- Eclipse UI/org/eclipse/ui/internal/messages.properties	21 Feb 2003 06:18:02 -0000	1.83
>+++ Eclipse UI/org/eclipse/ui/internal/messages.properties	21 Feb 2003 16:28:38 -0000
>@@ -646,6 +646,9 @@
> ZipExport.unableToClose = Unable to close destination file: {0}
> ZipExport.errorOnResource = Error exporting {0}
> 
>+# --- New Example ---
>+NewExample.title = New Example
>+
> # --- New Project ---
> NewProject.title = New Project
> WizardNewProjectCreationPage.description = Create a new project
>Index: Eclipse UI/org/eclipse/ui/internal/dialogs/NewWizardNewPage.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/NewWizardNewPage.java,v
>retrieving revision 1.6
>diff -u -r1.6 NewWizardNewPage.java
>--- Eclipse UI/org/eclipse/ui/internal/dialogs/NewWizardNewPage.java	17 Feb 2003 21:46:33 -0000	1.6
>+++ Eclipse UI/org/eclipse/ui/internal/dialogs/NewWizardNewPage.java	21 Feb 2003 16:28:38 -0000
>@@ -125,9 +125,9 @@
> 		categoryTreeViewer.setLabelProvider(new WorkbenchLabelProvider());
> 		categoryTreeViewer.setSorter(NewWizardCollectionSorter.INSTANCE);
> 		categoryTreeViewer.addSelectionChangedListener(this);
>-		if (wizardCategories.getParent(wizardCategories) == null)
>+		if (wizardCategories.getParent(wizardCategories) == null) {
> 			categoryTreeViewer.setInput(wizardCategories);
>-		else
>+		} else
> 			categoryTreeViewer.setInput(new RootElementProxy(wizardCategories));
> 		tree.setFont(wizardFont);
> 
>@@ -248,10 +248,11 @@
> 		if (currentSelection != selectedCategory) {
> 			page.selectWizardNode(null);
> 			wizardSelectionViewer.setInput(selectedCategory);
>-			if(selectedCategory instanceof WizardCollectionElement){
>-				Object[] children = ((WizardCollectionElement) selectedCategory).getWizards();
>-				if(children.length == 1)
>-					selectWizard(children[0]);	
>+			if (selectedCategory instanceof WizardCollectionElement) {
>+				Object[] children =
>+					((WizardCollectionElement) selectedCategory).getWizards();
>+				if (children.length == 1)
>+					selectWizard(children[0]);
> 			}
> 		}
> 	}
>@@ -425,7 +426,14 @@
> 
> 		public RootElementProxy(WizardCollectionElement element) {
> 			super();
>-			elements = new WizardCollectionElement[] { element };
>+			//If the element has no wizard then it is an empty category
>+			//and we should collapse
>+			if (element.getWizards().length == 0) {
>+				Object[] children = element.getChildren();
>+				elements = new WizardCollectionElement[children.length];
>+				System.arraycopy(children, 0, elements, 0, elements.length);
>+			} else
>+				elements = new WizardCollectionElement[] { element };
> 		}
> 
> 		public Object getAdapter(Class adapter) {

Actions: View | Diff

Attachments on bug 32319: 3633