1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-24 09:25:31 +02:00

bug 254200 - use ICU4J

This commit is contained in:
Vivian Kong 2009-03-13 13:47:48 +00:00
parent 520d4136b2
commit fa3911cd90
116 changed files with 167 additions and 148 deletions

View file

@ -26,3 +26,4 @@ Require-Bundle: org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
org.eclipse.core.filesystem;bundle-version="1.2.0"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Import-Package: com.ibm.icu.text

View file

@ -10,7 +10,7 @@
*******************************************************************************/
package org.eclipse.cdt.make.internal.core;
import java.text.MessageFormat;
import com.ibm.icu.text.MessageFormat;
import java.util.MissingResourceException;
import java.util.ResourceBundle;

View file

@ -17,8 +17,8 @@ import java.io.IOException;
import java.io.OutputStreamWriter;
import java.io.PrintWriter;
import java.io.Writer;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import com.ibm.icu.text.DateFormat;
import com.ibm.icu.text.SimpleDateFormat;
import java.util.Date;
import org.eclipse.core.runtime.CoreException;

View file

@ -38,3 +38,4 @@ Require-Bundle: org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)",
org.eclipse.core.filesystem;bundle-version="1.2.0"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Import-Package: com.ibm.icu.text

View file

@ -10,7 +10,7 @@
*******************************************************************************/
package org.eclipse.cdt.make.internal.ui;
import java.text.MessageFormat;
import com.ibm.icu.text.MessageFormat;
import java.util.Comparator;
import java.util.HashMap;
import java.util.Iterator;

View file

@ -12,7 +12,7 @@
package org.eclipse.cdt.make.internal.ui.dnd;
import java.lang.reflect.InvocationTargetException;
import java.text.MessageFormat;
import com.ibm.icu.text.MessageFormat;
import java.util.ArrayList;
import java.util.List;

View file

@ -11,7 +11,7 @@
package org.eclipse.cdt.make.internal.ui.dnd;
import java.text.MessageFormat;
import com.ibm.icu.text.MessageFormat;
import java.util.ArrayList;
import java.util.List;

View file

@ -9,7 +9,7 @@
* IBM Corporation - initial API and implementation
*******************************************************************************/
package org.eclipse.cdt.make.internal.ui.part;
import java.text.MessageFormat;
import com.ibm.icu.text.MessageFormat;
import org.eclipse.cdt.make.internal.ui.MakeUIPlugin;
import org.eclipse.jface.viewers.CheckboxTableViewer;

View file

@ -14,7 +14,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 com.ibm.icu.text.MessageFormat;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;

View file

@ -11,7 +11,7 @@
package org.eclipse.cdt.make.ui.views;
import java.text.MessageFormat;
import com.ibm.icu.text.MessageFormat;
import java.util.List;
import org.eclipse.cdt.make.core.IMakeTarget;

View file

@ -36,3 +36,4 @@ Require-Bundle: org.eclipse.cdt.core;bundle-version="[5.0.0,6.0.0)",
org.eclipse.cdt.make.core;visibility:=reexport
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Import-Package: com.ibm.icu.text

View file

@ -11,7 +11,7 @@
*******************************************************************************/
package org.eclipse.cdt.managedbuilder.internal.buildmodel;
import java.text.MessageFormat;
import com.ibm.icu.text.MessageFormat;
import java.util.MissingResourceException;
import java.util.ResourceBundle;

View file

@ -10,7 +10,7 @@
*******************************************************************************/
package org.eclipse.cdt.managedbuilder.internal.core;
import java.text.MessageFormat;
import com.ibm.icu.text.MessageFormat;
import java.util.MissingResourceException;
import java.util.ResourceBundle;

View file

@ -10,7 +10,7 @@
*******************************************************************************/
package org.eclipse.cdt.managedbuilder.internal.dataprovider;
import java.text.MessageFormat;
import com.ibm.icu.text.MessageFormat;
import java.util.MissingResourceException;
import java.util.ResourceBundle;

View file

@ -10,7 +10,7 @@
*******************************************************************************/
package org.eclipse.cdt.managedbuilder.projectconverter;
import java.text.MessageFormat;
import com.ibm.icu.text.MessageFormat;
import java.util.MissingResourceException;
import java.util.ResourceBundle;

View file

@ -10,7 +10,7 @@
*******************************************************************************/
package org.eclipse.cdt.newmake.internal.core;
import java.text.MessageFormat;
import com.ibm.icu.text.MessageFormat;
import java.util.MissingResourceException;
import java.util.ResourceBundle;

View file

@ -23,3 +23,4 @@ Require-Bundle: org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)",
org.eclipse.core.filesystem
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Import-Package: com.ibm.icu.text

View file

@ -10,7 +10,7 @@
*******************************************************************************/
package org.eclipse.cdt.managedbuilder.ui.properties;
import java.text.Collator;
import com.ibm.icu.text.Collator;
import java.util.Arrays;
import java.util.Comparator;

View file

