Google Git
Sign in
eclipse/dltk/org.eclipse.dltk.python/83ddb5c1beab682b9715fe9729b47198f2646146^!/.
commit
83ddb5c1beab682b9715fe9729b47198f2646146
[log]
author
apanchenk <apanchenk>
Tue Oct 13 10:44:45 2009 +0000
committer
apanchenk <apanchenk>
Tue Oct 13 10:44:45 2009 +0000
tree
94a9e5698c4e6ab060256726a0de50ce78b24a3d
parent
e1e8d9a60414a80c10557fafe0339aee05ed3634 [diff]
*InterpreterComboBlock related refactoring

diff --git a/plugins/org.eclipse.dltk.python.debug.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.dltk.python.debug.ui/META-INF/MANIFEST.MF
index 91ddf95..31ab83a 100644
--- a/plugins/org.eclipse.dltk.python.debug.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.dltk.python.debug.ui/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.dltk.python.debug.ui;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Activator: org.eclipse.dltk.python.internal.debug.ui.PythonDebugUIPlugin
 Bundle-Vendor: %pluginProvider
 Bundle-Localization: plugin

diff --git a/plugins/org.eclipse.dltk.python.debug.ui/src/org/eclipse/dltk/python/internal/debug/ui/interpreters/PythonInterpreterComboBlock.java b/plugins/org.eclipse.dltk.python.debug.ui/src/org/eclipse/dltk/python/internal/debug/ui/interpreters/PythonInterpreterComboBlock.java
deleted file mode 100644
index b605464..0000000
--- a/plugins/org.eclipse.dltk.python.debug.ui/src/org/eclipse/dltk/python/internal/debug/ui/interpreters/PythonInterpreterComboBlock.java
+++ /dev/null

@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- 
- *******************************************************************************/
-package org.eclipse.dltk.python.internal.debug.ui.interpreters;
-
-import org.eclipse.dltk.debug.ui.launchConfigurations.IMainLaunchConfigurationTabListenerManager;
-import org.eclipse.dltk.internal.debug.ui.interpreters.AbstractInterpreterComboBlock;
-import org.eclipse.dltk.python.core.PythonNature;
-
-public class PythonInterpreterComboBlock extends AbstractInterpreterComboBlock {
-	protected PythonInterpreterComboBlock(
-			IMainLaunchConfigurationTabListenerManager tab) {
-		super(tab);
-	}
-
-	protected String getCurrentLanguageNature() {
-		return PythonNature.NATURE_ID;
-	}
-
-}

diff --git a/plugins/org.eclipse.dltk.python.debug.ui/src/org/eclipse/dltk/python/internal/debug/ui/interpreters/PythonInterpreterContainerWizardPage.java b/plugins/org.eclipse.dltk.python.debug.ui/src/org/eclipse/dltk/python/internal/debug/ui/interpreters/PythonInterpreterContainerWizardPage.java
index c60c39d..80513bc 100644
--- a/plugins/org.eclipse.dltk.python.debug.ui/src/org/eclipse/dltk/python/internal/debug/ui/interpreters/PythonInterpreterContainerWizardPage.java
+++ b/plugins/org.eclipse.dltk.python.debug.ui/src/org/eclipse/dltk/python/internal/debug/ui/interpreters/PythonInterpreterContainerWizardPage.java

@@ -9,14 +9,14 @@
  *******************************************************************************/
 package org.eclipse.dltk.python.internal.debug.ui.interpreters;
 
-
-import org.eclipse.dltk.internal.debug.ui.interpreters.AbstractInterpreterComboBlock;
 import org.eclipse.dltk.internal.debug.ui.interpreters.AbstractInterpreterContainerWizardPage;
+import org.eclipse.dltk.python.core.PythonNature;
 
