review cleanup & unique name generation fix

2 files changed, 12 insertions, 7 deletions

diff --git a/android/ultimate/src/org/jetbrains/android/database/AndroidDataSourcePropertiesDialog.java b/android/ultimate/src/org/jetbrains/android/database/AndroidDataSourcePropertiesDialog.java
index 752ff511a0c..db1b19adec2 100644
--- a/android/ultimate/src/org/jetbrains/android/database/AndroidDataSourcePropertiesDialog.java
+++ b/android/ultimate/src/org/jetbrains/android/database/AndroidDataSourcePropertiesDialog.java
@@ -349,7 +349,7 @@ public class AndroidDataSourcePropertiesDialog extends AbstractDataSourceConfigu
 
   @Override
   public void apply() {
-    myDataSource.setName(myNameField.getText());
+    myDataSource.setName(getNameValue());
     final AndroidDataSource.State state = myDataSource.getState();
     state.setDeviceId(getSelectedDeviceId());
     state.setPackageName(getSelectedPackage());
@@ -385,7 +385,11 @@ public class AndroidDataSourcePropertiesDialog extends AbstractDataSourceConfigu
   @Nls
   @Override
   public String getDisplayName() {
-    return myNameField.getText();
+    return getNameValue();
+  }
+
+  private String getNameValue() {
+    return myNameField.getText().trim();
   }
 
   @Nullable
diff --git a/android/ultimate/src/org/jetbrains/android/database/AndroidDbManager.java b/android/ultimate/src/org/jetbrains/android/database/AndroidDbManager.java
index 672adb54ced..d9d5de86bd8 100644
--- a/android/ultimate/src/org/jetbrains/android/database/AndroidDbManager.java
+++ b/android/ultimate/src/org/jetbrains/android/database/AndroidDbManager.java
@@ -11,6 +11,7 @@ import com.intellij.openapi.options.Configurable;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.Key;
 import com.intellij.openapi.util.ModificationTracker;
+import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.persistence.DatabaseMessages;
 import com.intellij.persistence.database.DataSourceInfo;
@@ -207,15 +208,15 @@ public class AndroidDbManager extends DbPsiManagerSpi {
 
     @NotNull
     @Override
-    public DataSourceInfo createDataSource(Project project, DataSourceInfo copyFrom) {
+    public DataSourceInfo createDataSource(@NotNull Project project, @Nullable DataSourceInfo copyFrom, @Nullable String newName) {
       AndroidDataSource result;
-      if (copyFrom instanceof AndroidDataSource ) {
-        result = ((AndroidDataSource )copyFrom).copy();
-        result.setName(copyFrom.getName() + " [copy]");
+      if (copyFrom instanceof AndroidDataSource) {
+        result = ((AndroidDataSource)copyFrom).copy();
       }
       else {
-        result = new AndroidDataSource ("Android connection");
+        result = new AndroidDataSource("");
       }
+      result.setName(StringUtil.notNullize(newName, "Android connection"));
       result.init();
       return result;
     }