Attachment 77171 Details for Bug 200757 – Patch for defect 200757

[patch] Patch for defect 200757

patch_200757.txt (text/plain), 6.15 KB, created by Joern Dinkla

on 2007-08-28 16:19:22 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Joern Dinkla

Created: 2007-08-28 16:19:22 EDT

Size: 6.15 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.pde.ui
>Index: src/org/eclipse/pde/internal/ui/editor/plugin/ExportPackageSection.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ExportPackageSection.java,v
>retrieving revision 1.39
>diff -u -r1.39 ExportPackageSection.java
>--- src/org/eclipse/pde/internal/ui/editor/plugin/ExportPackageSection.java	28 Aug 2007 15:31:49 -0000	1.39
>+++ src/org/eclipse/pde/internal/ui/editor/plugin/ExportPackageSection.java	28 Aug 2007 20:14:38 -0000
>@@ -12,6 +12,8 @@
> 
> package org.eclipse.pde.internal.ui.editor.plugin;
> 
>+import java.util.ArrayList;
>+import java.util.Collection;
> import java.util.HashMap;
> import java.util.Vector;
> 
>@@ -21,6 +23,7 @@
> import org.eclipse.jdt.core.IJavaProject;
> import org.eclipse.jdt.core.IPackageFragment;
> import org.eclipse.jdt.core.JavaCore;
>+import org.eclipse.jdt.core.JavaModelException;
> import org.eclipse.jdt.ui.JavaElementLabelProvider;
> import org.eclipse.jdt.ui.JavaUI;
> import org.eclipse.jdt.ui.actions.FindReferencesAction;
>@@ -57,13 +60,16 @@
> import org.eclipse.pde.internal.ui.editor.TableSection;
> import org.eclipse.pde.internal.ui.editor.context.InputContextManager;
> import org.eclipse.pde.internal.ui.elements.DefaultTableProvider;
>+import org.eclipse.pde.internal.ui.parts.ConditionalListSelectionDialog;
> import org.eclipse.pde.internal.ui.parts.TablePart;
> import org.eclipse.pde.internal.ui.search.dependencies.CalculateUsesAction;
> import org.eclipse.pde.internal.ui.util.SWTUtil;
> import org.eclipse.search.ui.NewSearchUI;
> import org.eclipse.swt.SWT;
>+import org.eclipse.swt.custom.BusyIndicator;
> import org.eclipse.swt.layout.GridData;
> import org.eclipse.swt.widgets.Composite;
>+import org.eclipse.swt.widgets.Display;
> import org.eclipse.swt.widgets.Table;
> import org.eclipse.ui.IViewPart;
> import org.eclipse.ui.PartInitException;
>@@ -435,16 +441,41 @@
> 
> 	private void handleAdd() {
>         IPluginModelBase model = (IPluginModelBase) getPage().getModel();
>-        IProject project = model.getUnderlyingResource().getProject();
>+        final IProject project = model.getUnderlyingResource().getProject();
>         try {
>             if (project.hasNature(JavaCore.NATURE_ID)) {
>                 ILabelProvider labelProvider = new JavaElementLabelProvider();
>-                PackageSelectionDialog dialog = new PackageSelectionDialog(
>-                        PDEPlugin.getActiveWorkbenchShell(),
>-                        labelProvider, 
>-                        JavaCore.create(project), 
>-                        fHeader == null ? new Vector() : fHeader.getPackageNames(),
>-                        "true".equals(getBundle().getHeader(ICoreConstants.ECLIPSE_JREBUNDLE))); //$NON-NLS-1$
>+                final ConditionalListSelectionDialog dialog = new ConditionalListSelectionDialog(
>+        				PDEPlugin.getActiveWorkbenchShell(),
>+        				labelProvider,
>+        				PDEUIMessages.ExportPackageSection_dialogButtonLabel);
>+                final Collection pckgs = fHeader == null ? new Vector() : fHeader.getPackageNames();
>+                final boolean allowJava = "true".equals(getBundle().getHeader(ICoreConstants.ECLIPSE_JREBUNDLE)); //$NON-NLS-1$
>+                Runnable runnable = new Runnable() {
>+        			public void run() {
>+        		        ArrayList elements = new ArrayList();
>+        		        ArrayList conditional = new ArrayList();
>+        				IPackageFragment[] fragments = PDEJavaHelper.getPackageFragments(JavaCore.create(project), pckgs, allowJava);
>+        				for (int i = 0; i < fragments.length; i++) {
>+        					try {
>+								if (fragments[i].containsJavaResources()) {
>+									elements.add(fragments[i]);
>+								} else {
>+									conditional.add(fragments[i]);
>+								}
>+							} catch (JavaModelException e) {
>+							}
>+						}
>+        				dialog.setElements(elements.toArray());
>+        				dialog.setConditionalElements(conditional.toArray());
>+        				dialog.setMultipleSelection(true);
>+        				dialog.setMessage(PDEUIMessages.PackageSelectionDialog_label);
>+        				dialog.setTitle(PDEUIMessages.ExportPackageSection_title);
>+        				dialog.create();
>+        				SWTUtil.setDialogSize(dialog, 400, 500);
>+        			}
>+        		};
>+        		BusyIndicator.showWhile(Display.getCurrent(), runnable);
>                 if (dialog.open() == Window.OK) {
>                     Object[] selected = dialog.getResult();
>                     if (fHeader != null) {
>Index: src/org/eclipse/pde/internal/ui/pderesources.properties
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/pderesources.properties,v
>retrieving revision 1.915
>diff -u -r1.915 pderesources.properties
>--- src/org/eclipse/pde/internal/ui/pderesources.properties	28 Aug 2007 19:16:45 -0000	1.915
>+++ src/org/eclipse/pde/internal/ui/pderesources.properties	28 Aug 2007 20:14:37 -0000
>@@ -2129,6 +2129,7 @@
> RemoveInternalDirective_label=Remove redundant x-internal header
> RemoveInternalDirective_desc=The x-friends directive implies x-internal, so the latter is redundant
> ImportPackageSection_dialogButtonLabel=&Show non-exported packages
>+ExportPackageSection_dialogButtonLabel=&Show non-Java packages
> MissingResourcePage_missingResource=Missing Resource
> MissingResourcePage_unableToOpenFull={0}: ''{1}'' of project ''{2}'' is not available.
> EditorPreferencePage_folding = &Enable folding when opening a new editor
>Index: src/org/eclipse/pde/internal/ui/PDEUIMessages.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/PDEUIMessages.java,v
>retrieving revision 1.318
>diff -u -r1.318 PDEUIMessages.java
>--- src/org/eclipse/pde/internal/ui/PDEUIMessages.java	28 Aug 2007 19:16:45 -0000	1.318
>+++ src/org/eclipse/pde/internal/ui/PDEUIMessages.java	28 Aug 2007 20:14:34 -0000
>@@ -2130,6 +2130,8 @@
> 
> 	public static String ExportPackageSection_propertyAction;
> 
>+	public static String ExportPackageSection_dialogButtonLabel;
>+
> 	public static String DependenciesPage_properties;
> 
> 	public static String ImportPackageSection_add;

Actions: View | Diff

Attachments on bug 200757: 77031 | 77171 | 77172 | 77187