Author: adietish
Date: 2011-01-28 15:10:59 -0500 (Fri, 28 Jan 2011)
New Revision: 28713
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/SshPrivateKeysPreferences.java
Log:
[JBIDE-8253][JBIDE-8254]
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage.java
===================================================================
---
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage.java 2011-01-28
18:58:45 UTC (rev 28712)
+++
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage.java 2011-01-28
20:10:59 UTC (rev 28713)
@@ -11,7 +11,6 @@
package org.jboss.tools.internal.deltacloud.ui.wizards;
import java.io.File;
-import java.io.FileNotFoundException;
import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Arrays;
@@ -432,13 +431,18 @@
"The key is not known to cloud \"{0}\"", cloud.getName()));
}
- private boolean isKeyKnowToSsh(String keyId) {
- try {
- File file = PemFileManager.getFile(keyId,
SshPrivateKeysPreferences.getSshKeyDirectory());
- return SshPrivateKeysPreferences.contains(file);
- } catch (FileNotFoundException e) {
+ private boolean isKeyKnowToSsh(String keyName) {
+ if (keyName == null) {
return false;
}
+ for (String key :SshPrivateKeysPreferences.getKeys()) {
+ File file = new File(key);
+ if (file.getName().equals(keyName)
+ || file.getName().startsWith(keyName + ".")) {
+ return true;
+ }
+ }
+ return false;
}
private boolean doesKeyExist(String keyId) {
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/SshPrivateKeysPreferences.java
===================================================================
---
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/SshPrivateKeysPreferences.java 2011-01-28
18:58:45 UTC (rev 28712)
+++
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/SshPrivateKeysPreferences.java 2011-01-28
20:10:59 UTC (rev 28713)
@@ -49,33 +49,10 @@
public static void add(String keyName) {
sshPrivateKeyPreference.add(keyName);
}
-
- public static boolean contains(File key) {
- if (key == null) {
- return false;
- }
-
- String keyPath = key.getAbsolutePath();
- for (String privateKey : sshPrivateKeyPreference.get()) {
- if (keyPath.equals(getAbsoluteKeyPath(privateKey))) {
- return true;
- }
- }
- return false;
+
+ public static String[] getKeys() {
+ return sshPrivateKeyPreference.get();
}
-
- private static String getAbsoluteKeyPath(String keyName) {
- try {
- if (keyName != null && !keyName.startsWith(File.separator)) {
- StringBuilder builder = new StringBuilder(getSshKeyDirectory());
- builder.append(File.separatorChar).append(keyName);
- return builder.toString();
- }
- } catch (FileNotFoundException e) {
- // ignore
- }
- return keyName;
- }
/**
* Removes the given keyName from the ssh-preferences
Show replies by date