@ -106,3 +106,4 @@ Require-Bundle: org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
org.eclipse.ltk.core.refactoring;bundle-version="3.4.0"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Import-Package: com.ibm.icu.text

View file

@ -10,7 +10,7 @@
*******************************************************************************/
package org.eclipse.cdt.internal.core.model;
import java.text.MessageFormat;
import com.ibm.icu.text.MessageFormat;
import java.util.MissingResourceException;
import java.util.ResourceBundle;

View file

@ -20,7 +20,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.net.URI;
import java.text.MessageFormat;
import com.ibm.icu.text.MessageFormat;
import org.eclipse.cdt.core.CCorePlugin;
import org.eclipse.cdt.core.ICLogConstants;

View file

@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2008 Broadcom Corporation and others.
* Copyright (c) 2008, 2009 Broadcom Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@ -7,10 +7,11 @@
*
* Contributors:
* James Blackburn (Broadcom Corp.)
* IBM Corporation
*******************************************************************************/
package org.eclipse.cdt.internal.core.settings.model;
import java.text.MessageFormat;
import com.ibm.icu.text.MessageFormat;
import org.eclipse.cdt.core.CCorePlugin;
import org.eclipse.cdt.core.model.ICProject;
@ -155,7 +156,7 @@ public abstract class AbstractCProjectDescriptionStorage {
*/
public ICProjectDescription getProjectDescription(int flags, IProgressMonitor monitor) throws CoreException {
if (!project.isAccessible())
throw ExceptionFactory.createCoreException(MessageFormat.format(CCorePlugin.getResourceString("ProjectDescription.ProjectNotAccessible"), getProject().getName())); //$NON-NLS-1$
throw ExceptionFactory.createCoreException(MessageFormat.format(CCorePlugin.getResourceString("ProjectDescription.ProjectNotAccessible"), new Object[] {getProject().getName()})); //$NON-NLS-1$
return currentThreadProjectDescription.get();
}

View file

@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2007, 2008 Intel Corporation and others.
* Copyright (c) 2007, 2009 Intel Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@ -22,7 +22,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.UnsupportedEncodingException;
import java.net.URI;
import java.text.MessageFormat;
import com.ibm.icu.text.MessageFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
@ -764,7 +764,7 @@ public class CProjectDescriptionManager implements ICProjectDescriptionManager {
settingProjectDescription.set(true);
if(des != null){
if (!project.isAccessible())
throw ExceptionFactory.createCoreException(MessageFormat.format(CCorePlugin.getResourceString("ProjectDescription.ProjectNotAccessible"), project.getName())); //$NON-NLS-1$
throw ExceptionFactory.createCoreException(MessageFormat.format(CCorePlugin.getResourceString("ProjectDescription.ProjectNotAccessible"), new Object[] {project.getName()})); //$NON-NLS-1$
if(!des.isValid() && (!fAllowEmptyCreatingDescription || !des.isCdtProjectCreating()))
throw ExceptionFactory.createCoreException(SettingsModelMessages.getString("CProjectDescriptionManager.17") + project.getName()); //$NON-NLS-1$
@ -1018,7 +1018,7 @@ public class CProjectDescriptionManager implements ICProjectDescriptionManager {
&& cfgId.equals(child.getAttribute(CConfigurationSpecSettings.ID)))
throw ExceptionFactory.createCoreException(MessageFormat
.format(SettingsModelMessages.getString("CProjectDescriptionManager.cfgIDAlreadyExists"), //$NON-NLS-1$
cfgId));
new Object[] {cfgId}));
}
ICStorageElement config = rootElement.importChild(base);
config.setAttribute(CConfigurationSpecSettings.ID, cfgId);

View file

@ -11,8 +11,8 @@
package org.eclipse.cdt.core.index.export;
import java.io.File;
import java.text.DateFormat;
import java.text.MessageFormat;
import com.ibm.icu.text.DateFormat;
import com.ibm.icu.text.MessageFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Calendar;

View file

@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2004, 2008 IBM Corporation and others.
* Copyright (c) 2004, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@ -12,7 +12,7 @@
*******************************************************************************/
package org.eclipse.cdt.internal.core.dom.parser;
import java.text.MessageFormat;
import com.ibm.icu.text.MessageFormat;
import java.util.HashMap;
import java.util.Map;
@ -82,7 +82,7 @@ public class ASTProblem extends ASTNode implements IASTProblem {
msg = ""; //$NON-NLS-1$
if (arg != null) {
return MessageFormat.format(msg, arg);
return MessageFormat.format(msg, new Object[] {arg});
}
return msg;
}

View file

@ -12,7 +12,7 @@
*******************************************************************************/
package org.eclipse.cdt.internal.core.dom.parser;
import java.text.MessageFormat;
import com.ibm.icu.text.MessageFormat;
import org.eclipse.cdt.core.dom.ILinkage;
import org.eclipse.cdt.core.dom.IName;

View file

