Attachment 86014 Details for Bug 181628 – org.eclipse.pde.ui.patch

[patch] org.eclipse.pde.ui.patch

clipboard.txt (text/plain), 4.74 KB, created by Chris Aniszczyk

on 2008-01-02 14:47:16 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Aniszczyk

Created: 2008-01-02 14:47:16 EST

Size: 4.74 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.pde.ui
>Index: src/org/eclipse/pde/internal/ui/launcher/OSGiBundleBlock.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/OSGiBundleBlock.java,v
>retrieving revision 1.10
>diff -u -r1.10 OSGiBundleBlock.java
>--- src/org/eclipse/pde/internal/ui/launcher/OSGiBundleBlock.java	26 Oct 2007 19:29:23 -0000	1.10
>+++ src/org/eclipse/pde/internal/ui/launcher/OSGiBundleBlock.java	2 Jan 2008 19:46:12 -0000
>@@ -127,38 +127,40 @@
> 				final TreeItem item = (TreeItem) e.item;
> 				if (!isEditable(item))
> 					return;
>-
>-				final Spinner spinner = new Spinner(tree, SWT.BORDER);
>-				spinner.setMinimum(0);
>-				String level = item.getText(1);
>-				int defaultLevel =  level.length() == 0 || "default".equals(level) ? 0 : Integer.parseInt(level); //$NON-NLS-1$
>-				spinner.setSelection(defaultLevel);
>-				spinner.addModifyListener(new ModifyListener() {
>-					public void modifyText(ModifyEvent e) {
>-						if (item.getChecked()) {
>-							int selection = spinner.getSelection();
>-							item.setText(1, selection == 0 
>-												? "default"  //$NON-NLS-1$
>-												: Integer.toString(selection));
>-							fTab.updateLaunchConfigurationDialog();
>+				
>+				if (!isFragment(item)){ // only display editing controls if we're not a fragment
>+					final Spinner spinner = new Spinner(tree, SWT.BORDER);
>+					spinner.setMinimum(0);
>+					String level = item.getText(1);
>+					int defaultLevel =  level.length() == 0 || "default".equals(level) ? 0 : Integer.parseInt(level); //$NON-NLS-1$
>+					spinner.setSelection(defaultLevel);
>+					spinner.addModifyListener(new ModifyListener() {
>+						public void modifyText(ModifyEvent e) {
>+							if (item.getChecked()) {
>+								int selection = spinner.getSelection();
>+								item.setText(1, selection == 0 
>+													? "default"  //$NON-NLS-1$
>+													: Integer.toString(selection));
>+								fTab.updateLaunchConfigurationDialog();
>+							}
> 						}
>-					}
>-				});
>-				levelColumnEditor.setEditor(spinner, item, 1);
>-
>-				final CCombo combo = new CCombo(tree, SWT.BORDER | SWT.READ_ONLY);
>-				combo.setItems(new String[] { "default", Boolean.toString(true), Boolean.toString(false) }); //$NON-NLS-1$
>-				combo.setText(item.getText(2));
>-				combo.pack();
>-				combo.addSelectionListener(new SelectionAdapter() {
>-					public void widgetSelected(SelectionEvent e) {
>-						if (item.getChecked()) {
>-							item.setText(2, combo.getText());
>-							fTab.updateLaunchConfigurationDialog();
>+					});
>+					levelColumnEditor.setEditor(spinner, item, 1);
>+					
>+					final CCombo combo = new CCombo(tree, SWT.BORDER | SWT.READ_ONLY);
>+					combo.setItems(new String[] { "default", Boolean.toString(true), Boolean.toString(false) }); //$NON-NLS-1$
>+					combo.setText(item.getText(2));
>+					combo.pack();
>+					combo.addSelectionListener(new SelectionAdapter() {
>+						public void widgetSelected(SelectionEvent e) {
>+							if (item.getChecked()) {
>+								item.setText(2, combo.getText());
>+								fTab.updateLaunchConfigurationDialog();
>+							}
> 						}
>-					}
>-				});
>-				autoColumnEditor.setEditor(combo, item, 2);
>+					});
>+					autoColumnEditor.setEditor(combo, item, 2);
>+				}
> 
> 			}
> 		});			
>@@ -174,6 +176,14 @@
> 		return false;
> 	}
> 	
>+	private boolean isFragment(TreeItem item) {
>+		Object obj = item.getData();
>+		if (obj instanceof IPluginModelBase) {
>+			return ((IPluginModelBase)obj).isFragmentModel();
>+		}
>+		return false;
>+	}
>+	
> 	protected ILabelProvider getLabelProvider() {
> 		return new OSGiLabelProvider();
> 	}
>@@ -327,7 +337,11 @@
> 			TreeItem item = (TreeItem)widget;
> 			int index = value == null ? -1 : value.indexOf(':');
> 			item.setText(1, index == -1 ? "" : value.substring(0, index)); //$NON-NLS-1$
>-			item.setText(2, index == -1 ? "" : value.substring(index + 1)); //$NON-NLS-1$
>+			if (model.isFragmentModel()){
>+				item.setText(2, "false"); //$NON-NLS-1$ //$NON-NLS-2$
>+			} else {
>+				item.setText(2, index == -1 ? "" : value.substring(index + 1)); //$NON-NLS-1$
>+			}
> 		}
> 	}
> 	
>@@ -344,7 +358,9 @@
> 			boolean isSystemBundle = "org.eclipse.osgi".equals(model.getPluginBase().getId()); //$NON-NLS-1$
> 			if (!"default".equals(item.getText(1))) //$NON-NLS-1$
> 				item.setText(1, isSystemBundle ? "" : "default"); //$NON-NLS-1$ //$NON-NLS-2$
>-			if (!"default".equals(item.getText(2))) //$NON-NLS-1$
>+			if (model.isFragmentModel())
>+				item.setText(2, "false"); //$NON-NLS-1$
>+			else if (!"default".equals(item.getText(2))) //$NON-NLS-1$
> 				item.setText(2, isSystemBundle ? "" : "default"); //$NON-NLS-1$ //$NON-NLS-2$
> 		} else {
> 			if (item.getText(1).length() > 0)

Actions: View | Diff

Attachments on bug 181628: 85590 | 86014 | 86015