From 379004b618126b14a1caa83b2d10b4d877882140 Mon Sep 17 00:00:00 2001 From: Sergei Kovalchuk Date: Tue, 16 Jun 2020 19:52:40 +0300 Subject: [PATCH] Bug 562003 - Remove dependency to com.ibm.icu from CDT Make UI The dependency was removed.The Copyright head was updated. Change-Id: I82e4289fc8cb14e8488b847e8efa415dd1d77b6c Signed-off-by: Sergei Kovalchuk --- build/org.eclipse.cdt.make.ui/META-INF/MANIFEST.MF | 1 - .../eclipse/cdt/make/internal/ui/MakeEnvironmentBlock.java | 6 +++--- .../cdt/make/internal/ui/actions/FoldingMessages.java | 6 +++--- .../cdt/make/internal/ui/dnd/MakeTargetDndUtil.java | 6 +++--- .../internal/ui/dnd/TextTransferDropTargetListener.java | 6 +++--- .../cdt/make/internal/ui/part/WizardCheckboxTablePart.java | 7 ++++--- .../preferences/AbstractMakefileEditorPreferencePage.java | 6 +++--- .../org/eclipse/cdt/make/ui/views/DeleteTargetAction.java | 6 +++--- 8 files changed, 22 insertions(+), 22 deletions(-) diff --git a/build/org.eclipse.cdt.make.ui/META-INF/MANIFEST.MF b/build/org.eclipse.cdt.make.ui/META-INF/MANIFEST.MF index 50e68ca8982..3a08e8b70b7 100644 --- a/build/org.eclipse.cdt.make.ui/META-INF/MANIFEST.MF +++ b/build/org.eclipse.cdt.make.ui/META-INF/MANIFEST.MF @@ -41,5 +41,4 @@ Require-Bundle: org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)", org.eclipse.cdt.launch;bundle-version="9.2.0" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Import-Package: com.ibm.icu.text Automatic-Module-Name: org.eclipse.cdt.make.ui diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/MakeEnvironmentBlock.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/MakeEnvironmentBlock.java index de4e28f8d14..0965433fa65 100644 --- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/MakeEnvironmentBlock.java +++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/MakeEnvironmentBlock.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2004, 2015 QNX Software Systems and others. + * Copyright (c) 2004, 2020 QNX Software Systems and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -10,9 +10,11 @@ * * Contributors: * QNX Software Systems - initial API and implementation + * Sergei Kovalchuk (NXP) - Switch dependency from com.ibm.icu to java.text *******************************************************************************/ package org.eclipse.cdt.make.internal.ui; +import java.text.MessageFormat; import java.util.Comparator; import java.util.HashMap; import java.util.Hashtable; @@ -68,8 +70,6 @@ import org.eclipse.swt.widgets.TableColumn; import org.eclipse.swt.widgets.TableItem; import org.eclipse.ui.dialogs.ListSelectionDialog; -import com.ibm.icu.text.MessageFormat; - /** * @deprecated as of CDT 4.0. This tab was used to set preferences/properties * for 3.X style projects. diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/actions/FoldingMessages.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/actions/FoldingMessages.java index cf18a1f6ce0..60730ebe5a4 100644 --- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/actions/FoldingMessages.java +++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/actions/FoldingMessages.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2010 IBM Corporation and others. + * Copyright (c) 2000, 2020 IBM Corporation and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -11,17 +11,17 @@ * Contributors: * IBM Corporation - initial API and implementation * Patrick Hofer - Bug 326265 + * Sergei Kovalchuk (NXP) - Switch dependency from com.ibm.icu to java.text *******************************************************************************/ // this file is based on org.eclipse.cdt.internal.ui.actions.FoldingMessages package org.eclipse.cdt.make.internal.ui.actions; +import java.text.MessageFormat; import java.util.MissingResourceException; import java.util.ResourceBundle; -import com.ibm.icu.text.MessageFormat; - /** * Class that gives access to the folding messages resource bundle. */ diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/dnd/MakeTargetDndUtil.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/dnd/MakeTargetDndUtil.java index 135321b5871..aae59fc88ec 100644 --- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/dnd/MakeTargetDndUtil.java +++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/dnd/MakeTargetDndUtil.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2011 Andrew Gvozdev. + * Copyright (c) 2008, 2020 Andrew Gvozdev and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -10,11 +10,13 @@ * * Contributors: * Andrew Gvozdev (Quoin Inc.) - Initial implementation + * Sergei Kovalchuk (NXP) - Switch dependency from com.ibm.icu to java.text *******************************************************************************/ package org.eclipse.cdt.make.internal.ui.dnd; import java.lang.reflect.InvocationTargetException; +import java.text.MessageFormat; import java.util.ArrayList; import java.util.List; @@ -43,8 +45,6 @@ import org.eclipse.swt.SWTException; import org.eclipse.swt.dnd.DND; import org.eclipse.swt.widgets.Shell; -import com.ibm.icu.text.MessageFormat; - /** * A collection of various functions for Make Target View drag and drop support. */ diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/dnd/TextTransferDropTargetListener.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/dnd/TextTransferDropTargetListener.java index 2da17066acf..e29fd2ff4d0 100644 --- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/dnd/TextTransferDropTargetListener.java +++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/dnd/TextTransferDropTargetListener.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2016 Andrew Gvozdev. + * Copyright (c) 2008, 2020 Andrew Gvozdev and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -10,10 +10,12 @@ * * Contributors: * Andrew Gvozdev (Quoin Inc.) - Initial implementation + * Sergei Kovalchuk (NXP) - Switch dependency from com.ibm.icu to java.text *******************************************************************************/ package org.eclipse.cdt.make.internal.ui.dnd; +import java.text.MessageFormat; import java.util.ArrayList; import java.util.List; @@ -28,8 +30,6 @@ import org.eclipse.swt.dnd.TextTransfer; import org.eclipse.swt.dnd.Transfer; import org.eclipse.swt.widgets.Shell; -import com.ibm.icu.text.MessageFormat; - /** * {@code TextTransferDropTargetListener} handles dropping of selected text to * Make Target View. Each line of miltiline text passed is treated as separate diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/part/WizardCheckboxTablePart.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/part/WizardCheckboxTablePart.java index db8f2a27ddd..66d451977d7 100644 --- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/part/WizardCheckboxTablePart.java +++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/part/WizardCheckboxTablePart.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2011 IBM Corporation and others. + * Copyright (c) 2000, 2020 IBM Corporation and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -10,9 +10,12 @@ * * Contributors: * IBM Corporation - initial API and implementation + * Sergei Kovalchuk (NXP) - Switch dependency from com.ibm.icu to java.text *******************************************************************************/ package org.eclipse.cdt.make.internal.ui.part; +import java.text.MessageFormat; + import org.eclipse.cdt.make.internal.ui.MakeUIPlugin; import org.eclipse.jface.viewers.CheckboxTableViewer; import org.eclipse.jface.viewers.StructuredViewer; @@ -22,8 +25,6 @@ import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Label; -import com.ibm.icu.text.MessageFormat; - /** * @version 1.0 */ diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/preferences/AbstractMakefileEditorPreferencePage.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/preferences/AbstractMakefileEditorPreferencePage.java index 9dfe6de71aa..9e893457641 100644 --- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/preferences/AbstractMakefileEditorPreferencePage.java +++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/preferences/AbstractMakefileEditorPreferencePage.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2002, 2016 QNX Software Systems and others. + * Copyright (c) 2002, 2020 QNX Software Systems and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -10,6 +10,7 @@ * * Contributors: * QNX Software Systems - Initial API and implementation + * Sergei Kovalchuk (NXP) - Switch dependency from com.ibm.icu to java.text *******************************************************************************/ package org.eclipse.cdt.make.internal.ui.preferences; @@ -17,6 +18,7 @@ package org.eclipse.cdt.make.internal.ui.preferences; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; +import java.text.MessageFormat; import java.util.HashMap; import java.util.Iterator; import java.util.Map; @@ -42,8 +44,6 @@ import org.eclipse.swt.widgets.Text; import org.eclipse.ui.IWorkbench; import org.eclipse.ui.IWorkbenchPreferencePage; -import com.ibm.icu.text.MessageFormat; - /** * AbstraceMakeEditorPreferencePage */ diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/views/DeleteTargetAction.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/views/DeleteTargetAction.java index ce35cf9faad..4f3e4f98bc6 100644 --- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/views/DeleteTargetAction.java +++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/views/DeleteTargetAction.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2016 QNX Software Systems and others. + * Copyright (c) 2000, 2020 QNX Software Systems and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -10,9 +10,11 @@ * * Contributors: * QNX Software Systems - Initial API and implementation + * Sergei Kovalchuk (NXP) - Switch dependency from com.ibm.icu to java.text *******************************************************************************/ package org.eclipse.cdt.make.ui.views; +import java.text.MessageFormat; import java.util.List; import org.eclipse.cdt.make.core.IMakeTarget; @@ -30,8 +32,6 @@ import org.eclipse.ui.ISharedImages; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.actions.SelectionListenerAction; -import com.ibm.icu.text.MessageFormat; - /** * @noextend This class is not intended to be subclassed by clients. * @noinstantiate This class is not intended to be instantiated by clients.