Author: vyemialyanchyk Date: 2009-04-07 09:00:21 -0400 (Tue, 07 Apr 2009) New Revision: 14565 Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/HibernateJptUIPlugin.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/xpl/AddRemoveListPane.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/xpl/PersistenceUnitClassesComposite.java Log: JBIDE-4137 Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/HibernateJptUIPlugin.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/HibernateJptUIPlugin.java 2009-04-07 12:59:51 UTC (rev 14564) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/HibernateJptUIPlugin.java 2009-04-07 13:00:21 UTC (rev 14565) @@ -39,7 +39,7 @@ */ public void start(BundleContext context) throws Exception { super.start(context); - plugin = this; + setPlugin(this); } /* @@ -47,7 +47,7 @@ * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext) */ public void stop(BundleContext context) throws Exception { - plugin = null; + setPlugin(null); super.stop(context); } @@ -59,6 +59,10 @@ public static HibernateJptUIPlugin getDefault() { return plugin; } + + private static void setPlugin(HibernateJptUIPlugin plugin) { + HibernateJptUIPlugin.plugin = plugin; + } /** * Log message Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/xpl/AddRemoveListPane.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/xpl/AddRemoveListPane.java 2009-04-07 12:59:51 UTC (rev 14564) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/xpl/AddRemoveListPane.java 2009-04-07 13:00:21 UTC (rev 14565) @@ -474,7 +474,7 @@ */ protected void initializeTable(Table table) { - table.setData("column.width", new Integer(0)); + table.setData("column.width", Integer.valueOf(0)); table.setHeaderVisible(false); table.setLinesVisible(false); } Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/xpl/PersistenceUnitClassesComposite.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/xpl/PersistenceUnitClassesComposite.java 2009-04-07 12:59:51 UTC (rev 14564) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/xpl/PersistenceUnitClassesComposite.java 2009-04-07 13:00:21 UTC (rev 14565) @@ -52,7 +52,6 @@ import org.eclipse.ui.PlatformUI; import org.eclipse.ui.dialogs.SelectionDialog; import org.eclipse.ui.progress.IProgressService; -import org.jboss.tools.hibernate.jpt.ui.HibernateJptUIPlugin; import org.jboss.tools.hibernate.jpt.ui.xpl.AddRemovePane.Adapter; /**