From 4bd9fed83b96dfc66d33ccdeb4d9fcddc9cac349 Mon Sep 17 00:00:00 2001 From: Sergei Kovalchuk Date: Mon, 8 Jun 2020 10:59:48 +0300 Subject: [PATCH] Bug 562004 - Remove dependency to com.ibm.icu from CDT Managed Build Core Dependency removed for Managed Build Core Change-Id: I15e29453a1452a5060c470f3b3658cb5763615b0 Signed-off-by: Sergei Kovalchuk --- .../META-INF/MANIFEST.MF | 3 +-- .../core/scannerconfig/CfgScannerConfigUtil.java | 6 +++--- .../internal/buildmodel/BuildModelMessages.java | 6 +++--- .../internal/core/ManagedMakeMessages.java | 6 +++--- .../dataprovider/DataProviderMessages.java | 6 +++--- .../providers/CompilationDatabaseParser.java | 8 ++++++-- .../projectconverter/ConverterMessages.java | 16 +++------------- .../cdt/newmake/internal/core/MakeMessages.java | 6 +++--- 8 files changed, 25 insertions(+), 32 deletions(-) diff --git a/build/org.eclipse.cdt.managedbuilder.core/META-INF/MANIFEST.MF b/build/org.eclipse.cdt.managedbuilder.core/META-INF/MANIFEST.MF index fb26e2a50dd..8cd4bbe1336 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/META-INF/MANIFEST.MF +++ b/build/org.eclipse.cdt.managedbuilder.core/META-INF/MANIFEST.MF @@ -41,6 +41,5 @@ Require-Bundle: org.eclipse.cdt.core;bundle-version="[5.0.0,7.0.0)", org.eclipse.core.filesystem;bundle-version="1.2.0" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Import-Package: com.google.gson;version="2.8.0", - com.ibm.icu.text +Import-Package: com.google.gson;version="2.8.0" Automatic-Module-Name: org.eclipse.cdt.managedbuilder.core diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/build/internal/core/scannerconfig/CfgScannerConfigUtil.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/build/internal/core/scannerconfig/CfgScannerConfigUtil.java index b0355bec955..2c0474b4c63 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/build/internal/core/scannerconfig/CfgScannerConfigUtil.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/build/internal/core/scannerconfig/CfgScannerConfigUtil.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2012 Intel Corporation and others. + * Copyright (c) 2007, 2020 Intel 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,11 @@ * * Contributors: * Intel Corporation - Initial API and implementation + * Sergei Kovalchuk (NXP) *******************************************************************************/ package org.eclipse.cdt.build.internal.core.scannerconfig; +import java.text.MessageFormat; import java.util.Set; import java.util.TreeSet; @@ -30,8 +32,6 @@ import org.eclipse.cdt.managedbuilder.internal.core.Tool; import org.eclipse.cdt.managedbuilder.internal.core.ToolChain; import org.eclipse.core.runtime.Assert; -import com.ibm.icu.text.MessageFormat; - public class CfgScannerConfigUtil { public static CfgInfoContext adjustPerRcTypeContext(CfgInfoContext context) { if (((Configuration) context.getConfiguration()).isPreference()) diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildmodel/BuildModelMessages.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildmodel/BuildModelMessages.java index 1c15980a3f0..4eb1fb944a2 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildmodel/BuildModelMessages.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildmodel/BuildModelMessages.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2011 Intel Corporation and others. + * Copyright (c) 2007, 2020 Intel Corporation and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -11,14 +11,14 @@ * Contributors: * Intel Corporation - Initial API and implementation * IBM Corporation + * Sergei Kovalchuk (NXP) *******************************************************************************/ package org.eclipse.cdt.managedbuilder.internal.buildmodel; +import java.text.MessageFormat; import java.util.MissingResourceException; import java.util.ResourceBundle; -import com.ibm.icu.text.MessageFormat; - public class BuildModelMessages { private static final String BUNDLE_NAME = "org.eclipse.cdt.managedbuilder.internal.buildmodel.BuildModelMessages"; //$NON-NLS-1$ diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ManagedMakeMessages.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ManagedMakeMessages.java index 0380c9cf5fb..053e7b3e906 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ManagedMakeMessages.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ManagedMakeMessages.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2004, 2011 IBM Corporation and others. + * Copyright (c) 2004, 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,14 +10,14 @@ * * Contributors: * IBM - Initial API and implementation + * Sergei Kovalchuk (NXP) *******************************************************************************/ package org.eclipse.cdt.managedbuilder.internal.core; +import java.text.MessageFormat; import java.util.MissingResourceException; import java.util.ResourceBundle; -import com.ibm.icu.text.MessageFormat; - /** * @since 2.0 */ diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/DataProviderMessages.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/DataProviderMessages.java index 372edb43ed4..cb747980a31 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/DataProviderMessages.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/DataProviderMessages.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2011 Intel Corporation and others. + * Copyright (c) 2007, 2020 Intel Corporation and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -10,14 +10,14 @@ * * Contributors: * Intel Corporation - Initial API and implementation + * Sergei Kovalchuk (NXP) *******************************************************************************/ package org.eclipse.cdt.managedbuilder.internal.dataprovider; +import java.text.MessageFormat; import java.util.MissingResourceException; import java.util.ResourceBundle; -import com.ibm.icu.text.MessageFormat; - public class DataProviderMessages { private static final String BUNDLE_NAME = "org.eclipse.cdt.managedbuilder.internal.dataprovider.DataProviderMessages"; //$NON-NLS-1$ diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/language/settings/providers/CompilationDatabaseParser.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/language/settings/providers/CompilationDatabaseParser.java index 50619c09c19..3bc795e6399 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/language/settings/providers/CompilationDatabaseParser.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/language/settings/providers/CompilationDatabaseParser.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019 Marc-Andre Laperle. + * Copyright (c) 2019, 2020 Marc-Andre Laperle and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -7,6 +7,10 @@ * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 + * + * Contributors: + * Marc-Andre Laperle - Initial API and implementation + * Sergei Kovalchuk (NXP) *******************************************************************************/ package org.eclipse.cdt.managedbuilder.internal.language.settings.providers; @@ -17,6 +21,7 @@ import java.net.URI; import java.nio.file.Files; import java.nio.file.Paths; import java.nio.file.attribute.FileTime; +import java.text.MessageFormat; import java.util.List; import java.util.Set; @@ -57,7 +62,6 @@ import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.SubMonitor; import com.google.gson.Gson; -import com.ibm.icu.text.MessageFormat; /** * This language settings provider takes a compile_commands.json file as input (aka, Compilation Database or CDB) and parses the commands diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/projectconverter/ConverterMessages.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/projectconverter/ConverterMessages.java index 6f446c40b0a..bbf7a3bff10 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/projectconverter/ConverterMessages.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/projectconverter/ConverterMessages.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2004, 2011 Intel Corporation and others. + * Copyright (c) 2004, 2020 Intel Corporation and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -10,14 +10,14 @@ * * Contributors: * Intel Corporation - Initial API and implementation + * Sergei Kovalchuk (NXP) *******************************************************************************/ package org.eclipse.cdt.managedbuilder.projectconverter; +import java.text.MessageFormat; import java.util.MissingResourceException; import java.util.ResourceBundle; -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. @@ -30,16 +30,6 @@ public class ConverterMessages { private ConverterMessages() { } - /* - public static String getString(String key) { - // TODO Auto-generated method stub - try { - return RESOURCE_BUNDLE.getString(key); - } catch (MissingResourceException e) { - return '!' + key + '!'; - } - } - */ public static String getResourceString(String key) { try { return RESOURCE_BUNDLE.getString(key); diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/newmake/internal/core/MakeMessages.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/newmake/internal/core/MakeMessages.java index ebf7b2ba9c1..95b7b1f79bd 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/newmake/internal/core/MakeMessages.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/newmake/internal/core/MakeMessages.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2002, 2009 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,14 +10,14 @@ * * Contributors: * QNX Software Systems - initial API and implementation + * Sergei Kovalchuk (NXP) *******************************************************************************/ package org.eclipse.cdt.newmake.internal.core; +import java.text.MessageFormat; import java.util.MissingResourceException; import java.util.ResourceBundle; -import com.ibm.icu.text.MessageFormat; - public class MakeMessages { private static final String RESOURCE_BUNDLE = MakeMessages.class.getName();