Author: dvinnichek Date: 2010-11-04 11:36:12 -0400 (Thu, 04 Nov 2010) New Revision: 26258 Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/handlers/ShowBorderHandler.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/handlers/ShowBundleAsELHandler.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/handlers/ShowNonVisualTagsHandler.java Log: fix NPEs during studio starting (https://jira.jboss.org/browse/JBIDE-7383) Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/handlers/ShowBorderHandler.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/handlers/ShowBorderHandler.java 2010-11-04 14:44:41 UTC (rev 26257) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/handlers/ShowBorderHandler.java 2010-11-04 15:36:12 UTC (rev 26258) @@ -86,6 +86,9 @@ JSPMultiPageEditor jspEditor = (JSPMultiPageEditor) editor; VpeController vpeController = (VpeController) jspEditor .getVisualEditor().getController(); + if (vpeController == null) { + return; + } /* * Set new value to VpeVisualDomBuilder. Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/handlers/ShowBundleAsELHandler.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/handlers/ShowBundleAsELHandler.java 2010-11-04 14:44:41 UTC (rev 26257) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/handlers/ShowBundleAsELHandler.java 2010-11-04 15:36:12 UTC (rev 26258) @@ -90,6 +90,9 @@ JSPMultiPageEditor jspEditor = (JSPMultiPageEditor) editor; VpeController vpeController = (VpeController) jspEditor .getVisualEditor().getController(); + if (vpeController == null) { + return; + } /* * Update bundle messages. Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/handlers/ShowNonVisualTagsHandler.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/handlers/ShowNonVisualTagsHandler.java 2010-11-04 14:44:41 UTC (rev 26257) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/handlers/ShowNonVisualTagsHandler.java 2010-11-04 15:36:12 UTC (rev 26258) @@ -87,6 +87,9 @@ JSPMultiPageEditor jspEditor = (JSPMultiPageEditor) editor; VpeController vpeController = (VpeController) jspEditor .getVisualEditor().getController(); + if (vpeController == null) { + return; + } /* * Change flag