@ -8,10 +8,11 @@
* Contributors:
* Andrew Ferguson (Symbian) - Initial Implementation
* Markus Schorn (Wind River Systems)
* IBM Corporation
*******************************************************************************/
package org.eclipse.cdt.internal.core.dom.parser.cpp;
import java.text.MessageFormat;
import com.ibm.icu.text.MessageFormat;
import java.util.ArrayList;
import java.util.List;
@ -44,7 +45,7 @@ public class CPPASTAmbiguousTemplateArgument extends ASTAmbiguousNode implements
fNodes.add(node);
} else {
String ns= node == null ? "null" : node.getClass().getName(); //$NON-NLS-1$
String msg= MessageFormat.format(ParserMessages.getString("CPPASTAmbiguousTemplateArgument_InvalidConstruction"), ns); //$NON-NLS-1$
String msg= MessageFormat.format(ParserMessages.getString("CPPASTAmbiguousTemplateArgument_InvalidConstruction"), new Object[] {ns}); //$NON-NLS-1$
throw new IllegalArgumentException(msg);
}
}

View file

@ -12,7 +12,7 @@
package org.eclipse.cdt.internal.core.index;
import java.text.MessageFormat;
import com.ibm.icu.text.MessageFormat;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;

View file

@ -11,7 +11,7 @@
*******************************************************************************/
package org.eclipse.cdt.internal.core.index.provider;
import java.text.MessageFormat;
import com.ibm.icu.text.MessageFormat;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;

View file

@ -12,8 +12,8 @@
package org.eclipse.cdt.internal.core.indexer;
import java.text.MessageFormat;
import java.text.NumberFormat;
import com.ibm.icu.text.MessageFormat;
import com.ibm.icu.text.NumberFormat;
import java.util.Collection;
import java.util.Iterator;

View file

@ -10,7 +10,7 @@
*******************************************************************************/
package org.eclipse.cdt.internal.core.parser;
import java.text.MessageFormat;
import com.ibm.icu.text.MessageFormat;
import java.util.MissingResourceException;
import java.util.ResourceBundle;

View file

@ -10,7 +10,7 @@
*******************************************************************************/
package org.eclipse.cdt.internal.core.parser.scanner;
import java.text.DateFormatSymbols;
import com.ibm.icu.text.DateFormatSymbols;
import java.util.Calendar;
import org.eclipse.cdt.core.dom.ILinkage;

View file

@ -21,7 +21,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.nio.channels.FileChannel;
import java.text.MessageFormat;
import com.ibm.icu.text.MessageFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;

View file

@ -13,7 +13,7 @@
package org.eclipse.cdt.internal.core.pdom.db;
import java.text.MessageFormat;
import com.ibm.icu.text.MessageFormat;
import org.eclipse.cdt.core.CCorePlugin;
import org.eclipse.core.runtime.CoreException;

View file

@ -10,7 +10,7 @@
*******************************************************************************/
package org.eclipse.cdt.internal.core.pdom.export;
import java.text.MessageFormat;
import com.ibm.icu.text.MessageFormat;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;

View file

@ -12,7 +12,7 @@
package org.eclipse.cdt.internal.core.pdom.export;
import java.io.File;
import java.text.MessageFormat;
import com.ibm.icu.text.MessageFormat;
import java.util.Map;
import org.eclipse.cdt.core.CCorePlugin;

View file

@ -12,7 +12,7 @@ package org.eclipse.cdt.internal.core.pdom.export;
import java.io.File;
import java.io.PrintStream;
import java.text.MessageFormat;
import com.ibm.icu.text.MessageFormat;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

View file

@ -11,7 +11,7 @@
*******************************************************************************/
package org.eclipse.cdt.internal.core.pdom.indexer;
import java.text.NumberFormat;
import com.ibm.icu.text.NumberFormat;
import java.util.Calendar;
import java.util.Map;

View file

@ -15,7 +15,7 @@
package org.eclipse.cdt.core;
import java.io.IOException;
import java.text.MessageFormat;
import com.ibm.icu.text.MessageFormat;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;

View file

