From 474224e68116e2994d648d930d180fa1d9aed89f Mon Sep 17 00:00:00 2001 From: Alexander Fedorov Date: Fri, 9 Mar 2018 15:24:35 +0300 Subject: [PATCH] #3118 rename Launch* to DatabaseLaunch* --- ...actory.java => DatabaseLaunchContributionFactory.java} | 8 ++++---- ...utionItem.java => DatabaseLaunchContributionItem.java} | 4 ++-- .../{LaunchShortcut.java => DatabaseLaunchShortcut.java} | 2 +- .../postgresql/debug/ui/internal/PgSqlLaunchShortcut.java | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) rename plugins/org.jkiss.dbeaver.debug.ui/src/org/jkiss/dbeaver/debug/ui/{LaunchContributionFactory.java => DatabaseLaunchContributionFactory.java} (89%) rename plugins/org.jkiss.dbeaver.debug.ui/src/org/jkiss/dbeaver/debug/ui/{LaunchContributionItem.java => DatabaseLaunchContributionItem.java} (98%) rename plugins/org.jkiss.dbeaver.debug.ui/src/org/jkiss/dbeaver/debug/ui/{LaunchShortcut.java => DatabaseLaunchShortcut.java} (99%) diff --git a/plugins/org.jkiss.dbeaver.debug.ui/src/org/jkiss/dbeaver/debug/ui/LaunchContributionFactory.java b/plugins/org.jkiss.dbeaver.debug.ui/src/org/jkiss/dbeaver/debug/ui/DatabaseLaunchContributionFactory.java similarity index 89% rename from plugins/org.jkiss.dbeaver.debug.ui/src/org/jkiss/dbeaver/debug/ui/LaunchContributionFactory.java rename to plugins/org.jkiss.dbeaver.debug.ui/src/org/jkiss/dbeaver/debug/ui/DatabaseLaunchContributionFactory.java index 2e40ca36e6..40909273e0 100644 --- a/plugins/org.jkiss.dbeaver.debug.ui/src/org/jkiss/dbeaver/debug/ui/LaunchContributionFactory.java +++ b/plugins/org.jkiss.dbeaver.debug.ui/src/org/jkiss/dbeaver/debug/ui/DatabaseLaunchContributionFactory.java @@ -28,14 +28,14 @@ import org.eclipse.ui.menus.ExtensionContributionFactory; import org.eclipse.ui.menus.IContributionRoot; import org.eclipse.ui.services.IServiceLocator; -public abstract class LaunchContributionFactory extends ExtensionContributionFactory { +public abstract class DatabaseLaunchContributionFactory extends ExtensionContributionFactory { private final String id; private String text; private ImageDescriptor imageDescriptor; - public LaunchContributionFactory(String id) { + public DatabaseLaunchContributionFactory(String id) { this.id = id; } @@ -48,7 +48,7 @@ public abstract class LaunchContributionFactory extends ExtensionContributionFac return; } MenuManager menuManager = new MenuManager(text, imageDescriptor, id); - LaunchContributionItem item = createContributionItem(); + DatabaseLaunchContributionItem item = createContributionItem(); item.setVisible(true); menuManager.add(item); additions.addContributionItem(menuManager, null); @@ -74,5 +74,5 @@ public abstract class LaunchContributionFactory extends ExtensionContributionFac return DebugUI.BUNDLE_SYMBOLIC_NAME + '/' + id; } - protected abstract LaunchContributionItem createContributionItem(); + protected abstract DatabaseLaunchContributionItem createContributionItem(); } diff --git a/plugins/org.jkiss.dbeaver.debug.ui/src/org/jkiss/dbeaver/debug/ui/LaunchContributionItem.java b/plugins/org.jkiss.dbeaver.debug.ui/src/org/jkiss/dbeaver/debug/ui/DatabaseLaunchContributionItem.java similarity index 98% rename from plugins/org.jkiss.dbeaver.debug.ui/src/org/jkiss/dbeaver/debug/ui/LaunchContributionItem.java rename to plugins/org.jkiss.dbeaver.debug.ui/src/org/jkiss/dbeaver/debug/ui/DatabaseLaunchContributionItem.java index 5ab6dfc2af..b0a3c61e7a 100644 --- a/plugins/org.jkiss.dbeaver.debug.ui/src/org/jkiss/dbeaver/debug/ui/LaunchContributionItem.java +++ b/plugins/org.jkiss.dbeaver.debug.ui/src/org/jkiss/dbeaver/debug/ui/DatabaseLaunchContributionItem.java @@ -47,7 +47,7 @@ import org.eclipse.ui.PlatformUI; import org.jkiss.dbeaver.debug.internal.ui.DebugUIInternals; import org.jkiss.dbeaver.model.struct.DBSObject; -public class LaunchContributionItem extends ContributionItem { +public class DatabaseLaunchContributionItem extends ContributionItem { private static final Object[] NO_OBJECTS = new Object[0]; @@ -58,7 +58,7 @@ public class LaunchContributionItem extends ContributionItem { // map of launch groups by (non-null) categories, for this mode private Map groupsByCategory = null; - protected LaunchContributionItem(String mode) { + protected DatabaseLaunchContributionItem(String mode) { this.mode = mode; ILaunchGroup[] groups = DebugUITools.getLaunchGroups(); groupsByCategory = new HashMap(3); diff --git a/plugins/org.jkiss.dbeaver.debug.ui/src/org/jkiss/dbeaver/debug/ui/LaunchShortcut.java b/plugins/org.jkiss.dbeaver.debug.ui/src/org/jkiss/dbeaver/debug/ui/DatabaseLaunchShortcut.java similarity index 99% rename from plugins/org.jkiss.dbeaver.debug.ui/src/org/jkiss/dbeaver/debug/ui/LaunchShortcut.java rename to plugins/org.jkiss.dbeaver.debug.ui/src/org/jkiss/dbeaver/debug/ui/DatabaseLaunchShortcut.java index c88ebc87c6..bd86040915 100644 --- a/plugins/org.jkiss.dbeaver.debug.ui/src/org/jkiss/dbeaver/debug/ui/LaunchShortcut.java +++ b/plugins/org.jkiss.dbeaver.debug.ui/src/org/jkiss/dbeaver/debug/ui/DatabaseLaunchShortcut.java @@ -50,7 +50,7 @@ import org.jkiss.dbeaver.debug.core.DebugCore; import org.jkiss.dbeaver.debug.internal.ui.DebugUIMessages; import org.jkiss.dbeaver.model.struct.DBSObject; -public abstract class LaunchShortcut implements ILaunchShortcut2 { +public abstract class DatabaseLaunchShortcut implements ILaunchShortcut2 { @Override public void launch(ISelection selection, String mode) { diff --git a/plugins/org.jkiss.dbeaver.ext.postgresql.debug.ui/src/org/jkiss/dbeaver/ext/postgresql/debug/ui/internal/PgSqlLaunchShortcut.java b/plugins/org.jkiss.dbeaver.ext.postgresql.debug.ui/src/org/jkiss/dbeaver/ext/postgresql/debug/ui/internal/PgSqlLaunchShortcut.java index b1bc41509e..bc1cce39ca 100644 --- a/plugins/org.jkiss.dbeaver.ext.postgresql.debug.ui/src/org/jkiss/dbeaver/ext/postgresql/debug/ui/internal/PgSqlLaunchShortcut.java +++ b/plugins/org.jkiss.dbeaver.ext.postgresql.debug.ui/src/org/jkiss/dbeaver/ext/postgresql/debug/ui/internal/PgSqlLaunchShortcut.java @@ -21,12 +21,12 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.debug.core.ILaunchConfiguration; import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy; import org.jkiss.dbeaver.debug.core.DebugCore; -import org.jkiss.dbeaver.debug.ui.LaunchShortcut; +import org.jkiss.dbeaver.debug.ui.DatabaseLaunchShortcut; import org.jkiss.dbeaver.ext.postgresql.debug.core.PostgreSqlDebugCore; import org.jkiss.dbeaver.ext.postgresql.model.PostgreProcedure; import org.jkiss.dbeaver.model.struct.DBSObject; -public class PgSqlLaunchShortcut extends LaunchShortcut { +public class PgSqlLaunchShortcut extends DatabaseLaunchShortcut { @Override protected String getSelectionEmptyMessage() { -- GitLab