diff -r bdc3f1b79fb7 -r a00905527ec2 jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/ResourceManager.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/ResourceManager.java	Wed Mar 30 19:05:58 2016 -0700
@@ -0,0 +1,77 @@
+/*
+ * Copyright (c) 2007, 2016, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package com.sun.swingset3.demos;
+
+import java.net.URL;
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import javax.swing.*;
+
+/**
+ * @author Pavel Porvatov
+ */
+public class ResourceManager {
+
+    private static final Logger logger = Logger.getLogger(ResourceManager.class.getName());
+
+    private final Class<?> demoClass;
+
+    // Resource bundle for internationalized and accessible text
+    private ResourceBundle bundle = null;
+
+    public ResourceManager(Class<?> demoClass) {
+        this.demoClass = demoClass;
+
+        String bundleName = demoClass.getPackage().getName() + ".resources." + demoClass.getSimpleName();
+
+        try {
+            bundle = ResourceBundle.getBundle(bundleName);
+        } catch (MissingResourceException e) {
+            logger.log(Level.SEVERE, "Couldn't load bundle: " + bundleName);
+        }
+    }
+
+    public String getString(String key) {
+        return bundle != null ? bundle.getString(key) : key;
+    }
+
+    public char getMnemonic(String key) {
+        return (getString(key)).charAt(0);
+    }
+
+    public ImageIcon createImageIcon(String filename, String description) {
+        String path = "resources/images/" + filename;
+
+        URL imageURL = demoClass.getResource(path);
+
+        if (imageURL == null) {
+            logger.log(Level.SEVERE, "unable to access image file: " + path);
+
+            return null;
+        } else {
+            return new ImageIcon(imageURL, description);
+        }
+    }
+}