/*
 * Copyright 2000-2015 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.
 * You may obtain a copy of the License at
 *
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
package org.intellij.plugins.markdown;

import com.intellij.CommonBundle;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.PropertyKey;

import java.util.ResourceBundle;

public class MarkdownBundle {
  @NotNull
  private static final String BUNDLE_NAME = "messages.MarkdownBundle";
  @NotNull
  private static final ResourceBundle BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);

  @NotNull
  public static String message(@NotNull @PropertyKey(resourceBundle = BUNDLE_NAME) String key, Object... params) {
    return CommonBundle.message(BUNDLE, key, params);
  }
}

@@ -654,28 +654,70 @@
 ntellij.
-CommonBundle
+DynamicBundle;%0Aimport org.jetbrains.annotations.NonNls
 ;%0Aimport
@@ -803,84 +803,69 @@
 y;%0A%0A
-import java.util.ResourceBundle;%0A%0Apublic class MarkdownBundle %7B%0A  @NotNull%0A 
+public class MarkdownBundle extends DynamicBundle %7B%0A  @NonNls
  pri
@@ -895,21 +895,16 @@
 g BUNDLE
-_NAME
  = %22mess
@@ -925,27 +925,16 @@
 undle%22;%0A
-  @NotNull%0A
   privat
@@ -952,70 +952,102 @@
 nal 
-ResourceBundle BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);
+MarkdownBundle INSTANCE = new MarkdownBundle();%0A%0A  private MarkdownBundle() %7B super(BUNDLE); %7D
 %0A%0A  
@@ -1135,13 +1135,8 @@
 NDLE
-_NAME
 ) St
@@ -1144,16 +1144,25 @@
 ing key,
+ @NotNull
  Object.
@@ -1189,37 +1189,28 @@
 urn 
-CommonBundle.message(BUNDLE, 
+INSTANCE.getMessage(
 key,
@@ -1224,9 +1224,8 @@
 );%0A  %7D%0A%7D
-%0A

move markdown bundle