From f896a9a2283a963c2197fe60798d84a32e3f8ab2 Mon Sep 17 00:00:00 2001 From: Anton Leherbauer Date: Thu, 13 Mar 2008 15:13:02 +0000 Subject: [PATCH] Cleanup missing and unused NLS keys --- .../core/model/CommitWorkingCopyOperation.java | 6 ++++-- .../core/model/CopyElementsOperation.java | 4 ++-- .../core/model/CopyResourceElementsOperation.java | 5 +++-- .../core/model/CoreModelMessages.properties | 15 +++------------ .../core/model/DeleteElementsOperation.java | 7 ++++--- .../model/DeleteResourceElementsOperation.java | 7 ++++--- .../core/model/MoveElementsOperation.java | 7 ++++--- .../core/model/MoveResourceElementsOperation.java | 5 +++-- .../core/model/RenameElementsOperation.java | 7 ++++--- .../model/RenameResourceElementsOperation.java | 7 ++++--- 10 files changed, 35 insertions(+), 35 deletions(-) diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CommitWorkingCopyOperation.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CommitWorkingCopyOperation.java index 3898e72abed..5df9bdf7e68 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CommitWorkingCopyOperation.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CommitWorkingCopyOperation.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2002, 2006 IBM Corporation and others. + * Copyright (c) 2002, 2008 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 @@ -8,10 +8,12 @@ * Contributors: * Rational Software - Initial API and implementation * Markus Schorn (Wind River Systems) + * Anton Leherbauer (Wind River Systems) *******************************************************************************/ package org.eclipse.cdt.internal.core.model; +import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.model.CModelException; import org.eclipse.cdt.core.model.IBuffer; import org.eclipse.cdt.core.model.ICElement; @@ -75,7 +77,7 @@ public class CommitWorkingCopyOperation extends CModelOperation { */ protected void executeOperation() throws CModelException { try { - beginTask("workingCopy.commit", 2); //$NON-NLS-1$ + beginTask(CoreModelMessages.getString("workingCopy.commit"), 2); //$NON-NLS-1$ WorkingCopy wc = (WorkingCopy)getElementToProcess(); ITranslationUnit tu = wc.getOriginalElement(); diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CopyElementsOperation.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CopyElementsOperation.java index d5b91e32f1e..37ad2dc52dd 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CopyElementsOperation.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CopyElementsOperation.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2006 QNX Software Systems and others. + * Copyright (c) 2000, 2008 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 @@ -80,7 +80,7 @@ public class CopyElementsOperation extends MultiOperation { * for progress monitoring. */ protected String getMainTaskName() { - return "operation.copyElementProgress"; //$NON-NLS-1$ + return CoreModelMessages.getString("operation.copyElementProgress"); //$NON-NLS-1$ } /** diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CopyResourceElementsOperation.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CopyResourceElementsOperation.java index 06d3716ff71..bee0147529d 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CopyResourceElementsOperation.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CopyResourceElementsOperation.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2006 QNX Software Systems and others. + * Copyright (c) 2000, 2008 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 @@ -7,6 +7,7 @@ * * Contributors: * QNX Software Systems - Initial API and implementation + * Anton Leherbauer (Wind River Systems) *******************************************************************************/ package org.eclipse.cdt.internal.core.model; @@ -83,7 +84,7 @@ public class CopyResourceElementsOperation extends MultiOperation { * @see MultiOperation */ protected String getMainTaskName() { - return "operation.copyResourceProgress"; //$NON-NLS-1$ + return CoreModelMessages.getString("operation.copyResourceProgress"); //$NON-NLS-1$ } /** diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CoreModelMessages.properties b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CoreModelMessages.properties index 116f8cf7e1f..b1372587431 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CoreModelMessages.properties +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CoreModelMessages.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2000, 2007 IBM Corporation and others. +# Copyright (c) 2000, 2008 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 @@ -7,6 +7,7 @@ # # Contributors: # QNX Software Systems - Initial API and implementation +# Anton Leherbauer (Wind River Systems) ############################################################################### ### CoreModel messages. @@ -27,19 +28,11 @@ operation.renameElementProgress = Renaming elements... operation.copyResourceProgress = Copying resources... operation.moveResourceProgress = Moving resources... operation.renameResourceProgress = Renaming resources... -operation.createUnitProgress = Creating a compilation unit... operation.createFieldProgress = Creating a field... -operation.createImportsProgress = Creating imports... -operation.createInitializerProgress = Creating an initializer... operation.createMethodProgress = Creating a method... -operation.createPackageProgress = Creating a package declaration... -operation.createPackageFragmentProgress = Creating package fragment(s)... -operation.createTypeProgress = Creating a type... operation.deleteElementProgress = Deleting elements... operation.deleteResourceProgress = Deleting resources... -operation.cannotRenameDefaultPackage = Default package cannot be renamed. operation.pathOutsideProject = Path ''{0}'' must denote location inside project {1} -operation.sortelements = Sorting elements... ### working copy workingCopy.commit = Committing working copy... @@ -48,15 +41,12 @@ workingCopy.commit = Committing working copy... status.cannotUseDeviceOnPath = Operation requires a path with no device. Path specified was: {0} status.elementDoesNotExist = Element {0} does not exist. status.coreException = Core exception. -status.defaultPackageReadOnly = Default package is read-only. status.evaluationError = Evaluation error: {0}. -status.JDOMError = JDOM error. status.IOException = I/O exception. status.indexOutOfBounds = Index out of bounds. status.invalidContents = Invalid contents specified. status.invalidDestination = Invalid destination: ''{0}''. status.invalidName = Invalid name specified: {0}. -status.invalidPackage = Invalid package: {0}. status.invalidPath = Invalid path: ''{0}''. status.invalidProject = Invalid project: {0}. status.invalidPathEntry = Invalid project path: {0}. @@ -66,6 +56,7 @@ status.invalidSibling = Invalid sibling: {0}. status.nameCollision = {0} already exists in target. status.noLocalContents = Cannot find local contents for resource: {0} status.OK = OK +status.ParserError = Parser error. status.readOnly = {0} is read-only. status.targetException = Target exception. status.updateConflict = Update conflict. diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/DeleteElementsOperation.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/DeleteElementsOperation.java index 4b1ee4c8513..5cc6f185bd7 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/DeleteElementsOperation.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/DeleteElementsOperation.java @@ -1,12 +1,13 @@ /******************************************************************************* - * Copyright (c) 2002, 2005 QNX Software Systems and others. + * Copyright (c) 2002, 2008 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 * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * QNX Software Systems - Initial API and implementation + * QNX Software Systems - Initial API and implementation + * Anton Leherbauer (Wind River Systems) *******************************************************************************/ package org.eclipse.cdt.internal.core.model; @@ -50,7 +51,7 @@ public class DeleteElementsOperation extends MultiOperation { * @see MultiOperation */ protected String getMainTaskName() { - return "operation.deleteElementProgress"; //$NON-NLS-1$ + return CoreModelMessages.getString("operation.deleteElementProgress"); //$NON-NLS-1$ } /** diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/DeleteResourceElementsOperation.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/DeleteResourceElementsOperation.java index 4f01075c8cb..3eab27dd049 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/DeleteResourceElementsOperation.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/DeleteResourceElementsOperation.java @@ -1,12 +1,13 @@ /******************************************************************************* - * Copyright (c) 2000, 2005 IBM Corporation and others. + * Copyright (c) 2000, 2008 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 * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * IBM - Initial API and implementation + * IBM - Initial API and implementation + * Anton Leherbauer (Wind River Systems) *******************************************************************************/ package org.eclipse.cdt.internal.core.model; @@ -33,7 +34,7 @@ public class DeleteResourceElementsOperation extends MultiOperation { * @see MultiOperation */ protected String getMainTaskName() { - return "operation.deleteResourceProgress"; //$NON-NLS-1$ + return CoreModelMessages.getString("operation.deleteResourceProgress"); //$NON-NLS-1$ } /** diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/MoveElementsOperation.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/MoveElementsOperation.java index f8fc34654b6..2476f75d164 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/MoveElementsOperation.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/MoveElementsOperation.java @@ -1,12 +1,13 @@ /******************************************************************************* - * Copyright (c) 2002, 2005 QNX Software Systems and others. + * Copyright (c) 2002, 2008 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 * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * QNX Software Systems - Initial API and implementation + * QNX Software Systems - Initial API and implementation + * Anton Leherbauer (Wind River Systems) *******************************************************************************/ package org.eclipse.cdt.internal.core.model; @@ -28,7 +29,7 @@ public class MoveElementsOperation extends CopyElementsOperation { * for progress monitoring. */ protected String getMainTaskName() { - return "operation.moveElementProgress"; //$NON-NLS-1$ + return CoreModelMessages.getString("operation.moveElementProgress"); //$NON-NLS-1$ } /** * @see CopyElementsOperation#isMove() diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/MoveResourceElementsOperation.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/MoveResourceElementsOperation.java index b77ba2bee19..2fb05589712 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/MoveResourceElementsOperation.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/MoveResourceElementsOperation.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2005 QNX Software Systems and others. + * Copyright (c) 2000, 2008 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 @@ -7,6 +7,7 @@ * * Contributors: * QNX Software Systems - Initial API and implementation + * Anton Leherbauer (Wind River Systems) *******************************************************************************/ package org.eclipse.cdt.internal.core.model; @@ -35,7 +36,7 @@ public class MoveResourceElementsOperation extends CopyResourceElementsOperation * @see MultiOperation */ protected String getMainTaskName() { - return "operation.moveResourceProgress"; //$NON-NLS-1$ + return CoreModelMessages.getString("operation.moveResourceProgress"); //$NON-NLS-1$ } /** diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/RenameElementsOperation.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/RenameElementsOperation.java index 26f3f2d52bb..9bc7e87d518 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/RenameElementsOperation.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/RenameElementsOperation.java @@ -1,12 +1,13 @@ /******************************************************************************* - * Copyright (c) 2002, 2005 QNX Software Systems and others. + * Copyright (c) 2002, 2008 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 * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * QNX Software Systems - Initial API and implementation + * QNX Software Systems - Initial API and implementation + * Anton Leherbauer (Wind River Systems) *******************************************************************************/ package org.eclipse.cdt.internal.core.model; @@ -35,7 +36,7 @@ public class RenameElementsOperation extends MoveElementsOperation { * @see MultiOperation */ protected String getMainTaskName() { - return "operation.renameElementProgress"; //$NON-NLS-1$ + return CoreModelMessages.getString("operation.renameElementProgress"); //$NON-NLS-1$ } /** * @see CopyElementsOperation#isRename() diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/RenameResourceElementsOperation.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/RenameResourceElementsOperation.java index 330ed1d9189..d95bfa9c46e 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/RenameResourceElementsOperation.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/RenameResourceElementsOperation.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2005 QNX Software Systems and others. + * Copyright (c) 2000, 2008 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 @@ -7,12 +7,13 @@ * * Contributors: * QNX Software Systems - Initial API and implementation + * Anton Leherbauer (Wind River Systems) *******************************************************************************/ package org.eclipse.cdt.internal.core.model; -import org.eclipse.cdt.core.model.ICElement; import org.eclipse.cdt.core.model.CModelException; +import org.eclipse.cdt.core.model.ICElement; /** * This operation renames resources (Package fragments and compilation units). @@ -38,7 +39,7 @@ public class RenameResourceElementsOperation extends MoveResourceElementsOperati * @see MultiOperation */ protected String getMainTaskName() { - return "operation.renameResourceProgress"; //$NON-NLS-1$ + return CoreModelMessages.getString("operation.renameResourceProgress"); //$NON-NLS-1$ } /**