Mailing-List: contact notifications-help@ant.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@ant.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r984100 - in /ant/ivy/ivyde/branches/2.1.0: ./
 org.apache.ivyde.eclipse/META-INF/
 org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/
 org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/workspaceresolver/
Date: Tue, 10 Aug 2010 15:58:11 -0000
To: notifications@ant.apache.org
From: hibou@apache.org
Message-Id: <20100810155811.8C06423889E7@eris.apache.org>

Author: hibou
Date: Tue Aug 10 15:58:11 2010
New Revision: 984100

URL: http://svn.apache.org/viewvc?rev=984100&view=rev
Log:
merge r984097: Filter closed projects from workspace selection dialog (IVYDE-249)

Modified:
    ant/ivy/ivyde/branches/2.1.0/   (props changed)
    ant/ivy/ivyde/branches/2.1.0/CHANGES.txt   (contents, props changed)
    ant/ivy/ivyde/branches/2.1.0/NOTICE   (props changed)
    ant/ivy/ivyde/branches/2.1.0/README.txt   (props changed)
    ant/ivy/ivyde/branches/2.1.0/org.apache.ivyde.eclipse/META-INF/MANIFEST.MF   (props changed)
    ant/ivy/ivyde/branches/2.1.0/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/PathEditor.java
    ant/ivy/ivyde/branches/2.1.0/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/workspaceresolver/WorkspaceIvySettings.java   (props changed)

Propchange: ant/ivy/ivyde/branches/2.1.0/
------------------------------------------------------------------------------
    svn:mergeinfo = /ant/ivy/ivyde/trunk:984097

Modified: ant/ivy/ivyde/branches/2.1.0/CHANGES.txt
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/branches/2.1.0/CHANGES.txt?rev=984100&r1=984099&r2=984100&view=diff
==============================================================================
--- ant/ivy/ivyde/branches/2.1.0/CHANGES.txt (original)
+++ ant/ivy/ivyde/branches/2.1.0/CHANGES.txt Tue Aug 10 15:58:11 2010
@@ -14,6 +14,7 @@
 
 - IMPROVE: Wrap cache cleaning in a job so that it does not block the workspace (IVYDE-207) (thanks to Jon Schneider)
 - IMPROVE: Allow workspace resolver to skip version matcher (IVYDE-187) (thanks to Phillip Webb)
+- IMPROVE: Filter closed projects from workspace selection dialog (IVYDE-249) (thanks to Sebastien Moran)
 
 - FIX: "Ivy Settings Path" Browse button results in an incorrectly formatted URL (IVYDE-191) (thanks to Jon Schneider)
 - FIX: Workspace Resolver Prevents Source Download (IVYDE-188) (thanks to Phillip Webb)

Propchange: ant/ivy/ivyde/branches/2.1.0/CHANGES.txt
            ('svn:mergeinfo' removed)

Propchange: ant/ivy/ivyde/branches/2.1.0/NOTICE
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 10 15:58:11 2010
@@ -1 +1 @@
-/ant/ivy/ivyde/trunk/NOTICE:905370-956580
+/ant/ivy/ivyde/trunk/NOTICE:905370-956580,984097

Propchange: ant/ivy/ivyde/branches/2.1.0/README.txt
            ('svn:mergeinfo' removed)

Propchange: ant/ivy/ivyde/branches/2.1.0/org.apache.ivyde.eclipse/META-INF/MANIFEST.MF
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 10 15:58:11 2010
@@ -1 +1 @@
-/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/META-INF/MANIFEST.MF:917155
+/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/META-INF/MANIFEST.MF:917155,984097

Modified: ant/ivy/ivyde/branches/2.1.0/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/PathEditor.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/branches/2.1.0/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/PathEditor.java?rev=984100&r1=984099&r2=984100&view=diff
==============================================================================
--- ant/ivy/ivyde/branches/2.1.0/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/PathEditor.java (original)
+++ ant/ivy/ivyde/branches/2.1.0/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/PathEditor.java Tue Aug 10 15:58:11 2010
@@ -18,10 +18,13 @@
 package org.apache.ivyde.eclipse.ui;
 
 import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.debug.ui.StringVariableSelectionDialog;
 import org.eclipse.jdt.core.IJavaProject;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.jface.viewers.ViewerFilter;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.ModifyEvent;
 import org.eclipse.swt.events.ModifyListener;
@@ -112,6 +115,15 @@ public abstract class PathEditor extends
                 new WorkbenchLabelProvider(), new BaseWorkbenchContentProvider());
         dialog.setTitle("Select a workspace relative file:");
         dialog.setMessage("Select a workspace relative file:");
+        // Filter closed projects
+        dialog.addFilter(new ViewerFilter() {
+            public boolean select(Viewer viewer, Object parentElement, Object element) {
+                if (element instanceof IProject)
+                    return ((IProject) element).isAccessible();
+
+                return true;
+            }
+        });
         dialog.setInput(ResourcesPlugin.getWorkspace().getRoot());
         // TODO try to preselect the current file
         dialog.open();

Propchange: ant/ivy/ivyde/branches/2.1.0/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/workspaceresolver/WorkspaceIvySettings.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 10 15:58:11 2010
@@ -1 +1 @@
-/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/workspaceresolver/WorkspaceIvySettings.java:905370-950981
+/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/workspaceresolver/WorkspaceIvySettings.java:905370-950981,984097