From 57a852022ca1feb4d14a1bcb6b2498f66cb7579e Mon Sep 17 00:00:00 2001 From: Alexander Fedorov Date: Fri, 5 Jan 2018 22:04:37 +0300 Subject: [PATCH] #2556 move ProcedureLaunchDelegate to dbeaver.debug.core --- .../debug/core/{model => }/DatabaseLaunchDelegate.java | 5 +++-- .../jkiss/dbeaver/debug/core}/ProcedureLaunchDelegate.java | 4 +--- .../org.jkiss.dbeaver.ext.postgresql.debug.core/plugin.xml | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) rename plugins/org.jkiss.dbeaver.debug.core/src/org/jkiss/dbeaver/debug/core/{model => }/DatabaseLaunchDelegate.java (95%) rename plugins/{org.jkiss.dbeaver.ext.postgresql.debug.core/src/org/jkiss/dbeaver/ext/postgresql/debug/internal/model => org.jkiss.dbeaver.debug.core/src/org/jkiss/dbeaver/debug/core}/ProcedureLaunchDelegate.java (93%) diff --git a/plugins/org.jkiss.dbeaver.debug.core/src/org/jkiss/dbeaver/debug/core/model/DatabaseLaunchDelegate.java b/plugins/org.jkiss.dbeaver.debug.core/src/org/jkiss/dbeaver/debug/core/DatabaseLaunchDelegate.java similarity index 95% rename from plugins/org.jkiss.dbeaver.debug.core/src/org/jkiss/dbeaver/debug/core/model/DatabaseLaunchDelegate.java rename to plugins/org.jkiss.dbeaver.debug.core/src/org/jkiss/dbeaver/debug/core/DatabaseLaunchDelegate.java index 4e7e5c197c..759f5e99cb 100644 --- a/plugins/org.jkiss.dbeaver.debug.core/src/org/jkiss/dbeaver/debug/core/model/DatabaseLaunchDelegate.java +++ b/plugins/org.jkiss.dbeaver.debug.core/src/org/jkiss/dbeaver/debug/core/DatabaseLaunchDelegate.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jkiss.dbeaver.debug.core.model; +package org.jkiss.dbeaver.debug.core; import java.util.HashMap; import java.util.Map; @@ -28,7 +28,8 @@ import org.eclipse.debug.core.ILaunchConfiguration; import org.eclipse.debug.core.model.LaunchConfigurationDelegate; import org.eclipse.osgi.util.NLS; import org.jkiss.dbeaver.debug.DBGController; -import org.jkiss.dbeaver.debug.core.DebugCore; +import org.jkiss.dbeaver.debug.core.model.DatabaseDebugTarget; +import org.jkiss.dbeaver.debug.core.model.DatabaseProcess; import org.jkiss.dbeaver.model.runtime.DefaultProgressMonitor; import org.jkiss.dbeaver.registry.DataSourceDescriptor; import org.jkiss.dbeaver.registry.DataSourceRegistry; diff --git a/plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/src/org/jkiss/dbeaver/ext/postgresql/debug/internal/model/ProcedureLaunchDelegate.java b/plugins/org.jkiss.dbeaver.debug.core/src/org/jkiss/dbeaver/debug/core/ProcedureLaunchDelegate.java similarity index 93% rename from plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/src/org/jkiss/dbeaver/ext/postgresql/debug/internal/model/ProcedureLaunchDelegate.java rename to plugins/org.jkiss.dbeaver.debug.core/src/org/jkiss/dbeaver/debug/core/ProcedureLaunchDelegate.java index ebb765cd3a..cd3aa42d57 100644 --- a/plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/src/org/jkiss/dbeaver/ext/postgresql/debug/internal/model/ProcedureLaunchDelegate.java +++ b/plugins/org.jkiss.dbeaver.debug.core/src/org/jkiss/dbeaver/debug/core/ProcedureLaunchDelegate.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jkiss.dbeaver.ext.postgresql.debug.internal.model; +package org.jkiss.dbeaver.debug.core; import java.util.Map; @@ -23,8 +23,6 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.debug.core.ILaunch; import org.eclipse.osgi.util.NLS; import org.jkiss.dbeaver.debug.DBGProcedureController; -import org.jkiss.dbeaver.debug.core.DebugCore; -import org.jkiss.dbeaver.debug.core.model.DatabaseLaunchDelegate; import org.jkiss.dbeaver.debug.core.model.DatabaseProcess; import org.jkiss.dbeaver.debug.core.model.ProcedureDebugTarget; import org.jkiss.dbeaver.registry.DataSourceDescriptor; diff --git a/plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/plugin.xml b/plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/plugin.xml index 4298994802..098988a242 100644 --- a/plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/plugin.xml +++ b/plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/plugin.xml @@ -22,7 +22,7 @@