Added missing copyright comments and cleaned up localizable messages.

9 files changed, 50 insertions, 31 deletions

diff --git a/codan/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/CaseBreakQuickFixBreak.java b/codan/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/CaseBreakQuickFixBreak.java
index d2699c4f724..815d411e0a8 100644
--- a/codan/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/CaseBreakQuickFixBreak.java
+++ b/codan/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/CaseBreakQuickFixBreak.java
@@ -41,7 +41,7 @@ public class CaseBreakQuickFixBreak extends AbstractAstRewriteQuickFix {
 

 	@Override

 	public String getLabel() {

-		return Messages.CaseBreakQuickFixBreak_Label;

+		return QuickFixMessages.CaseBreakQuickFixBreak_Label;

 	}

 

 	protected IASTStatement getStmtBeforeBreak(IMarker marker, IASTTranslationUnit ast) throws BadLocationException {

diff --git a/codan/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/CaseBreakQuickFixComment.java b/codan/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/CaseBreakQuickFixComment.java
index 2ed2893fabc..57af76fa0b3 100644
--- a/codan/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/CaseBreakQuickFixComment.java
+++ b/codan/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/CaseBreakQuickFixComment.java
@@ -24,7 +24,7 @@ import org.eclipse.text.edits.MalformedTreeException;
 public class CaseBreakQuickFixComment extends AbstractCodanCMarkerResolution {

 	@Override

 	public String getLabel() {

-		return Messages.CaseBreakQuickFixComment_Label;

+		return QuickFixMessages.CaseBreakQuickFixComment_Label;

 	}

 

 	@Override

@@ -36,7 +36,7 @@ public class CaseBreakQuickFixComment extends AbstractCodanCMarkerResolution {
 			int offset = document.getLineOffset(line);

 			String indent = getIndentationStr(document, line);

 			String comment = getNoBreakComment(marker);

-			String editStr = String.format("%s/* %s */\n", indent, comment);//$NON-NLS-1$ 

+			String editStr = String.format("%s/* %s */\n", indent, comment); //$NON-NLS-1$ 

 			InsertEdit edit = new InsertEdit(offset, editStr);

 			edit.apply(document);

 		} catch (MalformedTreeException e) {

diff --git a/codan/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/Messages.java b/codan/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/Messages.java
deleted file mode 100644
index 0a7a6864aa0..00000000000
--- a/codan/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/Messages.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package org.eclipse.cdt.codan.internal.checkers.ui.quickfix;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Messages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.cdt.codan.internal.checkers.ui.quickfix.messages"; //$NON-NLS-1$
-	public static String CaseBreakQuickFixBreak_Label;
-	public static String CaseBreakQuickFixComment_Label;
-	public static String QuickFixCreateField_0;
-	public static String QuickFixCreateLocalVariable_0;
-	public static String QuickFixCreateParameter_0;
-	static {
-		// initialize resource bundle
-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
-	}
-
-	private Messages() {
-	}
-}
diff --git a/codan/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/QuickFixCreateField.java b/codan/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/QuickFixCreateField.java
index a499c3e0b1c..e8dd13c8b19 100644
--- a/codan/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/QuickFixCreateField.java
+++ b/codan/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/QuickFixCreateField.java
@@ -35,7 +35,7 @@ import org.eclipse.ltk.core.refactoring.Change;
 public class QuickFixCreateField extends AbstractAstRewriteQuickFix {
 	@Override
 	public String getLabel() {
-		return Messages.QuickFixCreateField_0;
+		return QuickFixMessages.QuickFixCreateField_create_field;
 	}
 
 	@Override
diff --git a/codan/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/QuickFixCreateLocalVariable.java b/codan/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/QuickFixCreateLocalVariable.java
index cf9eecc07bc..da4c0332940 100644
--- a/codan/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/QuickFixCreateLocalVariable.java
+++ b/codan/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/QuickFixCreateLocalVariable.java
@@ -30,7 +30,7 @@ import org.eclipse.ltk.core.refactoring.Change;
 public class QuickFixCreateLocalVariable extends AbstractAstRewriteQuickFix {
 	@Override
 	public String getLabel() {
-		return Messages.QuickFixCreateLocalVariable_0;
+		return QuickFixMessages.QuickFixCreateLocalVariable_create_local_variable;
 	}
 
 	@Override
diff --git a/codan/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/QuickFixCreateParameter.java b/codan/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/QuickFixCreateParameter.java
index 34fd96f0851..2d11daf460b 100644
--- a/codan/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/QuickFixCreateParameter.java
+++ b/codan/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/QuickFixCreateParameter.java
@@ -41,12 +41,12 @@ import org.eclipse.ltk.core.refactoring.CompositeChange;
 public class QuickFixCreateParameter extends AbstractAstRewriteQuickFix {
 	@Override
 	public String getLabel() {
-		return Messages.QuickFixCreateParameter_0;
+		return QuickFixMessages.QuickFixCreateParameter_create_parameter;
 	}
 
 	@Override
 	public void modifyAST(IIndex index, IMarker marker) {
-		CompositeChange c = new CompositeChange(Messages.QuickFixCreateParameter_0);
+		CompositeChange c = new CompositeChange(QuickFixMessages.QuickFixCreateParameter_create_parameter);
 		try {
 			ITranslationUnit baseTU = getTranslationUnitViaEditor(marker);
 			IASTTranslationUnit baseAST = baseTU.getAST(index, ITranslationUnit.AST_SKIP_INDEXED_HEADERS);
diff --git a/codan/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/QuickFixMessages.java b/codan/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/QuickFixMessages.java
new file mode 100644
index 00000000000..3bbc35b063b
--- /dev/null
+++ b/codan/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/QuickFixMessages.java
@@ -0,0 +1,28 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Alena Laskavaia 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:
+ *     Alena Laskavaia  - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.cdt.codan.internal.checkers.ui.quickfix;
+
+import org.eclipse.osgi.util.NLS;
+
+public class QuickFixMessages extends NLS {
+	public static String CaseBreakQuickFixBreak_Label;
+	public static String CaseBreakQuickFixComment_Label;
+	public static String QuickFixCreateField_create_field;
+	public static String QuickFixCreateLocalVariable_create_local_variable;
+	public static String QuickFixCreateParameter_create_parameter;
+
+	static {
+		NLS.initializeMessages(QuickFixMessages.class.getName(), QuickFixMessages.class);
+	}
+
+	private QuickFixMessages() {
+	}
+}
diff --git a/codan/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/QuickFixMessages.properties b/codan/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/QuickFixMessages.properties
new file mode 100644
index 00000000000..87c8c046fd4
--- /dev/null
+++ b/codan/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/QuickFixMessages.properties
@@ -0,0 +1,15 @@
+###############################################################################
+# Copyright (c) 2011 Alena Laskavaia 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:
+#     Alena Laskavaia
+###############################################################################
+CaseBreakQuickFixBreak_Label=Add break statement
+CaseBreakQuickFixComment_Label=Add suppressing comment
+QuickFixCreateField_create_field=Create field
+QuickFixCreateLocalVariable_create_local_variable=Create local variable
+QuickFixCreateParameter_create_parameter=Create parameter
\ No newline at end of file
diff --git a/codan/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/messages.properties b/codan/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/messages.properties
deleted file mode 100644
index 0afc2cc4215..00000000000
--- a/codan/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/messages.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-CaseBreakQuickFixBreak_Label=Add break statement
-CaseBreakQuickFixComment_Label=Add supressing comment
-QuickFixCreateField_0=Create field
-QuickFixCreateLocalVariable_0=Create local variable
-QuickFixCreateParameter_0=Create parameter
\ No newline at end of file