Author: dgolovin Date: 2012-01-31 21:31:44 -0500 (Tue, 31 Jan 2012) New Revision: 38349 Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeSourceDomBuilder.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualKeyHandler.java Log: code clean up, nul check is removed where it is not required Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java 2012-02-01 02:27:33 UTC (rev 38348) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java 2012-02-01 02:31:44 UTC (rev 38349) @@ -1431,7 +1431,7 @@ public IPath getPath() { if (editPart != null) { IEditorInput input = editPart.getEditorInput(); - if (input != null && input instanceof IFileEditorInput) { + if (input instanceof IFileEditorInput) { return ((IFileEditorInput) input).getFile().getFullPath(); } } Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeSourceDomBuilder.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeSourceDomBuilder.java 2012-02-01 02:27:33 UTC (rev 38348) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeSourceDomBuilder.java 2012-02-01 02:31:44 UTC (rev 38349) @@ -156,7 +156,7 @@ private boolean openOnOnVisualNode(nsIDOMNode visualNode) { VpeNodeMapping nodeMapping = VpeNodesManagingUtil.getNodeMapping( this.domMapping, visualNode); - if (nodeMapping != null && nodeMapping instanceof VpeElementMapping) { + if (nodeMapping instanceof VpeElementMapping) { VpeElementMapping elementMapping = (VpeElementMapping) nodeMapping; VpeTemplate template = elementMapping.getTemplate(); Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java 2012-02-01 02:27:33 UTC (rev 38348) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java 2012-02-01 02:31:44 UTC (rev 38349) @@ -886,7 +886,7 @@ } else { VpeNodeMapping nodeMapping = domMapping .getNodeMapping(sourceParent); - if (nodeMapping != null && nodeMapping instanceof VpeElementMapping) { + if (nodeMapping instanceof VpeElementMapping) { VpeTemplate template = ((VpeElementMapping) nodeMapping) .getTemplate(); if (template != null) { @@ -1302,7 +1302,7 @@ nsIDOMNode visualParent = visualDropContainer.getParentNode(); VpeNodeMapping oldMapping = mapping; mapping = domMapping.getNearNodeMapping(visualParent); - if (mapping != null && mapping instanceof VpeElementMapping) { + if (mapping instanceof VpeElementMapping) { ((VpeElementMapping) mapping).getTemplate().innerDrop( pageContext, new VpeSourceInnerDragInfo(dragNode, 0, 0), Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualKeyHandler.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualKeyHandler.java 2012-02-01 02:27:33 UTC (rev 38348) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualKeyHandler.java 2012-02-01 02:31:44 UTC (rev 38349) @@ -1064,7 +1064,7 @@ VpeNodeMapping parentMapping = domMapping.getNearParentMapping(focusNode); if (parentMapping != null) { boolean handled = false; - while (!handled && parentMapping != null && parentMapping instanceof VpeElementMapping) { + while (!handled && parentMapping instanceof VpeElementMapping) { VpeTemplate template = ((VpeElementMapping)parentMapping).getTemplate(); Node srcNode = parentMapping.getSourceNode(); nsIDOMNode visualNode = parentMapping.getVisualNode(); @@ -1127,7 +1127,7 @@ VpeNodeMapping parentMapping = domMapping.getNearParentMapping(focusNode); if (parentMapping != null) { boolean handled = false; - while (!handled && parentMapping != null && parentMapping instanceof VpeElementMapping) { + while (!handled && parentMapping instanceof VpeElementMapping) { VpeTemplate template = ((VpeElementMapping)parentMapping).getTemplate(); Node srcNode = parentMapping.getSourceNode(); nsIDOMNode visualNode = parentMapping.getVisualNode(); @@ -1262,7 +1262,7 @@ private void goToParentTemplate(Node node, SourceSelection selection, long keyCode) { ITextFormatter formatter = null; VpeNodeMapping nearNodeMapping = domMapping.getNearParentMapping(node); - if (nearNodeMapping != null && nearNodeMapping instanceof VpeElementMapping) { + if (nearNodeMapping instanceof VpeElementMapping) { VpeTemplate template = ((VpeElementMapping)nearNodeMapping).getTemplate(); if (template != null) { Node sourceNode = nearNodeMapping.getSourceNode();