1 files changed, 76 insertions, 6 deletions

diff --git a/org.eclipse.handly.examples.javamodel.ui/src/org/eclipse/handly/internal/examples/javamodel/ui/Activator.java b/org.eclipse.handly.examples.javamodel.ui/src/org/eclipse/handly/internal/examples/javamodel/ui/Activator.java
index 60408a07..88b5b9de 100644
--- a/org.eclipse.handly.examples.javamodel.ui/src/org/eclipse/handly/internal/examples/javamodel/ui/Activator.java
+++ b/org.eclipse.handly.examples.javamodel.ui/src/org/eclipse/handly/internal/examples/javamodel/ui/Activator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 1C-Soft LLC.
+ * Copyright (c) 2015 1C-Soft LLC 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
@@ -7,14 +7,22 @@
  *
  * Contributors:
  *     Vladimir Piskarev (1C) - initial API and implementation
+ *     Ondrej Ilcik (Codasip)
  *******************************************************************************/
 package org.eclipse.handly.internal.examples.javamodel.ui;
 
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.preferences.InstanceScope;
+import org.eclipse.handly.internal.examples.javamodel.ui.preferences.MembersOrderPreferenceCache;
+import org.eclipse.jdt.ui.JavaUI;
+import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.eclipse.ui.preferences.ScopedPreferenceStore;
 import org.osgi.framework.BundleContext;
 
 /**
- * The activator class controls the plug-in life cycle
+ * The activator class controls the plug-in life cycle.
  */
 public class Activator
     extends AbstractUIPlugin
@@ -24,27 +32,89 @@ public class Activator
 
     private static Activator plugin;
 
+    private ImageDescriptorRegistry imageDescriptorRegistry;
+    private MembersOrderPreferenceCache membersOrderPreferenceCache;
+
     @Override
     public void start(BundleContext context) throws Exception
     {
         super.start(context);
         plugin = this;
+
+        imageDescriptorRegistry = new ImageDescriptorRegistry();
+        membersOrderPreferenceCache = new MembersOrderPreferenceCache();
+        membersOrderPreferenceCache.install(getJavaPreferenceStore());
     }
 
     @Override
     public void stop(BundleContext context) throws Exception
     {
-        plugin = null;
-        super.stop(context);
+        try
+        {
+            if (membersOrderPreferenceCache != null)
+            {
+                membersOrderPreferenceCache.dispose();
+                membersOrderPreferenceCache = null;
+            }
+            if (imageDescriptorRegistry != null)
+            {
+                imageDescriptorRegistry.dispose();
+                imageDescriptorRegistry = null;
+            }
+        }
+        finally
+        {
+            plugin = null;
+            super.stop(context);
+        }
     }
 
     /**
-     * Returns the shared instance
+     * Returns the shared instance of this plug-in.
      *
-     * @return the shared instance
+     * @return the shared instance of this plug-in
      */
     public static Activator getDefault()
     {
         return plugin;
     }
+
+    /**
+     * Returns the image descriptor registry for this plug-in.
+     *
+     * @return registry
+     */
+    public static ImageDescriptorRegistry getImageDescriptorRegistry()
+    {
+        return getDefault().imageDescriptorRegistry;
+    }
+
+    /**
+     * Returns cached preferences for Java element member ordering.
+     *
+     * @return preferences
+     */
+    public static MembersOrderPreferenceCache getMemberOrderPreferenceCache()
+    {
+        return getDefault().membersOrderPreferenceCache;
+    }
+
+    public static void log(IStatus status)
+    {
+        getDefault().getLog().log(status);
+    }
+
+    public static IStatus createErrorStatus(String msg, Throwable e)
+    {
+        return new Status(IStatus.ERROR, PLUGIN_ID, 0, msg, e);
+    }
+
+    /*
+     * Returns preference store for JDT UI plug-in.
+     */
+    private IPreferenceStore getJavaPreferenceStore()
+    {
+        return new ScopedPreferenceStore(InstanceScope.INSTANCE,
+            JavaUI.ID_PLUGIN);
+    }
 }