@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2007, 2008 Intel Corporation and others.
* Copyright (c) 2007, 2009 Intel Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@ -9,13 +9,14 @@
* Intel Corporation - Initial API and implementation
* Anton Leherbauer (Wind River Systems)
* James Blackburn (Broadcom Corp.)
* IBM Corporation
*******************************************************************************/
package org.eclipse.cdt.internal.core;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Method;
import java.lang.reflect.Proxy;
import java.text.MessageFormat;
import com.ibm.icu.text.MessageFormat;
import java.util.HashMap;
import java.util.LinkedHashSet;
import java.util.Map;
@ -127,7 +128,7 @@ final public class CConfigBasedDescriptor implements ICDescriptor {
public void serialize() throws CoreException {
if (!getProject().isAccessible())
throw ExceptionFactory.createCoreException(MessageFormat.format(CCorePlugin.getResourceString("ProjectDescription.ProjectNotAccessible"), getProject().getName())); //$NON-NLS-1$
throw ExceptionFactory.createCoreException(MessageFormat.format(CCorePlugin.getResourceString("ProjectDescription.ProjectNotAccessible"), new Object[] {getProject().getName()})); //$NON-NLS-1$
if(fIsDirty) {
ICProjectDescription des = fCfgDes.getProjectDescription();
if(des.isCdtProjectCreating())

View file

@ -19,8 +19,8 @@ import java.io.OutputStreamWriter;
import java.io.PrintWriter;
import java.io.UnsupportedEncodingException;
import java.io.Writer;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import com.ibm.icu.text.DateFormat;
import com.ibm.icu.text.SimpleDateFormat;
import java.util.Date;
import org.eclipse.cdt.core.CCorePlugin;

View file

@ -12,7 +12,7 @@ package org.eclipse.cdt.core.templateengine;
import java.io.IOException;
import java.net.URL;
import java.text.MessageFormat;
import com.ibm.icu.text.MessageFormat;
import java.util.Comparator;
import java.util.HashMap;
import java.util.Iterator;

View file

@ -12,7 +12,7 @@ package org.eclipse.cdt.core.templateengine;
import java.io.IOException;
import java.net.URL;
import java.text.MessageFormat;
import com.ibm.icu.text.MessageFormat;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;

View file

@ -13,7 +13,7 @@ package org.eclipse.cdt.utils.coff;
import java.io.EOFException;
import java.io.IOException;
import java.io.RandomAccessFile;
import java.text.DateFormat;
import com.ibm.icu.text.DateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;

View file

@ -13,7 +13,7 @@ package org.eclipse.cdt.utils.xcoff;
import java.io.EOFException;
import java.io.IOException;
import java.io.RandomAccessFile;
import java.text.DateFormat;
import com.ibm.icu.text.DateFormat;
import java.util.ArrayList;
import java.util.Date;

View file

@ -10,8 +10,8 @@
*******************************************************************************/
package org.eclipse.cdt.internal.corext.template.c;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import com.ibm.icu.text.DateFormat;
import com.ibm.icu.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.List;

View file

@ -11,7 +11,7 @@
package org.eclipse.cdt.internal.ui.actions;
import java.text.MessageFormat;
import com.ibm.icu.text.MessageFormat;
import java.util.MissingResourceException;
import java.util.ResourceBundle;

View file

@ -11,7 +11,7 @@
package org.eclipse.cdt.internal.ui.editor;
import java.text.MessageFormat;
import com.ibm.icu.text.MessageFormat;
import java.util.MissingResourceException;
import java.util.ResourceBundle;

View file

@ -10,7 +10,7 @@
*******************************************************************************/
package org.eclipse.cdt.internal.ui.filters;
import java.text.Collator;
import com.ibm.icu.text.Collator;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashSet;

View file

@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2000, 2008 IBM Corporation and others.
* Copyright (c) 2000, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@ -12,7 +12,7 @@
package org.eclipse.cdt.internal.ui.preferences;
import java.text.MessageFormat;
import com.ibm.icu.text.MessageFormat;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
@ -193,7 +193,7 @@ public class ScalabilityPreferencePage extends PreferencePage implements
fLinesToTrigger.setValidRange( 1, Integer.MAX_VALUE );
String minValue = Integer.toString( 1 );
String maxValue = Integer.toString( Integer.MAX_VALUE );
fLinesToTrigger.setErrorMessage( MessageFormat.format(PreferencesMessages.ScalabilityPreferencePage_error, minValue, maxValue) );
fLinesToTrigger.setErrorMessage( MessageFormat.format(PreferencesMessages.ScalabilityPreferencePage_error, new Object[] {minValue, maxValue}) );
fLinesToTrigger.load();
fLinesToTrigger.setPropertyChangeListener( new IPropertyChangeListener() {

View file

@ -11,7 +11,7 @@
******************************************************************************/
package org.eclipse.cdt.internal.ui.refactoring.rename;
import java.text.MessageFormat;
import com.ibm.icu.text.MessageFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;

View file

@ -10,7 +10,7 @@
*******************************************************************************/
package org.eclipse.cdt.internal.ui.refactoring.rename;
import java.text.MessageFormat;
import com.ibm.icu.text.MessageFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;

View file

@ -11,7 +11,7 @@
******************************************************************************/
package org.eclipse.cdt.internal.ui.refactoring.rename;
import java.text.MessageFormat;
import com.ibm.icu.text.MessageFormat;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;

View file

@ -12,7 +12,7 @@
*******************************************************************************/
package org.eclipse.cdt.internal.ui.refactoring.utils;
import java.text.MessageFormat;
import com.ibm.icu.text.MessageFormat;
import java.util.Set;
import java.util.regex.Matcher;
import java.util.regex.Pattern;

View file

@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2004, 2008 IBM Corporation and others.
* Copyright (c) 2004, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@ -14,7 +14,7 @@
package org.eclipse.cdt.internal.ui.search.actions;
import java.text.MessageFormat;
import com.ibm.icu.text.MessageFormat;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
@ -122,7 +122,7 @@ public class SelectionParseAction extends Action {
protected void reportSourceFileOpenFailure(IPath path) {
showStatusLineMessage(MessageFormat.format(
CSearchMessages.SelectionParseAction_FileOpenFailure_format,
path.toOSString()));
new Object[] {path.toOSString()}));
}
protected void reportSelectionMatchFailure() {
@ -132,13 +132,13 @@ public class SelectionParseAction extends Action {
protected void reportSymbolLookupFailure(String symbol) {
showStatusLineMessage(MessageFormat.format(
CSearchMessages.SelectionParseAction_SymbolNotFoundInIndex_format,
symbol));
new Object[] {symbol}));
}
protected void reportIncludeLookupFailure(String filename) {
showStatusLineMessage(MessageFormat.format(
CSearchMessages.SelectionParseAction_IncludeNotFound_format,
filename));
new Object[] {filename}));
}
}

View file

@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2002, 2006 QNX Software Systems and others.
* Copyright (c) 2002, 2009 QNX Software Systems and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@ -8,11 +8,12 @@
* Contributors:
* QNX Software Systems - Initial API and implementation
* Sergey Prigogin (Google)
* IBM Corporation
*******************************************************************************/
package org.eclipse.cdt.internal.ui.text.c.hover;
import java.text.MessageFormat;
import com.ibm.icu.text.MessageFormat;
import java.util.Iterator;
import org.eclipse.core.filebuffers.FileBuffers;
@ -336,7 +337,7 @@ public class AbstractAnnotationHover extends AbstractCEditorTextHover {
if (proposals.length == 1) {
text= CHoverMessages.AbstractAnnotationHover_message_singleQuickFix;
} else {
text= MessageFormat.format(CHoverMessages.AbstractAnnotationHover_message_multipleQuickFix, String.valueOf(proposals.length));
text= MessageFormat.format(CHoverMessages.AbstractAnnotationHover_message_multipleQuickFix, new Object[] {String.valueOf(proposals.length)});
}
quickFixLabel.setText(text);

View file

@ -11,7 +11,7 @@
package org.eclipse.cdt.internal.ui.text.c.hover;
import java.text.Collator;
import com.ibm.icu.text.Collator;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;

View file

@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2000, 2008 IBM Corporation and others.
* Copyright (c) 2000, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@ -12,7 +12,7 @@
package org.eclipse.cdt.internal.ui.text.correction.proposals;
import java.text.MessageFormat;
import com.ibm.icu.text.MessageFormat;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IStatus;
@ -185,7 +185,7 @@ public class ChangeCorrectionProposal implements ICCompletionProposal, ICommandA
public String getDisplayString() {
String shortCutString= CorrectionCommandHandler.getShortCutString(getCommandId());
if (shortCutString != null) {
return MessageFormat.format(CorrectionMessages.ChangeCorrectionProposal_name_with_shortcut, getName(), shortCutString);
return MessageFormat.format(CorrectionMessages.ChangeCorrectionProposal_name_with_shortcut, new Object[] {getName(), shortCutString});
}
return getName();
}
@ -198,7 +198,7 @@ public class ChangeCorrectionProposal implements ICCompletionProposal, ICommandA
String shortCutString= CorrectionCommandHandler.getShortCutString(getCommandId());
if (shortCutString != null) {
String decorated= MessageFormat.format(CorrectionMessages.ChangeCorrectionProposal_name_with_shortcut, getName(), shortCutString);
String decorated= MessageFormat.format(CorrectionMessages.ChangeCorrectionProposal_name_with_shortcut, new Object[] {getName(), shortCutString});
return ColoringLabelProvider.decorateStyledString(str, decorated, StyledString.QUALIFIER_STYLER);
}
return str;

View file

@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2008 Symbian Software Systems and others.
* Copyright (c) 2008, 2009 Symbian Software Systems and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@ -7,10 +7,11 @@
*
* Contributors:
* Andrew Ferguson (Symbian) - Initial implementation
* IBM Corporation
*******************************************************************************/
package org.eclipse.cdt.internal.ui.text.doctools;
import java.text.MessageFormat;
import com.ibm.icu.text.MessageFormat;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@ -234,7 +235,7 @@ public class DocCommentOwnerManager {
String id= element.getAttribute(ATTRKEY_OWNER_ID);
String name= element.getAttribute(ATTRKEY_OWNER_NAME);
if(result.put(id, new DocCommentOwner(id, name, multi, single))!=null) {
String msg= MessageFormat.format(Messages.DocCommentOwnerManager_DuplicateMapping0, id);
String msg= MessageFormat.format(Messages.DocCommentOwnerManager_DuplicateMapping0, new Object[] {id});
CUIPlugin.log(new Status(IStatus.WARNING, CUIPlugin.PLUGIN_ID, msg));
}
}

View file

@ -18,7 +18,7 @@ import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.IOException;
import java.net.URI;
import java.text.MessageFormat;
import com.ibm.icu.text.MessageFormat;
import org.eclipse.core.filesystem.EFS;
import org.eclipse.core.filesystem.IFileStore;

View file

@ -11,7 +11,7 @@
package org.eclipse.cdt.internal.ui.util;
import java.text.MessageFormat;
import com.ibm.icu.text.MessageFormat;
public class Messages {
public static String format(String pattern, Object[] args) {

View file

@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2003, 2008 IBM Corporation and others.
* Copyright (c) 2003, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@ -16,7 +16,6 @@
package org.eclipse.cdt.ui;
import java.io.IOException;
import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
@ -63,6 +62,8 @@ import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.framework.BundleException;
import com.ibm.icu.text.MessageFormat;
import org.eclipse.cdt.core.CCorePlugin;
import org.eclipse.cdt.core.model.CoreModel;
import org.eclipse.cdt.core.model.ICElement;
@ -269,7 +270,7 @@ public class CUIPlugin extends AbstractUIPlugin {
}
public static String getFormattedString(String key, String arg) {
return MessageFormat.format(getResourceString(key), arg);
return MessageFormat.format(getResourceString(key), new Object[] {arg});
}
public static String getFormattedString(String key, String[] args) {

View file

@ -10,7 +10,7 @@
*******************************************************************************/
package org.eclipse.cdt.ui.newui;
import java.text.MessageFormat;
import com.ibm.icu.text.MessageFormat;
import java.util.MissingResourceException;
import java.util.ResourceBundle;

View file

@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2007 Symbian Software Limited and others.
* Copyright (c) 2007, 2009 Symbian Software Limited and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@ -7,10 +7,11 @@
*
* Contributors:
* Bala Torati (Symbian) - Initial API and implementation
* IBM Corporation
*******************************************************************************/
package org.eclipse.cdt.ui.templateengine.uitree;
import java.text.MessageFormat;
import com.ibm.icu.text.MessageFormat;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
@ -118,11 +119,11 @@ public class UIElementTreeBuilderHelper implements IUIElementTreeBuilderHelper {
}
if(label==null || value==null) {
String msg= Messages.getString("UIElementTreeBuilderHelper.InvalidEmptyLabel"); //$NON-NLS-1$
CUIPlugin.log(MessageFormat.format(msg, id), null);
CUIPlugin.log(MessageFormat.format(msg, new Object[] {id}), null);
} else {
if(value2name.put(value, label)!=null) {
String msg= Messages.getString("UIElementTreeBuilderHelper.InvalidNonUniqueValue"); //$NON-NLS-1$
CUIPlugin.log(MessageFormat.format(msg, id), null);
CUIPlugin.log(MessageFormat.format(msg, new Object[] {id}), null);
}
}
}
@ -146,7 +147,7 @@ public class UIElementTreeBuilderHelper implements IUIElementTreeBuilderHelper {
// Note: This is not implemented now as we haven't found a use case
// for generating UI pages as TABS in a single page.
} else {
String msg= MessageFormat.format(Messages.getString("UIElementTreeBuilderHelper.UnknownWidgetType0"), type); //$NON-NLS-1$
String msg= MessageFormat.format(Messages.getString("UIElementTreeBuilderHelper.UnknownWidgetType0"), new Object[] {type}); //$NON-NLS-1$
CUIPlugin.log(msg, null);
}

View file

@ -27,3 +27,4 @@ Require-Bundle: org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
org.eclipse.core.filesystem;bundle-version="1.2.0"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Import-Package: com.ibm.icu.text

View file

@ -15,7 +15,7 @@ import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.nio.charset.Charset;
import java.nio.charset.CharsetDecoder;
import java.text.MessageFormat;
import com.ibm.icu.text.MessageFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Iterator;

View file

@ -10,8 +10,8 @@
*******************************************************************************/
package org.eclipse.cdt.debug.internal.core;
import java.text.DateFormat;
import java.text.MessageFormat;
import com.ibm.icu.text.DateFormat;
import com.ibm.icu.text.MessageFormat;
import java.util.Date;
import org.eclipse.cdt.core.CCorePlugin;

View file

@ -11,7 +11,7 @@
package org.eclipse.cdt.debug.internal.core;
import java.math.BigInteger;
import java.text.MessageFormat;
import com.ibm.icu.text.MessageFormat;
import java.util.ArrayList;
import java.util.List;

View file

@ -10,7 +10,7 @@
*******************************************************************************/
package org.eclipse.cdt.debug.internal.core.breakpoints;
import java.text.MessageFormat;
import com.ibm.icu.text.MessageFormat;
import org.eclipse.cdt.core.ProblemMarkerInfo;
import org.eclipse.cdt.core.model.ICModelMarker;

View file

@ -16,7 +16,7 @@ import org.eclipse.cdt.debug.core.CDebugUtils;
import org.eclipse.cdt.debug.core.model.ICAddressBreakpoint;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.CoreException;
import java.text.MessageFormat;
import com.ibm.icu.text.MessageFormat;
/**
* A breakpoint that suspend the execution when a particular address is reached.

View file

@ -10,7 +10,7 @@
*******************************************************************************/
package org.eclipse.cdt.debug.internal.core.breakpoints;
import java.text.MessageFormat;
import com.ibm.icu.text.MessageFormat;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;

View file

@ -10,7 +10,7 @@
*******************************************************************************/
package org.eclipse.cdt.debug.internal.core.breakpoints;
import java.text.MessageFormat;
import com.ibm.icu.text.MessageFormat;
import java.util.Map;
import org.eclipse.cdt.debug.core.CDebugUtils;

View file

@ -10,7 +10,7 @@
*******************************************************************************/
package org.eclipse.cdt.debug.internal.core.breakpoints;
import java.text.MessageFormat;
import com.ibm.icu.text.MessageFormat;
import java.util.Map;
import org.eclipse.cdt.debug.core.CDebugUtils;

View file

@ -12,7 +12,7 @@
package org.eclipse.cdt.debug.internal.core.breakpoints;
import java.math.BigInteger;
import java.text.MessageFormat;
import com.ibm.icu.text.MessageFormat;
import java.util.Map;
import org.eclipse.cdt.debug.core.CDebugUtils;
import org.eclipse.cdt.debug.core.model.ICWatchpoint2;

View file

@ -11,7 +11,7 @@
*******************************************************************************/
package org.eclipse.cdt.debug.internal.core.model;
import java.text.MessageFormat;
import com.ibm.icu.text.MessageFormat;
import org.eclipse.cdt.debug.core.CDIDebugModel;
import org.eclipse.cdt.debug.core.CDebugCorePlugin;
import org.eclipse.cdt.debug.core.CDebugUtils;

View file

@ -13,7 +13,7 @@
package org.eclipse.cdt.debug.internal.core.model;
import java.io.File;
import java.text.MessageFormat;
import com.ibm.icu.text.MessageFormat;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;

View file

@ -11,7 +11,7 @@
package org.eclipse.cdt.debug.internal.core.model;
import java.math.BigInteger;
import java.text.MessageFormat;
import com.ibm.icu.text.MessageFormat;
import org.eclipse.cdt.core.IAddress;
import org.eclipse.cdt.core.IAddressFactory;

View file

@ -11,8 +11,8 @@
package org.eclipse.cdt.debug.internal.core.model;
import java.math.BigInteger;
import java.text.MessageFormat;
import java.text.NumberFormat;
import com.ibm.icu.text.MessageFormat;
import com.ibm.icu.text.NumberFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;

View file

@ -14,7 +14,7 @@
*******************************************************************************/
package org.eclipse.cdt.debug.internal.core.model;
import java.text.MessageFormat;
import com.ibm.icu.text.MessageFormat;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator;

View file

@ -10,7 +10,7 @@
*******************************************************************************/
package org.eclipse.cdt.debug.internal.core.model;
import java.text.MessageFormat;
import com.ibm.icu.text.MessageFormat;
import org.eclipse.cdt.debug.core.CDebugCorePlugin;
import org.eclipse.cdt.debug.core.ICDTLaunchConfigurationConstants;

View file

@ -10,7 +10,7 @@
*******************************************************************************/
package org.eclipse.cdt.debug.internal.core.model;
import java.text.MessageFormat;
import com.ibm.icu.text.MessageFormat;
import org.eclipse.cdt.core.IBinaryParser.ISymbol;
import org.eclipse.cdt.core.model.IBinaryModule;

View file

@ -14,7 +14,7 @@ import java.io.File;
import java.io.FileFilter;
import java.io.IOException;
import java.io.StringReader;
import java.text.MessageFormat;
import com.ibm.icu.text.MessageFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.LinkedList;

View file

@ -13,7 +13,7 @@ package org.eclipse.cdt.debug.internal.core.sourcelookup;
import java.io.File;
import java.io.IOException;
import java.io.StringReader;
import java.text.MessageFormat;
import com.ibm.icu.text.MessageFormat;
import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedList;

View file

@ -12,7 +12,7 @@ package org.eclipse.cdt.debug.internal.core.sourcelookup;
import java.io.IOException;
import java.io.StringReader;
import java.text.MessageFormat;
import com.ibm.icu.text.MessageFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashSet;

View file

@ -12,7 +12,7 @@ package org.eclipse.cdt.debug.internal.core.sourcelookup;
import java.io.File;
import java.io.IOException;
import java.text.MessageFormat;
import com.ibm.icu.text.MessageFormat;
import java.util.ArrayList;
import org.eclipse.cdt.core.model.CoreModel;

View file

@ -12,7 +12,7 @@ package org.eclipse.cdt.debug.internal.core.sourcelookup;
import java.io.IOException;
import java.io.StringReader;
import java.text.MessageFormat;
import com.ibm.icu.text.MessageFormat;
import java.util.ArrayList;
import java.util.LinkedList;
import java.util.List;

View file

@ -26,3 +26,4 @@ Require-Bundle: org.eclipse.cdt.debug.core;bundle-version="[6.0.0,7.0.0)",
org.eclipse.core.variables;bundle-version="3.2.200"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Import-Package: com.ibm.icu.text

View file

@ -11,8 +11,8 @@
package org.eclipse.cdt.debug.mi.core;
import java.io.File;
import java.text.DateFormat;
import java.text.MessageFormat;
import com.ibm.icu.text.DateFormat;
import com.ibm.icu.text.MessageFormat;
import java.util.Date;
import java.util.Map;
import org.eclipse.cdt.core.IBinaryParser.IBinaryObject;

View file

@ -13,8 +13,8 @@
package org.eclipse.cdt.debug.mi.core;
import java.io.File;
import java.text.DateFormat;
import java.text.MessageFormat;
import com.ibm.icu.text.DateFormat;
import com.ibm.icu.text.MessageFormat;
import java.util.Collections;
import java.util.Date;
import java.util.List;

View file

@ -11,7 +11,7 @@
package org.eclipse.cdt.debug.mi.core;
import java.io.File;
import java.text.MessageFormat;
import com.ibm.icu.text.MessageFormat;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;

View file

@ -14,7 +14,7 @@ import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.text.MessageFormat;
import com.ibm.icu.text.MessageFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.MissingResourceException;

View file

@ -26,3 +26,4 @@ Require-Bundle: org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
org.eclipse.jface.text;bundle-version="[3.2.0,4.0.0)"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Import-Package: com.ibm.icu.text

View file

@ -10,7 +10,7 @@
*******************************************************************************/
package org.eclipse.cdt.debug.mi.internal.ui.preferences;
import java.text.MessageFormat;
import com.ibm.icu.text.MessageFormat;
import java.util.HashMap;
import java.util.Iterator;
import org.eclipse.cdt.debug.mi.core.IMIConstants;

View file

@ -43,3 +43,4 @@ Require-Bundle: org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)",
org.eclipse.core.expressions
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Import-Package: com.ibm.icu.text

View file

@ -14,7 +14,7 @@
package org.eclipse.cdt.debug.internal.ui;
import java.io.File;
import java.text.MessageFormat;
import com.ibm.icu.text.MessageFormat;
import java.util.HashMap;
import org.eclipse.cdt.core.IAddress;

View file

@ -11,7 +11,7 @@
*******************************************************************************/
package org.eclipse.cdt.debug.internal.ui;
import java.text.MessageFormat;
import com.ibm.icu.text.MessageFormat;
import org.eclipse.cdt.debug.core.CDebugUtils;
import org.eclipse.cdt.debug.core.model.ICDebugElementStatus;

View file

@ -10,7 +10,7 @@
*******************************************************************************/
package org.eclipse.cdt.debug.internal.ui.actions;
import java.text.MessageFormat;
import com.ibm.icu.text.MessageFormat;
import java.util.Arrays;
import java.util.List;
import org.eclipse.cdt.debug.core.model.IRegisterDescriptor;

View file

@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2008 ARM Limited and others.
* Copyright (c) 2008, 2009 ARM Limited and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@ -7,6 +7,7 @@
*
* Contributors:
* ARM Limited - Initial API and implementation
* IBM Corporation
*******************************************************************************/
package org.eclipse.cdt.debug.internal.ui.elements.adapters;
@ -16,7 +17,7 @@ import java.io.File;
import java.io.FileReader;
import java.io.IOException;
import java.math.BigInteger;
import java.text.MessageFormat;
import com.ibm.icu.text.MessageFormat;
import org.eclipse.cdt.debug.core.CDebugUtils;
import org.eclipse.cdt.debug.core.model.IDisassemblyInstruction;
@ -97,7 +98,7 @@ public class DisassemblyElementLabelProvider implements IDocumentElementLabelPro
private String getSourceLineText( IDisassemblySourceLine line ) {
File file = line.getFile();
String text = MessageFormat.format( "File {0} not found.", file.getPath() );
String text = MessageFormat.format( "File {0} not found.", new Object[] {file.getPath()} );
ISourceLocator locator = line.getDebugTarget().getLaunch().getSourceLocator();
if ( locator instanceof ISourceLookupDirector ) {
ISourceLookupDirector director = (ISourceLookupDirector)locator;
@ -141,6 +142,6 @@ public class DisassemblyElementLabelProvider implements IDocumentElementLabelPro
br.close();
}
throw new IOException( MessageFormat.format( "Line {0} doesn't exist in {1}.", Integer.valueOf( lineNumber ), file.getPath() ) );
throw new IOException( MessageFormat.format( "Line {0} doesn't exist in {1}.", new Object[] {Integer.valueOf( lineNumber ), file.getPath()}) );
}
}

View file

@ -10,7 +10,7 @@
*******************************************************************************/
package org.eclipse.cdt.debug.internal.ui.launch;
import java.text.MessageFormat;
import com.ibm.icu.text.MessageFormat;
import java.util.MissingResourceException;
import java.util.ResourceBundle;

View file

@ -12,7 +12,7 @@
package org.eclipse.cdt.debug.internal.ui.preferences;
import java.nio.charset.Charset;
import java.text.MessageFormat;
import com.ibm.icu.text.MessageFormat;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.SortedMap;

Some files were not shown because too many files have changed in this diff Show more