aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwgalanciak2014-01-14 18:19:18 (EST)
committerGerrit Code Review @ Eclipse.org2014-01-15 14:29:31 (EST)
commit63c30cfcf1c2636aa429aaf9ea20cfa603389182 (patch)
treedae59126ea37f48b9a41773035e052fefec7c7aa
parent2ae4454072fcbc41df65f895cd3ba35a497380fe (diff)
downloadorg.eclipse.pdt-63c30cfcf1c2636aa429aaf9ea20cfa603389182.zip
org.eclipse.pdt-63c30cfcf1c2636aa429aaf9ea20cfa603389182.tar.gz
org.eclipse.pdt-63c30cfcf1c2636aa429aaf9ea20cfa603389182.tar.bz2
Bug 425708 - Invalid label of default PHP executable in launch configrefs/changes/34/20634/2
dialog Change-Id: If4ac62bcb318cd46072d2e1e35028735c1319902 Signed-off-by: wgalanciak <wojciech.galanciak@gmail.com>
-rw-r--r--plugins/org.eclipse.php.debug.ui/src/org/eclipse/php/internal/debug/ui/PHPDebugUIMessages.properties2
-rw-r--r--plugins/org.eclipse.php.debug.ui/src/org/eclipse/php/internal/debug/ui/preferences/phps/NewPHPsComboBlock.java4
2 files changed, 3 insertions, 3 deletions
diff --git a/plugins/org.eclipse.php.debug.ui/src/org/eclipse/php/internal/debug/ui/PHPDebugUIMessages.properties b/plugins/org.eclipse.php.debug.ui/src/org/eclipse/php/internal/debug/ui/PHPDebugUIMessages.properties
index b6d0e54..3a77b72 100644
--- a/plugins/org.eclipse.php.debug.ui/src/org/eclipse/php/internal/debug/ui/PHPDebugUIMessages.properties
+++ b/plugins/org.eclipse.php.debug.ui/src/org/eclipse/php/internal/debug/ui/PHPDebugUIMessages.properties
@@ -195,7 +195,7 @@ CreateStepFilterDialog_stepFilterAlreadyExists=Step Filter already exists.
FilterLabelProvider_readOnly=\ (Reserved Filter)
NewPHPsComboBlock_13=Workspace
NewPHPsComboBlock_14=Project
-NewPHPsComboBlock_15=\ &default PHP :
+NewPHPsComboBlock_15=\ &default PHP:
NewPHPsComboBlock_4=No PHP exes defined
NewPHPsComboBlock_5=Zend
NewPHPsComboBlock_7=Xdebug
diff --git a/plugins/org.eclipse.php.debug.ui/src/org/eclipse/php/internal/debug/ui/preferences/phps/NewPHPsComboBlock.java b/plugins/org.eclipse.php.debug.ui/src/org/eclipse/php/internal/debug/ui/preferences/phps/NewPHPsComboBlock.java
index abee46c..fe4fb81 100644
--- a/plugins/org.eclipse.php.debug.ui/src/org/eclipse/php/internal/debug/ui/preferences/phps/NewPHPsComboBlock.java
+++ b/plugins/org.eclipse.php.debug.ui/src/org/eclipse/php/internal/debug/ui/preferences/phps/NewPHPsComboBlock.java
@@ -797,14 +797,14 @@ public class NewPHPsComboBlock {
debugger = PHPDebugUIMessages.NewPHPsComboBlock_7;
}
name = item.getName()
- + " (" + debugger + " " + item.getVersion() + " " + item.getSapiType() + " " + ")"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
+ + " (" + debugger + " " + item.getVersion() + " " + item.getSapiType() + ")"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
}
if (isDefault) {
String defaultPrefix = PHPDebugUIMessages.NewPHPsComboBlock_13;
if (project != null) {
defaultPrefix = PHPDebugUIMessages.NewPHPsComboBlock_14;
}
- return defaultPrefix + PHPDebugUIMessages.NewPHPsComboBlock_15 + name;
+ return defaultPrefix + PHPDebugUIMessages.NewPHPsComboBlock_15 + " " + name; //$NON-NLS-1$
}
return name;
}