Author: max.andersen(a)jboss.com Date: 2008-02-07 09:08:28 -0500 (Thu, 07 Feb 2008) New Revision: 6163 Modified: trunk/ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/views/ConfigurationsViewActionGroup.java Log: Merged revisions 6162 via svnmerge from https://svn.jboss.org/repos/jbosstools/branches/jbosstools-2.0.x ........ r6162 | max.andersen(a)jboss.com | 2008-02-07 15:01:12 +0100 (Thu, 07 Feb 2008) | 1 line JBIDE-1752 broken null check ........ Property changes on: trunk ___________________________________________________________________ Name: svnmerge-integrated - /branches/jbosstools-2.0.x:1-6135 + /branches/jbosstools-2.0.x:1-6135,6162 Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/views/ConfigurationsViewActionGroup.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/views/ConfigurationsViewActionGroup.java 2008-02-07 14:01:12 UTC (rev 6162) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/views/ConfigurationsViewActionGroup.java 2008-02-07 14:08:28 UTC (rev 6163) @@ -138,8 +138,8 @@ menu.add(schemaExportAction); } menu.add(new Separator() ); - if (first instanceof PersistentClass - || first.getClass() == Property.class){ + // TODO: shouldn't these and maybe the others not be defined via menu extension points ? + if (first != null && (first instanceof PersistentClass || first.getClass() == Property.class)) { menu.add(openSourceAction); menu.add(openMappingAction); }