Author: adietish Date: 2010-11-15 10:29:02 -0500 (Mon, 15 Nov 2010) New Revision: 26558 Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/ManageKeysPage.java Log: [JBIDE-7598] corrected ok-enablement 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 2010-11-15 14:49:15 UTC (rev 26557) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/ManageKeysPage.java 2010-11-15 15:29:02 UTC (rev 26558) @@ -63,7 +63,7 @@ @Override public void modifyText(ModifyEvent e) { // TODO Auto-generated method stub - validate(); + validateDirectory(); } }; @@ -114,8 +114,8 @@ @Override public void widgetSelected(SelectionEvent e) { currFile = fileList.getSelection()[0]; + setPageComplete(isKeySelected()); } - }; private FilenameFilter extensionFilter = new FilenameFilter() { @@ -143,13 +143,10 @@ return currFile; } - private void validate() { + private void validateDirectory() { boolean hasError = false; - boolean isComplete = true; - if (directory.getText().length() == 0) - isComplete = false; - else { + if (directory.getText().length() > 0) { File f = new File(directory.getText()); if (!f.exists() || !f.isDirectory()) { hasError = true; @@ -164,11 +161,16 @@ loadFileList(); } } - if (!hasError) + if (!hasError) { setErrorMessage(null); - setPageComplete(isComplete && !hasError); + } + setPageComplete(!hasError && isKeySelected()); } + private boolean isKeySelected() { + return fileList.getSelectionCount() == 1; + } + private void loadFileList() { File dir = new File(directory.getText()); if (dir.exists() && dir.isDirectory()) { @@ -190,7 +192,7 @@ @Override public void createControl(Composite parent) { - // TODO Auto-generated method stub + setPageComplete(false); final Composite container = new Composite(parent, SWT.NULL); FormLayout layout = new FormLayout(); layout.marginHeight = 5; @@ -293,7 +295,7 @@ setControl(container); loadFileList(); - validate(); + validateDirectory(); } }