mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-08-02 22:05:44 +02:00
Bug 561995 - Remove dependency to com.ibm.icu from CDT Debug UI
Switch to JRE implementations: * com.ibm.icu.text.MessageFormat -> java.text.MessageFormat * com.ibm.icu.text.DateFormat -> java.text.DateFormat Signed-off-by: Mat Booth <mat.booth@gmail.com> Change-Id: Ie73d4f4152f43b155d3a5425fe4f8cec15bf45da
This commit is contained in:
parent
b0cb9b10d7
commit
46d7fb74da
15 changed files with 17 additions and 31 deletions
|
@ -2,7 +2,7 @@ Manifest-Version: 1.0
|
|||
Bundle-ManifestVersion: 2
|
||||
Bundle-Name: %pluginName
|
||||
Bundle-SymbolicName: org.eclipse.cdt.debug.ui; singleton:=true
|
||||
Bundle-Version: 8.4.200.qualifier
|
||||
Bundle-Version: 8.4.300.qualifier
|
||||
Bundle-Activator: org.eclipse.cdt.debug.ui.CDebugUIPlugin
|
||||
Bundle-Vendor: %providerName
|
||||
Bundle-Localization: plugin
|
||||
|
@ -61,5 +61,4 @@ Require-Bundle: org.eclipse.ui.ide;bundle-version="[3.16.0,4.0.0)",
|
|||
org.eclipse.launchbar.ui;bundle-version="2.0.0"
|
||||
Bundle-ActivationPolicy: lazy
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-11
|
||||
Import-Package: com.ibm.icu.text
|
||||
Automatic-Module-Name: org.eclipse.cdt.debug.ui
|
||||
|
|
|
@ -20,6 +20,7 @@ package org.eclipse.cdt.debug.internal.ui;
|
|||
|
||||
import java.io.File;
|
||||
import java.net.URI;
|
||||
import java.text.MessageFormat;
|
||||
import java.util.HashMap;
|
||||
|
||||
import org.eclipse.cdt.core.IAddress;
|
||||
|
@ -97,8 +98,6 @@ import org.eclipse.ui.PlatformUI;
|
|||
import org.eclipse.ui.ide.IDE;
|
||||
import org.eclipse.ui.part.FileEditorInput;
|
||||
|
||||
import com.ibm.icu.text.MessageFormat;
|
||||
|
||||
/**
|
||||
* @see IDebugModelPresentation
|
||||
*/
|
||||
|
|
|
@ -15,6 +15,7 @@
|
|||
package org.eclipse.cdt.debug.internal.ui;
|
||||
|
||||
import java.net.URI;
|
||||
import java.text.MessageFormat;
|
||||
import java.util.Iterator;
|
||||
|
||||
import org.eclipse.cdt.debug.core.model.ICBreakpoint;
|
||||
|
@ -66,8 +67,6 @@ import org.eclipse.ui.progress.UIJob;
|
|||
import org.eclipse.ui.texteditor.ITextEditor;
|
||||
import org.eclipse.ui.texteditor.SimpleMarkerAnnotation;
|
||||
|
||||
import com.ibm.icu.text.MessageFormat;
|
||||
|
||||
/**
|
||||
* Utility methods for C/C++ Debug UI.
|
||||
*/
|
||||
|
|
|
@ -13,6 +13,7 @@
|
|||
*******************************************************************************/
|
||||
package org.eclipse.cdt.debug.internal.ui.actions;
|
||||
|
||||
import java.text.MessageFormat;
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
|
||||
|
@ -40,8 +41,6 @@ import org.eclipse.swt.widgets.Control;
|
|||
import org.eclipse.swt.widgets.Shell;
|
||||
import org.eclipse.ui.PlatformUI;
|
||||
|
||||
import com.ibm.icu.text.MessageFormat;
|
||||
|
||||
/**
|
||||
* This dialog is used to add/edit user-defined register groups.
|
||||
*/
|
||||
|
|
|
@ -13,11 +13,10 @@
|
|||
*******************************************************************************/
|
||||
package org.eclipse.cdt.debug.internal.ui.launch;
|
||||
|
||||
import java.text.MessageFormat;
|
||||
import java.util.MissingResourceException;
|
||||
import java.util.ResourceBundle;
|
||||
|
||||
import com.ibm.icu.text.MessageFormat;
|
||||
|
||||
public class LaunchMessages {
|
||||
private static final String BUNDLE_NAME = "org.eclipse.cdt.debug.internal.ui.launch.LaunchMessages";//$NON-NLS-1$
|
||||
private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);
|
||||
|
|
|
@ -13,6 +13,8 @@
|
|||
*******************************************************************************/
|
||||
package org.eclipse.cdt.debug.internal.ui.propertypages;
|
||||
|
||||
import java.text.MessageFormat;
|
||||
|
||||
import org.eclipse.cdt.debug.core.CDIDebugModel;
|
||||
import org.eclipse.cdt.debug.core.CDebugUtils;
|
||||
import org.eclipse.cdt.debug.core.model.ICSignal;
|
||||
|
@ -33,8 +35,6 @@ import org.eclipse.swt.widgets.Control;
|
|||
import org.eclipse.swt.widgets.Label;
|
||||
import org.eclipse.ui.dialogs.PropertyPage;
|
||||
|
||||
import com.ibm.icu.text.MessageFormat;
|
||||
|
||||
/**
|
||||
* The property page for a signal.
|
||||
*/
|
||||
|
|
|
@ -14,6 +14,7 @@
|
|||
|
||||
package org.eclipse.cdt.debug.internal.ui.views.executables;
|
||||
|
||||
import java.text.DateFormat;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
|
@ -31,8 +32,6 @@ import org.eclipse.jface.viewers.Viewer;
|
|||
import org.eclipse.jface.viewers.ViewerCell;
|
||||
import org.eclipse.ui.progress.WorkbenchJob;
|
||||
|
||||
import com.ibm.icu.text.DateFormat;
|
||||
|
||||
class ExecutablesContentProvider extends ColumnLabelProvider
|
||||
implements ITreeContentProvider, IExecutablesChangeListener {
|
||||
|
||||
|
|
|
@ -14,6 +14,7 @@
|
|||
|
||||
package org.eclipse.cdt.debug.internal.ui.views.executables;
|
||||
|
||||
import java.text.DateFormat;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
|
@ -33,8 +34,6 @@ import org.eclipse.swt.events.DisposeListener;
|
|||
import org.eclipse.swt.graphics.Font;
|
||||
import org.eclipse.swt.widgets.Display;
|
||||
|
||||
import com.ibm.icu.text.DateFormat;
|
||||
|
||||
public class SourceFilesLabelProvider extends TreeColumnViewerLabelProvider implements IExecutablesChangeListener {
|
||||
|
||||
private SourceFilesViewer viewer;
|
||||
|
|
|
@ -15,6 +15,7 @@ package org.eclipse.cdt.debug.ui.breakpointactions;
|
|||
|
||||
import java.io.ByteArrayOutputStream;
|
||||
import java.io.StringReader;
|
||||
import java.text.MessageFormat;
|
||||
|
||||
import javax.xml.parsers.DocumentBuilder;
|
||||
import javax.xml.parsers.DocumentBuilderFactory;
|
||||
|
@ -45,8 +46,6 @@ import org.w3c.dom.Element;
|
|||
import org.xml.sax.InputSource;
|
||||
import org.xml.sax.helpers.DefaultHandler;
|
||||
|
||||
import com.ibm.icu.text.MessageFormat;
|
||||
|
||||
public class ExternalToolAction extends AbstractBreakpointAction {
|
||||
|
||||
private String externalToolName = ""; //$NON-NLS-1$
|
||||
|
|
|
@ -15,6 +15,7 @@ package org.eclipse.cdt.debug.ui.breakpointactions;
|
|||
|
||||
import java.io.ByteArrayOutputStream;
|
||||
import java.io.StringReader;
|
||||
import java.text.MessageFormat;
|
||||
|
||||
import javax.xml.parsers.DocumentBuilder;
|
||||
import javax.xml.parsers.DocumentBuilderFactory;
|
||||
|
@ -42,8 +43,6 @@ import org.w3c.dom.Element;
|
|||
import org.xml.sax.InputSource;
|
||||
import org.xml.sax.helpers.DefaultHandler;
|
||||
|
||||
import com.ibm.icu.text.MessageFormat;
|
||||
|
||||
public class LogAction extends AbstractBreakpointAction {
|
||||
|
||||
private String message = ""; //$NON-NLS-1$
|
||||
|
|
|
@ -15,6 +15,7 @@ package org.eclipse.cdt.debug.ui.breakpointactions;
|
|||
|
||||
import java.io.ByteArrayOutputStream;
|
||||
import java.io.StringReader;
|
||||
import java.text.MessageFormat;
|
||||
|
||||
import javax.xml.parsers.DocumentBuilder;
|
||||
import javax.xml.parsers.DocumentBuilderFactory;
|
||||
|
@ -41,8 +42,6 @@ import org.w3c.dom.Element;
|
|||
import org.xml.sax.InputSource;
|
||||
import org.xml.sax.helpers.DefaultHandler;
|
||||
|
||||
import com.ibm.icu.text.MessageFormat;
|
||||
|
||||
public class ResumeAction extends AbstractBreakpointAction {
|
||||
|
||||
final static int INCRIMENT_MSEC = 100;
|
||||
|
|
|
@ -17,6 +17,7 @@ import java.io.ByteArrayOutputStream;
|
|||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.io.StringReader;
|
||||
import java.text.MessageFormat;
|
||||
|
||||
import javax.sound.sampled.AudioFormat;
|
||||
import javax.sound.sampled.AudioInputStream;
|
||||
|
@ -46,8 +47,6 @@ import org.w3c.dom.Element;
|
|||
import org.xml.sax.InputSource;
|
||||
import org.xml.sax.helpers.DefaultHandler;
|
||||
|
||||
import com.ibm.icu.text.MessageFormat;
|
||||
|
||||
public class SoundAction extends AbstractBreakpointAction {
|
||||
|
||||
static public void playSoundFile(final File soundFile) {
|
||||
|
|
|
@ -15,6 +15,7 @@
|
|||
*******************************************************************************/
|
||||
package org.eclipse.cdt.debug.ui.breakpoints;
|
||||
|
||||
import java.text.MessageFormat;
|
||||
import java.util.Arrays;
|
||||
|
||||
import org.eclipse.cdt.debug.core.DebugCoreMessages;
|
||||
|
@ -30,8 +31,6 @@ import org.eclipse.jface.viewers.ILabelProvider;
|
|||
import org.eclipse.jface.viewers.LabelProvider;
|
||||
import org.eclipse.swt.graphics.Image;
|
||||
|
||||
import com.ibm.icu.text.MessageFormat;
|
||||
|
||||
/**
|
||||
* Factory for event breakpoint label provider
|
||||
*/
|
||||
|
|
|
@ -14,6 +14,7 @@
|
|||
*******************************************************************************/
|
||||
package org.eclipse.cdt.debug.ui.disassembly.rulers;
|
||||
|
||||
import java.text.MessageFormat;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.Collections;
|
||||
|
@ -41,8 +42,6 @@ import org.eclipse.ui.internal.texteditor.rulers.RulerColumnMessages;
|
|||
import org.eclipse.ui.internal.texteditor.rulers.RulerColumnPlacementConstraint;
|
||||
import org.eclipse.ui.texteditor.ConfigurationElementSorter;
|
||||
|
||||
import com.ibm.icu.text.MessageFormat;
|
||||
|
||||
/**
|
||||
* A registry for all extensions to the
|
||||
* <code>rulerColumns</code> extension point.
|
||||
|
@ -235,7 +234,7 @@ public final class RulerColumnRegistry {
|
|||
}
|
||||
}
|
||||
|
||||
Comparator<RulerColumnDescriptor> gravityComp = new Comparator<RulerColumnDescriptor>() {
|
||||
Comparator<RulerColumnDescriptor> gravityComp = new Comparator<>() {
|
||||
@Override
|
||||
public int compare(RulerColumnDescriptor o1, RulerColumnDescriptor o2) {
|
||||
float diff = o1.getPlacement().getGravity() - o2.getPlacement().getGravity();
|
||||
|
|
|
@ -15,6 +15,7 @@ package org.eclipse.cdt.debug.ui.sourcelookup;
|
|||
|
||||
import java.io.IOException;
|
||||
import java.io.StringReader;
|
||||
import java.text.MessageFormat;
|
||||
|
||||
import javax.xml.parsers.DocumentBuilder;
|
||||
import javax.xml.parsers.DocumentBuilderFactory;
|
||||
|
@ -41,8 +42,6 @@ import org.w3c.dom.Element;
|
|||
import org.xml.sax.InputSource;
|
||||
import org.xml.sax.SAXException;
|
||||
|
||||
import com.ibm.icu.text.MessageFormat;
|
||||
|
||||
/**
|
||||
* Old default source locator. We keep it for migration purposes.
|
||||
*/
|
||||
|
|
Loading…
Add table
Reference in a new issue