mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-29 19:45:01 +02:00
Code Issues Wiki Activity

Bug 400972: Creating new C/C++ project in existing read-only

Browse source 
directory should be disallowed

Change-Id: I75090498bd4f408d77ad17491f50f4fd66850c97
Reviewed-on: https://git.eclipse.org/r/10404
Reviewed-by: Jesse Weinstein <Jesse.Weinstein@clinicomp.com>
Reviewed-by: Jeff Johnston <jjohnstn@redhat.com>
IP-Clean: Jeff Johnston <jjohnstn@redhat.com>
Tested-by: Jeff Johnston <jjohnstn@redhat.com>
This commit is contained in:
Jeff Johnston 2013-02-19 18:22:07 -05:00
parent 1908efec38
commit 18ff30de24
6 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/Messages.java
View file

@ -186,6 +186,7 @@ public class Messages extends NLS {
public static String NewMakeProjFromExistingPage_7; public static String NewMakeProjFromExistingPage_7;
public static String NewMakeProjFromExistingPage_8; public static String NewMakeProjFromExistingPage_8;
public static String NewMakeProjFromExistingPage_9; public static String NewMakeProjFromExistingPage_9;
public static String NewMakeProjFromExistingPage_DirReadOnlyError;
public static String NewVarDialog_0; public static String NewVarDialog_0;
public static String NewVarDialog_1; public static String NewVarDialog_1;
public static String PreferredToolchainsTab_0; public static String PreferredToolchainsTab_0;

2
build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/Messages.properties
View file

@ -152,6 +152,8 @@ NewMakeProjFromExistingPage_6=Browse...
NewMakeProjFromExistingPage_7=Select root directory of existing code NewMakeProjFromExistingPage_7=Select root directory of existing code
NewMakeProjFromExistingPage_8=Not a valid directory NewMakeProjFromExistingPage_8=Not a valid directory
NewMakeProjFromExistingPage_9=Languages NewMakeProjFromExistingPage_9=Languages
NewMakeProjFromExistingPage_DirReadOnlyError=Directory is read-only
# ----------- Configuration Selection Page ----------- # ----------- Configuration Selection Page -----------
BuildPropertyPage_error_Unknown_tree_element=Unknown type of element in tree of type {0} BuildPropertyPage_error_Unknown_tree_element=Unknown type of element in tree of type {0}

5
build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/NewMakeProjFromExistingPage.java
View file

@ -155,10 +155,13 @@ public class NewMakeProjFromExistingPage extends WizardPage {
else { else {
final File file= new File(loc); final File file= new File(loc);
if (file.isDirectory()) { 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 // 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 // (bugzilla 368987). Use a job to ensure proper sequence of activity, as setting the Text
// will invoke the listener, which will invoke this method. // 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$ WorkbenchJob wjob = new WorkbenchJob("update project name") { //$NON-NLS-1$
@Override @Override
public IStatus runInUIThread(IProgressMonitor monitor) { public IStatus runInUIThread(IProgressMonitor monitor) {

1
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/newui/Messages.java
View file

@ -105,6 +105,7 @@ public class Messages extends NLS {
public static String CMainWizardPage_5; public static String CMainWizardPage_5;
public static String CMainWizardPage_6; public static String CMainWizardPage_6;
public static String CMainWizardPage_7; public static String CMainWizardPage_7;
public static String CMainWizardPage_DirReadOnlyError;
public static String ConfigDescriptionTab_0; public static String ConfigDescriptionTab_0;
public static String ConfigDescriptionTab_1; public static String ConfigDescriptionTab_1;
public static String ConfigDescriptionTab_2; public static String ConfigDescriptionTab_2;

1
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/newui/Messages.properties
View file

@ -273,6 +273,7 @@ CMainWizardPage_3=No project types available. Project cannot be created
CMainWizardPage_5=Cannot create ICProjectTypeHandler: CMainWizardPage_5=Cannot create ICProjectTypeHandler:
CMainWizardPage_6=File with specified name already exists. CMainWizardPage_6=File with specified name already exists.
CMainWizardPage_7=Directory with specified name already exists. CMainWizardPage_7=Directory with specified name already exists.
CMainWizardPage_DirReadOnlyError=Directory with specified name already exists and is read-only.
ProjectContentsArea_0=Browse... ProjectContentsArea_0=Browse...
ProjectContentsArea_1=Use default location ProjectContentsArea_1=Use default location

7
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CDTMainWizardPage.java
View file

@ -211,7 +211,12 @@ import org.eclipse.cdt.internal.ui.newui.Messages;
IFileInfo f = fs.fetchInfo(); IFileInfo f = fs.fetchInfo();
if (f.exists()) { if (f.exists()) {
if (f.isDirectory()) { if (f.isDirectory()) {
setMessage(Messages.CMainWizardPage_7, IMessageProvider.WARNING); if (f.getAttribute(EFS.ATTRIBUTE_READ_ONLY)) {
setErrorMessage(Messages.CMainWizardPage_DirReadOnlyError);
return false;
}
else
setMessage(Messages.CMainWizardPage_7, IMessageProvider.WARNING);
} else { } else {
setErrorMessage(Messages.CMainWizardPage_6); setErrorMessage(Messages.CMainWizardPage_6);
return false; return false;