+public class PythonInterpreterContainerWizardPage extends
+		AbstractInterpreterContainerWizardPage {
 
-public class PythonInterpreterContainerWizardPage extends AbstractInterpreterContainerWizardPage {
-
-	protected AbstractInterpreterComboBlock getInterpreterBlock() {
-		return new PythonInterpreterComboBlock(null);
+	@Override
+	public String getScriptNature() {
+		return PythonNature.NATURE_ID;
 	}
 }

diff --git a/plugins/org.eclipse.dltk.python.debug.ui/src/org/eclipse/dltk/python/internal/debug/ui/interpreters/PythonInterpreterTab.java b/plugins/org.eclipse.dltk.python.debug.ui/src/org/eclipse/dltk/python/internal/debug/ui/interpreters/PythonInterpreterTab.java
deleted file mode 100644
index 785fe31..0000000
--- a/plugins/org.eclipse.dltk.python.debug.ui/src/org/eclipse/dltk/python/internal/debug/ui/interpreters/PythonInterpreterTab.java
+++ /dev/null

@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- 
- *******************************************************************************/
-package org.eclipse.dltk.python.internal.debug.ui.interpreters;
-
-import org.eclipse.dltk.debug.ui.launchConfigurations.IMainLaunchConfigurationTabListenerManager;
-import org.eclipse.dltk.debug.ui.launchConfigurations.InterpreterTab;
-import org.eclipse.dltk.internal.debug.ui.interpreters.AbstractInterpreterComboBlock;
-import org.eclipse.dltk.python.core.PythonNature;
-
-public class PythonInterpreterTab extends InterpreterTab {
-
-	public PythonInterpreterTab(
-			IMainLaunchConfigurationTabListenerManager listenerManager) {
-		super(listenerManager);
-		// TODO Auto-generated constructor stub
-	}
-
-	protected AbstractInterpreterComboBlock getInterpreterBlock() {
-		return new PythonInterpreterComboBlock(getMainTab());
-	}
-
-	protected String getNature() {
-		return PythonNature.NATURE_ID;
-	}
-	
-}

diff --git a/plugins/org.eclipse.dltk.python.debug.ui/src/org/eclipse/dltk/python/internal/debug/ui/launchConfigurations/PythonMainLaunchConfigurationTab.java b/plugins/org.eclipse.dltk.python.debug.ui/src/org/eclipse/dltk/python/internal/debug/ui/launchConfigurations/PythonMainLaunchConfigurationTab.java
index 55a70f7..d96a0db 100644
--- a/plugins/org.eclipse.dltk.python.debug.ui/src/org/eclipse/dltk/python/internal/debug/ui/launchConfigurations/PythonMainLaunchConfigurationTab.java
+++ b/plugins/org.eclipse.dltk.python.debug.ui/src/org/eclipse/dltk/python/internal/debug/ui/launchConfigurations/PythonMainLaunchConfigurationTab.java

@@ -27,6 +27,7 @@
 	/*
 	 * @see org.eclipse.dltk.debug.ui.launchConfigurations.ScriptLaunchConfigurationTab#breakOnFirstLinePrefEnabled(org.eclipse.dltk.core.PreferencesLookupDelegate)
 	 */
+	@Override
 	protected boolean breakOnFirstLinePrefEnabled(
 			PreferencesLookupDelegate delegate) {
 		return delegate.getBoolean(PythonDebugPlugin.PLUGIN_ID,
@@ -36,15 +37,17 @@
 	/*
 	 * @see org.eclipse.dltk.debug.ui.launchConfigurations.ScriptLaunchConfigurationTab#dbpgLoggingPrefEnabled(org.eclipse.dltk.core.PreferencesLookupDelegate)
 	 */
+	@Override
 	protected boolean dbpgLoggingPrefEnabled(PreferencesLookupDelegate delegate) {
 		return delegate.getBoolean(PythonDebugPlugin.PLUGIN_ID,
 				DLTKDebugPreferenceConstants.PREF_DBGP_ENABLE_LOGGING);
 	}
 
-	/*
-	 * @see org.eclipse.dltk.debug.ui.launchConfigurations.ScriptLaunchConfigurationTab#getNatureID()
+	/**
+	 * @since 2.0
 	 */
-	protected String getNatureID() {
+	@Override
+	public String getNatureID() {
 		return PythonNature.NATURE_ID;
 	}
 }

diff --git a/plugins/org.eclipse.dltk.python.debug.ui/src/org/eclipse/dltk/python/internal/debug/ui/launchConfigurations/PythonTabGroup.java b/plugins/org.eclipse.dltk.python.debug.ui/src/org/eclipse/dltk/python/internal/debug/ui/launchConfigurations/PythonTabGroup.java
index a9a3709..2e6a715 100644
--- a/plugins/org.eclipse.dltk.python.debug.ui/src/org/eclipse/dltk/python/internal/debug/ui/launchConfigurations/PythonTabGroup.java
+++ b/plugins/org.eclipse.dltk.python.debug.ui/src/org/eclipse/dltk/python/internal/debug/ui/launchConfigurations/PythonTabGroup.java

@@ -14,21 +14,17 @@
 import org.eclipse.debug.ui.EnvironmentTab;
 import org.eclipse.debug.ui.ILaunchConfigurationDialog;
 import org.eclipse.debug.ui.ILaunchConfigurationTab;
+import org.eclipse.dltk.debug.ui.launchConfigurations.InterpreterTab;
 import org.eclipse.dltk.debug.ui.launchConfigurations.ScriptArgumentsTab;
-import org.eclipse.dltk.python.internal.debug.ui.interpreters.PythonInterpreterTab;
-
 
 public class PythonTabGroup extends AbstractLaunchConfigurationTabGroup {
 	public void createTabs(ILaunchConfigurationDialog dialog, String mode) {
-		
-		PythonMainLaunchConfigurationTab main = new PythonMainLaunchConfigurationTab(mode);
-		ILaunchConfigurationTab[] tabs = new ILaunchConfigurationTab[] {
-				main,
-				new ScriptArgumentsTab(),
-				new PythonInterpreterTab(main),
-				new EnvironmentTab(),
-				new CommonTab()
-		};
+
+		PythonMainLaunchConfigurationTab main = new PythonMainLaunchConfigurationTab(
+				mode);
+		ILaunchConfigurationTab[] tabs = new ILaunchConfigurationTab[] { main,
+				new ScriptArgumentsTab(), new InterpreterTab(main),
+				new EnvironmentTab(), new CommonTab() };
 		setTabs(tabs);
 	}
 }