summaryrefslogtreecommitdiff
path: root/android/ultimate
diff options
context:
space:
mode:
authorSergey Rieder <Sergey.Rieder@jetbrains.com>2013-10-08 17:35:13 +0400
committerSergey Rieder <Sergey.Rieder@jetbrains.com>2013-10-08 19:23:36 +0400
commit00b4d27bef6f33e9597c31e5648886d073767412 (patch)
tree48aa77143e8a1e4304a053eb49b9ee8f355fe399 /android/ultimate
parentfea5b23d22ea8308d0b33affb1bae493e2698867 (diff)
downloadidea-00b4d27bef6f33e9597c31e5648886d073767412.tar.gz
IDEA-114087 - Drivers auto-download on DS create. ResultPanel NPE fix.
Diffstat (limited to 'android/ultimate')
-rw-r--r--android/ultimate/src/org/jetbrains/android/database/AndroidDbManager.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/android/ultimate/src/org/jetbrains/android/database/AndroidDbManager.java b/android/ultimate/src/org/jetbrains/android/database/AndroidDbManager.java
index 672adb54ced..a4e946e9612 100644
--- a/android/ultimate/src/org/jetbrains/android/database/AndroidDbManager.java
+++ b/android/ultimate/src/org/jetbrains/android/database/AndroidDbManager.java
@@ -207,7 +207,7 @@ public class AndroidDbManager extends DbPsiManagerSpi {
@NotNull
@Override
- public DataSourceInfo createDataSource(Project project, DataSourceInfo copyFrom) {
+ public DataSourceInfo createDataSource(@NotNull JComponent parentPanel, Project project, DataSourceInfo copyFrom) {
AndroidDataSource result;
if (copyFrom instanceof AndroidDataSource ) {
result = ((AndroidDataSource )copyFrom).copy();