Attachment 46630 Details for Bug 150922 – fix

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

[patch] fix

fix_150922.txt (text/plain), 11.84 KB, created by Benno Baumgartner

on 2006-07-21 08:53:29 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Benno Baumgartner

Created: 2006-07-21 08:53:29 EDT

Size: 11.84 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jdt.ui
>Index: ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/BuildPathsBlock.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/BuildPathsBlock.java,v
>retrieving revision 1.150
>diff -u -r1.150 BuildPathsBlock.java
>--- ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/BuildPathsBlock.java	21 Jul 2006 09:38:12 -0000	1.150
>+++ ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/BuildPathsBlock.java	21 Jul 2006 12:56:12 -0000
>@@ -323,6 +323,12 @@
> 		fClassPathList.setElements(newClassPath);
> 		fClassPathList.setCheckedElements(exportedEntries);
> 		
>+		if (fSourceContainerPage != null) {
>+			fSourceContainerPage.init(fCurrJProject);
>+			fProjectsPage.init(fCurrJProject);
>+			fLibrariesPage.init(fCurrJProject);
>+		}
>+		
> 		initializeTimeStamps();
> 		updateUI();
> 	}
>@@ -350,11 +356,6 @@
> 		fBuildPathDialogField.refresh();
> 		fClassPathList.refresh();
> 	
>-		if (fSourceContainerPage != null) {
>-			fSourceContainerPage.init(fCurrJProject);
>-			fProjectsPage.init(fCurrJProject);
>-			fLibrariesPage.init(fCurrJProject);
>-		}
> 		doStatusLineUpdate();
> 	}
> 	
>Index: ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/SourceContainerWorkbookPage.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/SourceContainerWorkbookPage.java,v
>retrieving revision 1.85
>diff -u -r1.85 SourceContainerWorkbookPage.java
>--- ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/SourceContainerWorkbookPage.java	28 Mar 2006 16:53:35 -0000	1.85
>+++ ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/SourceContainerWorkbookPage.java	21 Jul 2006 12:56:13 -0000
>@@ -26,6 +26,7 @@
> import org.eclipse.swt.events.KeyEvent;
> import org.eclipse.swt.widgets.Composite;
> import org.eclipse.swt.widgets.Control;
>+import org.eclipse.swt.widgets.Display;
> import org.eclipse.swt.widgets.Shell;
> 
> import org.eclipse.jface.action.IAction;
>@@ -168,8 +169,16 @@
> 	}
> 	
> 	public void init(IJavaProject jproject) {
>-		fCurrJProject= jproject;	
>-		updateFoldersList();
>+		fCurrJProject= jproject;
>+		if (Display.getCurrent() != null) {
>+			updateFoldersList();
>+		} else {
>+			Display.getDefault().asyncExec(new Runnable() {
>+				public void run() {
>+					updateFoldersList();
>+				}
>+			});
>+		}
> 	}
> 	
> 	private void updateFoldersList() {	
>Index: ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/LibrariesWorkbookPage.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/LibrariesWorkbookPage.java,v
>retrieving revision 1.118
>diff -u -r1.118 LibrariesWorkbookPage.java
>--- ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/LibrariesWorkbookPage.java	20 Apr 2006 15:28:03 -0000	1.118
>+++ ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/LibrariesWorkbookPage.java	21 Jul 2006 12:56:13 -0000
>@@ -37,6 +37,7 @@
> import org.eclipse.swt.events.KeyEvent;
> import org.eclipse.swt.widgets.Composite;
> import org.eclipse.swt.widgets.Control;
>+import org.eclipse.swt.widgets.Display;
> import org.eclipse.swt.widgets.Shell;
> 
> import org.eclipse.jface.dialogs.MessageDialog;
>@@ -130,10 +131,17 @@
> 		
> 	public void init(IJavaProject jproject) {
> 		fCurrJProject= jproject;
>-		updateLibrariesList();
>+		if (Display.getCurrent() != null) {
>+			updateLibrariesList();
>+		} else {
>+			Display.getDefault().asyncExec(new Runnable() {
>+				public void run() {
>+					updateLibrariesList();
>+				}
>+			});
>+		}
> 	}
> 	
>-	
> 	private void updateLibrariesList() {
> 		List cpelements= fClassPathList.getElements();
> 		List libelements= new ArrayList(cpelements.size());
>Index: ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ProjectsWorkbookPage.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ProjectsWorkbookPage.java,v
>retrieving revision 1.34
>diff -u -r1.34 ProjectsWorkbookPage.java
>--- ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ProjectsWorkbookPage.java	4 May 2006 21:29:41 -0000	1.34
>+++ ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ProjectsWorkbookPage.java	21 Jul 2006 12:56:13 -0000
>@@ -18,6 +18,7 @@
> import org.eclipse.swt.events.KeyEvent;
> import org.eclipse.swt.widgets.Composite;
> import org.eclipse.swt.widgets.Control;
>+import org.eclipse.swt.widgets.Display;
> import org.eclipse.swt.widgets.Shell;
> 
> import org.eclipse.jface.viewers.ArrayContentProvider;
>@@ -87,8 +88,18 @@
> 		fProjectsList.setViewerSorter(new CPListElementSorter());
> 	}
> 	
>-	public void init(IJavaProject jproject) {
>-		updateProjectsList(jproject);
>+	public void init(final IJavaProject jproject) {
>+		fCurrJProject= jproject;
>+		
>+		if (Display.getCurrent() != null) {
>+			updateProjectsList(jproject);
>+		} else {
>+			Display.getDefault().asyncExec(new Runnable() {
>+				public void run() {
>+					updateProjectsList(jproject);
>+				}
>+			});
>+		}
> 	}
> 		
> 	private void updateProjectsList(IJavaProject currJProject) {
>@@ -104,7 +115,6 @@
> 			}
> 		}
> 		fProjectsList.setElements(checkedProjects);
>-		fCurrJProject= currJProject;
> 	}		
> 		
> 	// -------- UI creation ---------
>Index: ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/newsourcepage/NewSourceContainerWorkbookPage.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/newsourcepage/NewSourceContainerWorkbookPage.java,v
>retrieving revision 1.26
>diff -u -r1.26 NewSourceContainerWorkbookPage.java
>--- ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/newsourcepage/NewSourceContainerWorkbookPage.java	21 Jul 2006 09:38:12 -0000	1.26
>+++ ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/newsourcepage/NewSourceContainerWorkbookPage.java	21 Jul 2006 12:56:13 -0000
>@@ -27,6 +27,7 @@
> import org.eclipse.swt.layout.GridLayout;
> import org.eclipse.swt.widgets.Composite;
> import org.eclipse.swt.widgets.Control;
>+import org.eclipse.swt.widgets.Display;
> 
> import org.eclipse.jface.action.ToolBarManager;
> import org.eclipse.jface.operation.IRunnableContext;
>@@ -118,8 +119,22 @@
>      */
>     public void init(IJavaProject javaProject) {
> 		fJavaProject= javaProject;
>-        
>-        fPackageExplorer.setInput(javaProject);
>+		fPackageExplorer.addPostSelectionChangedListener(fHintTextGroup);
>+	    fActionGroup.getResetAllAction().setBreakPoint(javaProject);
>+
>+		if (Display.getCurrent() != null) {
>+			doUpdateUI();
>+		} else {
>+			Display.getDefault().asyncExec(new Runnable() {
>+				public void run() {
>+					doUpdateUI();
>+				}
>+			});
>+		}
>+    }
>+    
>+	private void doUpdateUI() {
>+        fPackageExplorer.setInput(fJavaProject);
> 		
> 		boolean useFolderOutputs= false;
> 		List cpelements= fClassPathList.getElements();
>@@ -132,8 +147,6 @@
> 			}
> 		}
> 		fUseFolderOutputs.setSelection(useFolderOutputs);
>-		
>-		fPackageExplorer.addPostSelectionChangedListener(fHintTextGroup);
>     }
>     
>     public void dispose() {
>@@ -195,7 +208,7 @@
>         excomposite.setClient(fHintTextGroup.createControl(excomposite));
>         fUseFolderOutputs.doFillIntoGrid(body, 1);
> 		
>-	    fActionGroup= new DialogPackageExplorerActionGroup(fHintTextGroup, fContext, fPackageExplorer, this);
>+        fActionGroup= new DialogPackageExplorerActionGroup(fHintTextGroup, fContext, fPackageExplorer, this);
> 		fActionGroup.addBuildpathModifierListener(this);
> 		   
> 		
>Index: ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/newsourcepage/ResetAllAction.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/newsourcepage/ResetAllAction.java,v
>retrieving revision 1.8
>diff -u -r1.8 ResetAllAction.java
>--- ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/newsourcepage/ResetAllAction.java	20 Jul 2006 08:36:27 -0000	1.8
>+++ ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/newsourcepage/ResetAllAction.java	21 Jul 2006 12:56:13 -0000
>@@ -27,8 +27,11 @@
> 
> import org.eclipse.ui.part.ISetSelectionTarget;
> 
>+import org.eclipse.jdt.core.ElementChangedEvent;
> import org.eclipse.jdt.core.IClasspathEntry;
>+import org.eclipse.jdt.core.IElementChangedListener;
> import org.eclipse.jdt.core.IJavaProject;
>+import org.eclipse.jdt.core.JavaCore;
> import org.eclipse.jdt.core.JavaModelException;
> 
> import org.eclipse.jdt.internal.corext.buildpath.BuildpathDelta;
>@@ -68,12 +71,37 @@
> 		return NewWizardMessages.PackageExplorerActionGroup_FormText_Default_ResetAll;
> 	}
> 
>-	public void setBreakPoint(IJavaProject javaProject) throws JavaModelException {
>+	public void setBreakPoint(IJavaProject javaProject) {
> 		fJavaProject= javaProject;
>+		if (fJavaProject.exists()) {
>+			try {
>+	            fEntries= ClasspathModifier.getExistingEntries(fJavaProject);
>+	            fOutputLocation= fJavaProject.getOutputLocation();
>+            } catch (JavaModelException e) {
>+	            JavaPlugin.log(e);
>+	            return;
>+            }
>+			setEnabled(true);
>+		} else {
>+			JavaCore.addElementChangedListener(new IElementChangedListener() {
> 		
>-		fEntries= ClasspathModifier.getExistingEntries(javaProject);
>-		fOutputLocation= fJavaProject.getOutputLocation();
>-		setEnabled(canHandle(null));
>+				public void elementChanged(ElementChangedEvent event) {
>+					if (fJavaProject.exists()) {
>+						try {
>+	                        fEntries= ClasspathModifier.getExistingEntries(fJavaProject);
>+	                        fOutputLocation= fJavaProject.getOutputLocation();
>+                        } catch (JavaModelException e) {
>+                        	JavaPlugin.log(e);
>+                        	return;
>+                        } finally {
>+							JavaCore.removeElementChangedListener(this);
>+                        }
>+						setEnabled(true);
>+					}					
>+		        }
>+				
>+			}, ElementChangedEvent.POST_CHANGE);
>+		}
>     }
> 	
> 	/**
>Index: ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/newsourcepage/DialogPackageExplorerActionGroup.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/newsourcepage/DialogPackageExplorerActionGroup.java,v
>retrieving revision 1.37
>diff -u -r1.37 DialogPackageExplorerActionGroup.java
>--- ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/newsourcepage/DialogPackageExplorerActionGroup.java	21 Jul 2006 09:38:12 -0000	1.37
>+++ ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/newsourcepage/DialogPackageExplorerActionGroup.java	21 Jul 2006 12:56:13 -0000
>@@ -47,6 +47,7 @@
> 	private final ClasspathModifierDropDownAction fDropDownAction;
> 	private final CreateLinkedSourceFolderAction fCreateLinkedSourceFolderAction;
> 	private final CreateSourceFolderAction fCreateSourceFolderAction;
>+	private final ResetAllAction fResetAllAction;
>     
>     /**
>      * Constructor which creates the operations and based on this 
>@@ -132,6 +133,8 @@
>         	}
>         };
> 		fDialogPackageExplorer.addSelectionChangedListener(fCreateSourceFolderAction);
>+		
>+		fResetAllAction= new ResetAllAction(provider, context, fDialogPackageExplorer);
> 
>         
>         //options:
>@@ -219,6 +222,7 @@
>         
>         tbm.add(fCreateLinkedSourceFolderAction);
>         tbm.add(fCreateSourceFolderAction);
>+        tbm.add(fResetAllAction);
>         tbm.add(new HelpAction());
>         
>         tbm.update(true);
>@@ -292,4 +296,8 @@
> 	public EditOutputFolderAction getEditOutputFolderAction() {
> 	    return fEditOutputFolderAction;
>     }
>+
>+	public ResetAllAction getResetAllAction() {
>+		return fResetAllAction;
>+    }
> }

Actions: View | Diff

Attachments on bug 150922: 46427 | 46630