From 0e08b571642eb68a87aa75d541096f872d550948 Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Fri, 11 May 2012 21:08:23 +0400
Subject: [PATCH] Cleanup (move messages to corresponding bundle)

---
 .../src/messages/JavaErrorMessages.properties     |  2 --
 .../uiDesigner/binding/FormClassAnnotator.java    | 15 ++++++---------
 .../src/messages/UIDesignerBundle.properties      |  2 ++
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/java/java-psi-impl/src/messages/JavaErrorMessages.properties b/java/java-psi-impl/src/messages/JavaErrorMessages.properties
index 2258f7f8d204..79ee2846632c 100644
--- a/java/java-psi-impl/src/messages/JavaErrorMessages.properties
+++ b/java/java-psi-impl/src/messages/JavaErrorMessages.properties
@@ -258,8 +258,6 @@ private.inner.interface.is.not.used=Private inner interface ''{0}'' is never use
 type.parameter.is.not.used=Type parameter ''{0}'' is never used
 local.class.is.not.used=Local class ''{0}'' is never used
 class.is.not.used=Class ''{0}'' is never used
-uidesigned.field.is.overwritten.by.generated.code=Field ''{0}'' is overwritten by generated code
-uidesigner.bound.field.type.mismatch=Types of GUI component (''{0}'') and bound field (''{1}'') do not match
 
 hexadecimal.numbers.must.contain.at.least.one.hexadecimal.digit=Hexadecimal numbers must contain at least one hexadecimal digit
 binary.numbers.must.contain.at.least.one.hexadecimal.digit=Binary numbers must contain at least one binary digit
diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/binding/FormClassAnnotator.java b/plugins/ui-designer/src/com/intellij/uiDesigner/binding/FormClassAnnotator.java
index 0830d5d886b8..191bd651a949 100644
--- a/plugins/ui-designer/src/com/intellij/uiDesigner/binding/FormClassAnnotator.java
+++ b/plugins/ui-designer/src/com/intellij/uiDesigner/binding/FormClassAnnotator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2012 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,9 +15,8 @@
  */
 package com.intellij.uiDesigner.binding;
 
-import com.intellij.codeInsight.daemon.JavaErrorMessages;
-import com.intellij.codeInsight.intention.IntentionAction;
 import com.intellij.codeInsight.CodeInsightUtilBase;
+import com.intellij.codeInsight.intention.IntentionAction;
 import com.intellij.lang.annotation.Annotation;
 import com.intellij.lang.annotation.AnnotationHolder;
 import com.intellij.lang.annotation.Annotator;
@@ -26,10 +25,10 @@ import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.*;
 import com.intellij.ui.UIBundle;
+import com.intellij.uiDesigner.UIDesignerBundle;
 import com.intellij.util.IncorrectOperationException;
 import org.jetbrains.annotations.NotNull;
 
-import java.text.MessageFormat;
 import java.util.List;
 
 /**
@@ -38,9 +37,6 @@ import java.util.List;
 public class FormClassAnnotator implements Annotator {
   private static final Logger LOG = Logger.getInstance("#com.intellij.uiDesigner.binding.FormClassAnnotator");
 
-  private static final String FIELD_IS_OVERWRITTEN = JavaErrorMessages.message("uidesigned.field.is.overwritten.by.generated.code");
-  private static final String BOUND_FIELD_TYPE_MISMATCH = JavaErrorMessages.message("uidesigner.bound.field.type.mismatch");
-
   public void annotate(@NotNull PsiElement psiElement, @NotNull AnnotationHolder holder) {
     if (psiElement instanceof PsiField) {
       PsiField field = (PsiField) psiElement;
@@ -68,7 +64,8 @@ public class FormClassAnnotator implements Annotator {
     if (guiComponentType != null) {
       final PsiType fieldType = field.getType();
       if (!fieldType.isAssignableFrom(guiComponentType)) {
-        String message = MessageFormat.format(BOUND_FIELD_TYPE_MISMATCH, guiComponentType.getCanonicalText(), fieldType.getCanonicalText());
+        String message = UIDesignerBundle.message("bound.field.type.mismatch", guiComponentType.getCanonicalText(),
+                                                  fieldType.getCanonicalText());
         Annotation annotation = holder.createErrorAnnotation(field.getTypeElement(), message);
         annotation.registerFix(new ChangeFormComponentTypeFix((PsiPlainTextFile)boundForm, field.getName(), field.getType()), null, null);
         annotation.registerFix(new ChangeBoundFieldTypeFix(field, guiComponentType), null, null);
@@ -76,7 +73,7 @@ public class FormClassAnnotator implements Annotator {
     }
 
     if (field.hasInitializer()) {
-      final String message = MessageFormat.format(FIELD_IS_OVERWRITTEN, field.getName());
+      final String message = UIDesignerBundle.message("field.is.overwritten.by.generated.code", field.getName());
       Annotation annotation = holder.createWarningAnnotation(field.getInitializer(), message);
       annotation.registerFix(new IntentionAction() {
         @NotNull
diff --git a/plugins/ui-designer/src/messages/UIDesignerBundle.properties b/plugins/ui-designer/src/messages/UIDesignerBundle.properties
index 883a27e82812..c330d3e58673 100644
--- a/plugins/ui-designer/src/messages/UIDesignerBundle.properties
+++ b/plugins/ui-designer/src/messages/UIDesignerBundle.properties
@@ -480,6 +480,8 @@ add.component.error.qualified.name.required=Please enter a qualified class name
 add.component.error.component.required=Please select a class derived from JComponent
 form.usage.type=Usage in GUI form
 unsupported.component.class.version=Unsupported component class version
+field.is.overwritten.by.generated.code=Field ''{0}'' is overwritten by generated code
+bound.field.type.mismatch=Types of GUI component (''{0}'') and bound field (''{1}'') do not match
 action.GuiDesigner.PreviewForm.text=Preview
 action.GuiDesigner.PreviewForm.description=Preview form
 action.GuiDesigner.DataBindingWizard.text=Data Binding Wizard...