several minor fixes, cleanup and IDEA-117956 Discrepancy forms database connection

1 files changed, 6 insertions, 6 deletions

diff --git a/android/ultimate/src/org/jetbrains/android/database/AndroidDbManager.java b/android/ultimate/src/org/jetbrains/android/database/AndroidDbManager.java
index f342d3e77f9..bacf4a014c1 100644
--- a/android/ultimate/src/org/jetbrains/android/database/AndroidDbManager.java
+++ b/android/ultimate/src/org/jetbrains/android/database/AndroidDbManager.java
@@ -104,12 +104,12 @@ public class AndroidDbManager extends DbPsiManagerSpi {
 
   @NotNull
   @Override
-  public DataSourceTemplate[] getDataSourceTemplates() {
+  public List<DataSourceTemplate> getDataSourceTemplates() {
     if (ProjectFacetManager.getInstance(myDbFacade.getProject()).hasFacets(AndroidFacet.ID)) {
-      return new DataSourceTemplate[] { DEFAULT_TEMPLATE };
+      return Collections.singletonList(DEFAULT_TEMPLATE);
     }
     else {
-      return new DataSourceTemplate[0];
+      return Collections.emptyList();
     }
   }
 
@@ -206,10 +206,10 @@ public class AndroidDbManager extends DbPsiManagerSpi {
       return getName();
     }
 
-    @Nullable
+    @NotNull
     @Override
-    public DataSourceTemplate[] getSubConfigurations() {
-      return null;
+    public List<DataSourceTemplate> getSubConfigurations() {
+      return Collections.emptyList();
     }
 
     @NotNull