diff --git a/core/org.eclipse.cdt.core/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.core/META-INF/MANIFEST.MF index c2b697d846a..aa613ab60b6 100644 --- a/core/org.eclipse.cdt.core/META-INF/MANIFEST.MF +++ b/core/org.eclipse.cdt.core/META-INF/MANIFEST.MF @@ -133,7 +133,6 @@ Require-Bundle: org.eclipse.cdt.core.native;bundle-version="[5.10.100,6.0.0)";vi org.eclipse.ltk.core.refactoring;bundle-version="[3.10.200,4.0.0)", org.eclipse.osgi.services;bundle-version="[3.8.0,4.0.0)", org.eclipse.text;bundle-version="[3.9.0,4.0.0)", - com.ibm.icu;bundle-version="4.4.2", com.google.gson, org.eclipse.jdt.annotation;bundle-version="[2.0.0,3.0.0)";resolution:=optional Bundle-ActivationPolicy: lazy diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CoreModelMessages.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CoreModelMessages.java index efadd1b44b7..585a893f9e5 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CoreModelMessages.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CoreModelMessages.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2014 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,14 +10,14 @@ * * Contributors: * QNX Software Systems - Initial API and implementation + * Alexander Fedorov (ArSysOp) - Bug 561992 *******************************************************************************/ package org.eclipse.cdt.internal.core.model; +import java.text.MessageFormat; import java.util.MissingResourceException; import java.util.ResourceBundle; -import com.ibm.icu.text.MessageFormat; - /** * @noreference This class is not intended to be referenced by clients. */ diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/Util.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/Util.java index c6f2d96b487..4b87a225431 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/Util.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/Util.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2002, 2016 IBM Corporation and others. + * Copyright (c) 2002, 2020 IBM Corporation and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -14,6 +14,7 @@ * Anton Leherbauer (Wind River Systems) * IBM Corporation - EFS support * Marc-Andre Laperle (Ericsson) + * Alexander Fedorov (ArSysOp) - Bug 561992 *******************************************************************************/ package org.eclipse.cdt.internal.core.model; @@ -23,6 +24,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; import java.net.URI; +import java.text.MessageFormat; import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.ICLogConstants; @@ -45,8 +47,6 @@ import org.eclipse.core.runtime.preferences.InstanceScope; import org.osgi.service.prefs.BackingStoreException; import org.osgi.service.prefs.Preferences; -import com.ibm.icu.text.MessageFormat; - public class Util implements ICLogConstants { public static boolean VERBOSE_PARSER; public static boolean VERBOSE_SCANNER; diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/AbstractCProjectDescriptionStorage.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/AbstractCProjectDescriptionStorage.java index 98af3dbeb9d..0e2acbff464 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/AbstractCProjectDescriptionStorage.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/AbstractCProjectDescriptionStorage.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2009 Broadcom Corporation and others. + * Copyright (c) 2008, 2020 Broadcom Corporation and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -11,9 +11,12 @@ * Contributors: * James Blackburn (Broadcom Corp.) * IBM Corporation + * Alexander Fedorov (ArSysOp) - Bug 561992 *******************************************************************************/ package org.eclipse.cdt.internal.core.settings.model; +import java.text.MessageFormat; + import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.model.ICProject; import org.eclipse.cdt.core.settings.model.CProjectDescriptionEvent; @@ -34,8 +37,6 @@ import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.jobs.Job; import org.osgi.framework.Version; -import com.ibm.icu.text.MessageFormat; - /** * This abstract class provides an extension point for functionality for loading * a CDT Project Description from some kind of backing store. This allows diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CProjectDescriptionManager.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CProjectDescriptionManager.java index 67a6c5cc218..22f0adff357 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CProjectDescriptionManager.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CProjectDescriptionManager.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2014 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 @@ -9,12 +9,13 @@ * SPDX-License-Identifier: EPL-2.0 * * Contributors: - * Intel Corporation - Initial API and implementation - * Markus Schorn (Wind River Systems) - * IBM Corporation - * James Blackburn (Broadcom Corp.) - * Alex Blewitt Bug 132511 - nature order not preserved - * Christian Walther (Indel AG) - [436060] Race condition in updateProjectDescriptions() + * Intel Corporation - Initial API and implementation + * Markus Schorn (Wind River Systems) + * IBM Corporation + * James Blackburn (Broadcom Corp.) + * Alex Blewitt Bug 132511 - nature order not preserved + * Christian Walther (Indel AG) - [436060] Race condition in updateProjectDescriptions() + * Alexander Fedorov (ArSysOp) - Bug 561992 *******************************************************************************/ package org.eclipse.cdt.internal.core.settings.model; @@ -27,6 +28,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.UnsupportedEncodingException; import java.net.URI; +import java.text.MessageFormat; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; @@ -135,8 +137,6 @@ import org.w3c.dom.NodeList; import org.w3c.dom.ProcessingInstruction; import org.xml.sax.SAXException; -import com.ibm.icu.text.MessageFormat; - /** * The CProjectDescriptionManager is to marshall the loading and storing * of CDT Project Descriptions. @@ -1386,23 +1386,6 @@ public class CProjectDescriptionManager implements ICProjectDescriptionManager { return !newCfg.getId().equals(oldCfg.getId()); } - /* void postProcessNewDescriptionCache(CProjectDescription des, ICProjectDescriptionDelta delta) { - if (delta == null && delta.getDeltaKind() != ICProjectDescriptionDelta.CHANGED) - return; - - ICConfigurationDescription indexCfg = des.getIndexConfiguration(); - ICConfigurationDescription activeCfg = des.getActiveConfiguration(); - ICProjectDescriptionDelta activeCfgDelta = findDelta(activeCfg.getId(), delta); - if (indexCfg != activeCfg) { - switch(activeCfgDelta.getDeltaKind()) { - case ICProjectDescriptionDelta.CHANGED: - des.setIndexConfiguration(activeCfg); - } - } - - - } - */ private ICDescriptionDelta findDelta(String id, ICDescriptionDelta delta) { ICDescriptionDelta children[] = delta.getChildren(); ICSettingObject obj; @@ -1933,18 +1916,6 @@ public class CProjectDescriptionManager implements ICProjectDescriptionManager { return result; } - /* public boolean entriesEqual(ICLanguageSettingEntry entries1[], ICLanguageSettingEntry entries2[]) { - if (entries1.length != entries2.length) - return false; - - for (int i = 0; i < entries1.length; i++) { - if (!entries1[i].equals(entries2[i])) - return false; - } - - return true; - } - */ private CProjectDescriptionDelta createDelta(ICBuildSetting newBuildSetting, ICBuildSetting oldBuildSetting) { CProjectDescriptionDelta delta = new CProjectDescriptionDelta(newBuildSetting, oldBuildSetting); if (!Arrays.equals(newBuildSetting.getErrorParserIDs(), oldBuildSetting.getErrorParserIDs())) diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/index/export/ExternalExportProjectProvider.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/index/export/ExternalExportProjectProvider.java index 5b9485c5395..3dcb934c3e7 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/index/export/ExternalExportProjectProvider.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/index/export/ExternalExportProjectProvider.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2014 Symbian Software Systems and others. + * Copyright (c) 2007, 2020 Symbian Software Systems and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -9,11 +9,14 @@ * SPDX-License-Identifier: EPL-2.0 * * Contributors: - * Andrew Ferguson (Symbian) - Initial implementation + * Andrew Ferguson (Symbian) - Initial implementation + * Alexander Fedorov (ArSysOp) - Bug 561992 *******************************************************************************/ package org.eclipse.cdt.core.index.export; import java.io.File; +import java.text.DateFormat; +import java.text.MessageFormat; import java.util.ArrayList; import java.util.Arrays; import java.util.Calendar; @@ -48,9 +51,6 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.Path; -import com.ibm.icu.text.DateFormat; -import com.ibm.icu.text.MessageFormat; - /** * An IExportProjectProvider suitable for indexing an external folder. The arguments understood by this provider * are diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/ASTProblem.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/ASTProblem.java index 92c0d3149d1..17518bba0e5 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/ASTProblem.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/ASTProblem.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2004, 2016 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 @@ -12,9 +12,11 @@ * IBM - Initial API and implementation * Anton Leherbauer (Wind River Systems) * Markus Schorn (Wind River Systems) + * Alexander Fedorov (ArSysOp) - Bug 561992 *******************************************************************************/ package org.eclipse.cdt.internal.core.dom.parser; +import java.text.MessageFormat; import java.util.HashMap; import java.util.Map; @@ -24,8 +26,6 @@ import org.eclipse.cdt.core.dom.ast.IASTNode; import org.eclipse.cdt.core.dom.ast.IASTProblem; import org.eclipse.cdt.internal.core.parser.ParserMessages; -import com.ibm.icu.text.MessageFormat; - /** * Models problems, all problems should derive from this class. */ diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/ProblemBinding.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/ProblemBinding.java index 6c2498d59e1..2b7e6f28e83 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/ProblemBinding.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/ProblemBinding.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2004, 2015 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 @@ -13,9 +13,12 @@ * Markus Schorn (Wind River Systems) * Bryan Wilkinson (QNX) * Sergey Prigogin (Google) + * Alexander Fedorov (ArSysOp) - Bug 561992 *******************************************************************************/ package org.eclipse.cdt.internal.core.dom.parser; +import java.text.MessageFormat; + import org.eclipse.cdt.core.dom.ILinkage; import org.eclipse.cdt.core.dom.IName; import org.eclipse.cdt.core.dom.ast.DOMException; @@ -40,8 +43,6 @@ import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.EvalFixed; import org.eclipse.cdt.internal.core.parser.ParserMessages; import org.eclipse.core.runtime.PlatformObject; -import com.ibm.icu.text.MessageFormat; - /** * Implementation of problem bindings */ diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/indexer/StandaloneIndexerTask.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/indexer/StandaloneIndexerTask.java index ba297d1e5cf..43a0b68d904 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/indexer/StandaloneIndexerTask.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/indexer/StandaloneIndexerTask.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2012 Wind River Systems, Inc. and others. + * Copyright (c) 2006, 2020 Wind River Systems, Inc. and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -11,9 +11,11 @@ * Contributors: * Markus Schorn - initial API and implementation * IBM Corporation + * Alexander Fedorov (ArSysOp) - Bug 561992 *******************************************************************************/ package org.eclipse.cdt.internal.core.indexer; +import java.text.MessageFormat; import java.text.NumberFormat; import java.util.Collection; import java.util.Iterator; @@ -27,8 +29,6 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; -import com.ibm.icu.text.MessageFormat; - /** * A task for index updates. * diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/ParserMessages.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/ParserMessages.java index 5aa7f207bb4..fc85d3662a6 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/ParserMessages.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/ParserMessages.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2004, 2014 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,16 +10,16 @@ * * Contributors: * Andrew Niefer (IBM Corporation) - Initial API and implementation + * Alexander Fedorov (ArSysOp) - Bug 561992 *******************************************************************************/ package org.eclipse.cdt.internal.core.parser; +import java.text.MessageFormat; import java.util.MissingResourceException; import java.util.ResourceBundle; import org.eclipse.cdt.core.dom.ast.ISemanticProblem; -import com.ibm.icu.text.MessageFormat; - public class ParserMessages { private static final String BUNDLE_NAME = ParserMessages.class.getName(); private static ResourceBundle resourceBundle; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/PreprocessorMacro.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/PreprocessorMacro.java index 2549b2a1c09..e9976f203df 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/PreprocessorMacro.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/PreprocessorMacro.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2015 Wind River Systems, Inc. and others. + * Copyright (c) 2007, 2020 Wind River Systems, Inc. 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: * Markus Schorn - initial API and implementation + * Alexander Fedorov (ArSysOp) - Bug 561992 *******************************************************************************/ package org.eclipse.cdt.internal.core.parser.scanner; +import java.text.DateFormatSymbols; import java.util.Calendar; import org.eclipse.cdt.core.dom.ILinkage; @@ -25,8 +27,6 @@ import org.eclipse.cdt.core.parser.OffsetLimitReachedException; import org.eclipse.cdt.internal.core.dom.Linkage; import org.eclipse.cdt.internal.core.parser.scanner.Lexer.LexerOptions; -import com.ibm.icu.text.DateFormatSymbols; - /** * Models macros used by the preprocessor * @since 5.0 diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/PDOMManager.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/PDOMManager.java index 0a13c206af9..868780685ae 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/PDOMManager.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/PDOMManager.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005, 2018 QNX Software Systems and others. + * Copyright (c) 2005, 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 @@ -18,6 +18,7 @@ * Marc-Andre Laperle * Martin Oberhuber (Wind River) - [397652] fix up-to-date check for PDOM * IBM Corporation + * Alexander Fedorov (ArSysOp) - Bug 561992 *******************************************************************************/ package org.eclipse.cdt.internal.core.pdom; @@ -26,6 +27,8 @@ import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; +import java.text.MessageFormat; +import java.text.SimpleDateFormat; import java.util.ArrayDeque; import java.util.ArrayList; import java.util.Arrays; @@ -117,9 +120,6 @@ import org.eclipse.core.runtime.preferences.IEclipsePreferences.PreferenceChange import org.eclipse.core.runtime.preferences.IPreferencesService; import org.eclipse.core.runtime.preferences.InstanceScope; -import com.ibm.icu.text.MessageFormat; -import com.ibm.icu.text.SimpleDateFormat; - /** * Manages PDOM updates and events associated with them. Provides methods for index access. */ diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/db/BTree.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/db/BTree.java index 2c6c7d28e82..1f5d80e459a 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/db/BTree.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/db/BTree.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005, 2016 QNX Software Systems and others. + * Copyright (c) 2005, 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 @@ -12,16 +12,17 @@ * QNX - Initial API and implementation * Andrew Ferguson (Symbian) - Provide B-tree deletion routine * Markus Schorn (Wind River Systems) + * Alexander Fedorov (ArSysOp) - Bug 561992 *******************************************************************************/ package org.eclipse.cdt.internal.core.pdom.db; +import java.text.MessageFormat; + import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; -import com.ibm.icu.text.MessageFormat; - /** * @author Doug Schaefer */ diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/db/Database.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/db/Database.java index c3ff517248e..f138c44c9da 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/db/Database.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/db/Database.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005, 2015 QNX Software Systems and others. + * Copyright (c) 2005, 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 @@ -14,6 +14,7 @@ * Markus Schorn (Wind River Systems) * IBM Corporation * Sergey Prigogin (Google) + * Alexander Fedorov (ArSysOp) - Bug 561992 *******************************************************************************/ package org.eclipse.cdt.internal.core.pdom.db; @@ -28,6 +29,7 @@ import java.nio.ByteBuffer; import java.nio.channels.ClosedByInterruptException; import java.nio.channels.ClosedChannelException; import java.nio.channels.FileChannel; +import java.text.MessageFormat; import java.util.ArrayList; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; @@ -38,8 +40,6 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.osgi.util.NLS; -import com.ibm.icu.text.MessageFormat; - /** * Database encapsulates access to a flat binary format file with a memory-manager-like API for * obtaining and releasing areas of storage (memory). diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/export/CLIUtil.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/export/CLIUtil.java index fb4e8167288..4f5f30acc3b 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/export/CLIUtil.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/export/CLIUtil.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2009 Symbian Software Systems and others. + * Copyright (c) 2007, 2020 Symbian Software Systems and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -9,10 +9,12 @@ * SPDX-License-Identifier: EPL-2.0 * * Contributors: - * Andrew Ferguson (Symbian) - Initial implementation + * Andrew Ferguson (Symbian) - Initial implementation + * Alexander Fedorov (ArSysOp) - Bug 561992 *******************************************************************************/ package org.eclipse.cdt.internal.core.pdom.export; +import java.text.MessageFormat; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -21,8 +23,6 @@ import java.util.Map; import org.eclipse.cdt.core.index.export.Messages; import org.eclipse.core.runtime.CoreException; -import com.ibm.icu.text.MessageFormat; - /** * Helper methods for command-line options *
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/export/GeneratePDOM.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/export/GeneratePDOM.java index 37cd352c6eb..fb4b4a8aa5f 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/export/GeneratePDOM.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/export/GeneratePDOM.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2014 Symbian Software Systems and others. + * Copyright (c) 2007, 2020 Symbian Software Systems and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -12,10 +12,12 @@ * Andrew Ferguson (Symbian) - Initial implementation * Markus Schorn (Wind River Systems) * Martin Oberhuber (Wind River) - [397652] fix up-to-date check for PDOM + * Alexander Fedorov (ArSysOp) - Bug 561992 *******************************************************************************/ package org.eclipse.cdt.internal.core.pdom.export; import java.io.File; +import java.text.MessageFormat; import java.util.Map; import org.eclipse.cdt.core.CCorePlugin; @@ -33,8 +35,6 @@ import org.eclipse.core.runtime.MultiStatus; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.Status; -import com.ibm.icu.text.MessageFormat; - /** * An ISafeRunnable which *