/*
 * Copyright 2000-2013 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.jetbrains.idea.devkit;

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

import java.lang.ref.Reference;
import java.lang.ref.SoftReference;
import java.util.ResourceBundle;

/**
 * User: anna
 * Date: Aug 11, 2005
 */
public class DevKitBundle {

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

  private static Reference<ResourceBundle> ourBundle;
  @NonNls private static final String BUNDLE = "org.jetbrains.idea.devkit.DevKitBundle";

  private DevKitBundle() {
  }

  private static ResourceBundle getBundle() {
    ResourceBundle bundle = com.intellij.reference.SoftReference.dereference(ourBundle);
    if (bundle == null) {
      bundle = ResourceBundle.getBundle(BUNDLE);
      ourBundle = new SoftReference<ResourceBundle>(bundle);
    }
    return bundle;
  }
}

@@ -21,9 +21,9 @@
 -201
-3
+4
  Jet
@@ -650,22 +650,24 @@
 ntellij.
-Common
+Abstract
 Bundle;%0A
@@ -800,836 +800,436 @@
 y;%0A%0A
-import java.lang.ref.Reference;%0Aimport java.lang.ref.SoftReference;%0Aimport java.util.ResourceBundle;%0A%0A/**%0A * User: anna%0A * Date: Aug 11, 2005%0A */%0Apublic class DevKitBundle %7B%0A%0A  public static String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, @NotNull Object... params) %7B%0A    return CommonBundle.message(getBundle(), key, params);%0A  %7D%0A%0A  private static Reference%3CResourceBundle%3E ourBundle;%0A  @NonNls private static final String BUNDLE = %22org.jetbrains.idea.devkit.DevKitBundle%22;%0A%0A  private DevKitBundle() %7B%0A  %7D%0A%0A  private static ResourceBundle getBundle() %7B%0A    ResourceBundle bundle = com.intellij.reference.SoftReference.dereference(our
+public class DevKitBundle extends AbstractBundle %7B%0A%0A  public static String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, @NotNull Object... params) %7B%0A    return ourInstance.getMessage(key, params);%0A  %7D%0A%0A  @NonNls private static final String BUNDLE = %22org.jetbrains.idea.devkit.DevKitBundle%22;%0A  private static final DevKitBundle ourInstance = new DevKit
 Bundle
+(
 );%0A
-    if (bundle == null) %7B%0A      bundle = ResourceBundle.getBundle(BUNDLE);%0A      ourBundle = new SoftReference%3CResourceBundle%3E(bundle);%0A    %7D%0A    return bundle
+%0A  private DevKitBundle() %7B%0A    super(BUNDLE)
 ;%0A  

use AbstractBundle