From 18ff30de24e745ca9f221c49ff8bd219837022c7 Mon Sep 17 00:00:00 2001 From: Jeff Johnston Date: Tue, 19 Feb 2013 18:22:07 -0500 Subject: Bug 400972: Creating new C/C++ project in existing read-only directory should be disallowed Change-Id: I75090498bd4f408d77ad17491f50f4fd66850c97 Reviewed-on: https://git.eclipse.org/r/10404 Reviewed-by: Jesse Weinstein Reviewed-by: Jeff Johnston IP-Clean: Jeff Johnston Tested-by: Jeff Johnston --- .../src/org/eclipse/cdt/managedbuilder/internal/ui/Messages.java | 1 + .../org/eclipse/cdt/managedbuilder/internal/ui/Messages.properties | 2 ++ .../cdt/managedbuilder/ui/wizards/NewMakeProjFromExistingPage.java | 5 ++++- 3 files changed, 7 insertions(+), 1 deletion(-) (limited to 'build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse') diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/Messages.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/Messages.java index 69436a7ed94..18939f441d6 100644 --- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/Messages.java +++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/Messages.java @@ -186,6 +186,7 @@ public class Messages extends NLS { public static String NewMakeProjFromExistingPage_7; public static String NewMakeProjFromExistingPage_8; public static String NewMakeProjFromExistingPage_9; + public static String NewMakeProjFromExistingPage_DirReadOnlyError; public static String NewVarDialog_0; public static String NewVarDialog_1; public static String PreferredToolchainsTab_0; diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/Messages.properties b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/Messages.properties index ac4acf5dce1..d45a0a1285a 100644 --- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/Messages.properties +++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/Messages.properties @@ -152,6 +152,8 @@ NewMakeProjFromExistingPage_6=Browse... NewMakeProjFromExistingPage_7=Select root directory of existing code NewMakeProjFromExistingPage_8=Not a valid directory NewMakeProjFromExistingPage_9=Languages +NewMakeProjFromExistingPage_DirReadOnlyError=Directory is read-only + # ----------- Configuration Selection Page ----------- BuildPropertyPage_error_Unknown_tree_element=Unknown type of element in tree of type {0} diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/NewMakeProjFromExistingPage.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/NewMakeProjFromExistingPage.java index 8848e47386a..b9f817f07bb 100644 --- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/NewMakeProjFromExistingPage.java +++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/NewMakeProjFromExistingPage.java @@ -155,10 +155,13 @@ public class NewMakeProjFromExistingPage extends WizardPage { else { final File file= new File(loc); if (file.isDirectory()) { + // Ensure we can create files in the directory. + if (!file.canWrite()) + msg = Messages.NewMakeProjFromExistingPage_DirReadOnlyError; // Set the project name to the directory name but not if the user has supplied a name // (bugzilla 368987). Use a job to ensure proper sequence of activity, as setting the Text // will invoke the listener, which will invoke this method. - if (!projectNameSetByUser && !name.equals(file.getName())) { + else if (!projectNameSetByUser && !name.equals(file.getName())) { WorkbenchJob wjob = new WorkbenchJob("update project name") { //$NON-NLS-1$ @Override public IStatus runInUIThread(IProgressMonitor monitor) { -- cgit v1.2.3