Author: adietish
Date: 2011-01-18 05:38:33 -0500 (Tue, 18 Jan 2011)
New Revision: 28346
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/ManageKeysPage.java
Log:
[JBIDE-8096] added check for pem-folder being writable
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/ManageKeysPage.java
===================================================================
---
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/ManageKeysPage.java 2011-01-18
10:37:53 UTC (rev 28345)
+++
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/ManageKeysPage.java 2011-01-18
10:38:33 UTC (rev 28346)
@@ -66,7 +66,6 @@
/**
* @author Jeff Johnston
* @author André Dietisheim
- * @author Rob Stryker
*/
public class ManageKeysPage extends WizardPage {
@@ -166,7 +165,6 @@
return newButton;
}
-
private Button createDeleteButton(Composite container, DataBindingContext dbc) {
Button deleteButton = new Button(container, SWT.NULL);
deleteButton.setText(WizardMessages.getString(DELETE));
@@ -326,15 +324,17 @@
}
});
-
pemText = new Text(composite, SWT.BORDER);
pemText.setLayoutData(UIUtils.createFormData(nameText,5,null,0,persist, 5, browse,
-5));
+
init();
+
ModifyListener listener = new ModifyListener() {
public void modifyText(ModifyEvent e) {
verify();
}
};
+
nameText.addModifyListener(listener);
pemText.addModifyListener(listener);
persist.addSelectionListener(new SelectionAdapter(){
@@ -342,31 +342,40 @@
verify();
}
});
+
return composite;
}
+
private void init() {
persist.setSelection(true);
pemText.setText(model.getInitialKeyStorePath());
verify();
}
+
private void verify() {
persistBool = persist.getSelection();
pem = pemText.getText();
name = nameText.getText();
- if( !(new File(pem).exists())) {
+ File pemFolder = new File(pem);
+ if( !pemFolder.exists()) {
setErrorMessage("Key folder does not exist.");
+ } else if( !pemFolder.canWrite()) {
+ setErrorMessage("Key folder is not writable.");
} else if( Arrays.asList(existingKeys).contains(name)){
setErrorMessage("Key id is already used, please choose another id.");
} else {
setErrorMessage(null);
}
}
+
public String getKeyId() {
return name;
}
+
public String getFolder() {
return pem;
}
+
public boolean shouldPersist() {
return persistBool;
}
Show replies by date