Author: dazarov Date: 2008-09-12 07:16:53 -0400 (Fri, 12 Sep 2008) New Revision: 10220 Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/PageEditPart.java trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/ViewIDEditManager.java trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/PageFigure.java Log: https://jira.jboss.org/jira/browse/JBIDE-2737 Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/PageEditPart.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/PageEditPart.java 2008-09-12 10:20:06 UTC (rev 10219) +++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/PageEditPart.java 2008-09-12 11:16:53 UTC (rev 10220) @@ -205,8 +205,13 @@ if (getPageModel().getOutputLinks().size() == 0) height = getVisualHeight() + NodeFigure.LINK_HEIGHT; + + String name = getPageModel().getName(); + + if(name == null) + name = ""; - int width = getIconWidth()+FigureUtilities.getTextExtents(getPageModel().getName(), NodeFigure.nodeLabelFont).width; + int width = getIconWidth()+FigureUtilities.getTextExtents(name, NodeFigure.nodeLabelFont).width; if(width < getMinimumWidth()) width = getMinimumWidth(); Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/ViewIDEditManager.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/ViewIDEditManager.java 2008-09-12 10:20:06 UTC (rev 10219) +++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/ViewIDEditManager.java 2008-09-12 11:16:53 UTC (rev 10220) @@ -166,10 +166,12 @@ protected void initCellEditor() { NodeFigure figure = (NodeFigure) getEditPart().getFigure(); - if (figure instanceof PageFigure) + if (figure instanceof PageFigure && ((PageFigure) figure).page.getName() != null) getCellEditor().setValue(((PageFigure) figure).page.getName()); - else if (figure instanceof ExceptionFigure) + else if (figure instanceof ExceptionFigure && ((ExceptionFigure) figure).exc.getName() != null) getCellEditor().setValue(((ExceptionFigure) figure).exc.getName()); + else + getCellEditor().setValue(""); ZoomManager zoomMgr = (ZoomManager) getEditPart().getViewer() .getProperty(ZoomManager.class.toString()); Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/PageFigure.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/PageFigure.java 2008-09-12 10:20:06 UTC (rev 10219) +++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/PageFigure.java 2008-09-12 11:16:53 UTC (rev 10220) @@ -155,7 +155,7 @@ // pattern.dispose(); // } - if(page != null){ + if(page != null && page.getName() != null){ g.setFont(nodeLabelFont); g.drawString(page.getName(), 27, 3); }