From e699f8cfba1979fb780f26414f731bc1a46c91e2 Mon Sep 17 00:00:00 2001 From: John Cortell Date: Thu, 6 May 2010 17:51:58 +0000 Subject: [PATCH] CDT has not moved up to Java 1.6. Can't use String.isEmpty() --- .../eclipse/cdt/debug/gdbjtag/ui/GDBJtagDSFDebuggerTab.java | 4 ++-- .../org/eclipse/cdt/debug/gdbjtag/ui/GDBJtagDebuggerTab.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/jtag/org.eclipse.cdt.debug.gdbjtag.ui/src/org/eclipse/cdt/debug/gdbjtag/ui/GDBJtagDSFDebuggerTab.java b/jtag/org.eclipse.cdt.debug.gdbjtag.ui/src/org/eclipse/cdt/debug/gdbjtag/ui/GDBJtagDSFDebuggerTab.java index e55578d3639..e84d9f3f2c9 100644 --- a/jtag/org.eclipse.cdt.debug.gdbjtag.ui/src/org/eclipse/cdt/debug/gdbjtag/ui/GDBJtagDSFDebuggerTab.java +++ b/jtag/org.eclipse.cdt.debug.gdbjtag.ui/src/org/eclipse/cdt/debug/gdbjtag/ui/GDBJtagDSFDebuggerTab.java @@ -367,7 +367,7 @@ public class GDBJtagDSFDebuggerTab extends AbstractLaunchConfigurationTab { useRemote.setSelection(useRemoteAttr); savedJtagDevice = configuration.getAttribute(IGDBJtagConstants.ATTR_JTAG_DEVICE, ""); - if (savedJtagDevice.isEmpty()) { + if (savedJtagDevice.length() == 0) { jtagDevice.select(0); } else { String storedAddress = ""; //$NON-NLS-1$ @@ -424,7 +424,7 @@ public class GDBJtagDSFDebuggerTab extends AbstractLaunchConfigurationTab { savedJtagDevice = jtagDevice.getText(); configuration.setAttribute(IGDBJtagConstants.ATTR_JTAG_DEVICE, savedJtagDevice); configuration.setAttribute(IGDBJtagConstants.ATTR_USE_REMOTE_TARGET, useRemote.getSelection()); - if (!savedJtagDevice.isEmpty()) { + if (savedJtagDevice.length() > 0) { try { IGDBJtagDevice device = findJtagDeviceByName(jtagDevice.getText()).getDevice(); if (device instanceof IGDBJtagConnection) { diff --git a/jtag/org.eclipse.cdt.debug.gdbjtag.ui/src/org/eclipse/cdt/debug/gdbjtag/ui/GDBJtagDebuggerTab.java b/jtag/org.eclipse.cdt.debug.gdbjtag.ui/src/org/eclipse/cdt/debug/gdbjtag/ui/GDBJtagDebuggerTab.java index 19687a996ed..8a474df65da 100644 --- a/jtag/org.eclipse.cdt.debug.gdbjtag.ui/src/org/eclipse/cdt/debug/gdbjtag/ui/GDBJtagDebuggerTab.java +++ b/jtag/org.eclipse.cdt.debug.gdbjtag.ui/src/org/eclipse/cdt/debug/gdbjtag/ui/GDBJtagDebuggerTab.java @@ -459,7 +459,7 @@ public class GDBJtagDebuggerTab extends AbstractLaunchConfigurationTab { useRemoteChanged(); savedJtagDevice = configuration.getAttribute(IGDBJtagConstants.ATTR_JTAG_DEVICE, ""); //$NON-NLS-1$ - if (savedJtagDevice.isEmpty()) { + if (savedJtagDevice.length() == 0) { jtagDevice.select(0); } else { String storedAddress = ""; //$NON-NLS-1$ @@ -514,7 +514,7 @@ public class GDBJtagDebuggerTab extends AbstractLaunchConfigurationTab { savedJtagDevice = jtagDevice.getText(); configuration.setAttribute(IGDBJtagConstants.ATTR_JTAG_DEVICE, savedJtagDevice); configuration.setAttribute(IGDBJtagConstants.ATTR_USE_REMOTE_TARGET, useRemote.getSelection()); - if (!savedJtagDevice.isEmpty()) { + if (savedJtagDevice.length() > 0) { try { IGDBJtagDevice device = findJtagDeviceByName(jtagDevice.getText()).getDevice(); if (device instanceof IGDBJtagConnection) {