#6490 Connections copy-paste fix (use right project)

Former-commit-id: 0414fc5f

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/DataSourceDescriptorManager.java

@@ -21,6 +21,7 @@ import org.jkiss.dbeaver.model.DBPDataSource;
 import org.jkiss.dbeaver.model.DBPDataSourceFolder;
 import org.jkiss.dbeaver.model.DBPObject;
 import org.jkiss.dbeaver.model.app.DBPDataSourceRegistry;
+import org.jkiss.dbeaver.model.app.DBPProject;
 import org.jkiss.dbeaver.model.connection.DBPConnectionConfiguration;
 import org.jkiss.dbeaver.model.edit.DBECommandContext;
 import org.jkiss.dbeaver.model.edit.DBEObjectMaker;
@@ -74,6 +75,8 @@ public class DataSourceDescriptorManager extends AbstractObjectManager<DataSourc
             DBPDataSourceFolder folder = null;
             if (container instanceof DataSourceRegistry) {
                 registry = (DBPDataSourceRegistry) container;
+            } else if (container instanceof DBPProject) {
+                registry = ((DBPProject) container).getDataSourceRegistry();
             } else if (container instanceof DBPDataSourceFolder) {
                 folder = (DBPDataSourceFolder) container;
                 registry = folder.getDataSourceRegistry();

plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/app/DBPProject.java

@@ -22,13 +22,14 @@ import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.equinox.security.storage.ISecurePreferences;
 import org.jkiss.code.NotNull;
+import org.jkiss.dbeaver.model.DBPObject;
 
 import java.io.File;
 
 /**
  * DBPWorkspace
  */
-public interface DBPProject
+public interface DBPProject extends DBPObject
 {
     String METADATA_FOLDER = ".dbeaver";
 

plugins/org.jkiss.dbeaver.ui.navigator/src/org/jkiss/dbeaver/ui/navigator/actions/NavigatorHandlerObjectCreateBase.java

@@ -30,10 +30,7 @@ import org.jkiss.dbeaver.model.DBPRefreshableObject;
 import org.jkiss.dbeaver.model.DBPScriptObject;
 import org.jkiss.dbeaver.model.edit.DBEObjectMaker;
 import org.jkiss.dbeaver.model.edit.DBEObjectManager;
-import org.jkiss.dbeaver.model.navigator.DBNContainer;
-import org.jkiss.dbeaver.model.navigator.DBNDataSource;
-import org.jkiss.dbeaver.model.navigator.DBNDatabaseNode;
-import org.jkiss.dbeaver.model.navigator.DBNNode;
+import org.jkiss.dbeaver.model.navigator.*;
 import org.jkiss.dbeaver.model.runtime.AbstractJob;
 import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
 import org.jkiss.dbeaver.model.runtime.DBRRunnableWithProgress;
@@ -85,7 +82,18 @@ public abstract class NavigatorHandlerObjectCreateBase extends NavigatorHandlerO
             }
 
             DBSObject sourceObject = copyFrom == null ? null : copyFrom.getObject();
-            final Object parentObject = container instanceof DBNDatabaseNode ? ((DBNDatabaseNode) container).getValueObject() : null;
+            final Object parentObject;
+            if (container instanceof DBNDatabaseNode) {
+                parentObject = ((DBNDatabaseNode) container).getValueObject();
+            } else if (container instanceof DBNProject) {
+                parentObject = ((DBNProject) container).getProject();
+            } else if (container instanceof DBNProjectDatabases) {
+                parentObject = container.getOwnerProject();
+            } else if (container instanceof DBNLocalFolder) {
+                parentObject = ((DBNLocalFolder) container).getFolder();
+            } else {
+                parentObject = null;
+            }
 
             // Do not check for type - manager must do it. Potentially we can copy anything into anything.
 //            if (sourceObject != null && !childType.isAssignableFrom(sourceObject.getClass())) {