Author: dgolovin Date: 2011-08-19 18:42:38 -0400 (Fri, 19 Aug 2011) New Revision: 34104 Modified: trunk/vpe/plugins/org.jboss.tools.vpe.ui.palette/src/org/jboss/tools/vpe/ui/palette/model/PaletteCategory.java trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/editor/VpeResizerMouseMotionListener.java trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/editor/XulRunnerEditor.java 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/VpeVisualDomBuilder.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/SelectionManager.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAbstractTemplate.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplate.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateSet.java trunk/vpe/tests/org.jboss.tools.vpe.html.test/src/org/jboss/tools/vpe/html/test/HtmlTestPlugin.java trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/ProjectsLoader.java Log: code cleanup: 1. Null checks removed where possible 2. Code style and complexity fixes 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 2011-08-19 22:40:34 UTC (rev 34103) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java 2011-08-19 22:42:38 UTC (rev 34104) @@ -662,7 +662,7 @@ sourceChangeFlag = true; int type = ((Node) notifier).getNodeType(); visualEditor.hideResizer(); - visualBuilder.setSelectionRectangle(null); + visualBuilder.setSelectionRectangle(SelectionManager.EMPTY_SELECTION); if (type == Node.CDATA_SECTION_NODE) { visualBuilder.setCdataText((Node) notifier); } else if (type == Node.TEXT_NODE) { @@ -1599,7 +1599,7 @@ visualEditor.reload(); } else { // Fix bugs JBIDE-2750 - visualBuilder.setSelectionRectangle(null); + visualBuilder.setSelectionRectangle(SelectionManager.EMPTY_SELECTION); visualEditor.reload(); // IDOMModel sourceModel = (IDOMModel) getModel(); // if (sourceModel != null) { @@ -1702,15 +1702,12 @@ } public boolean startActiveEditor(int newType) { - if (type == ACTIVE_EDITOR_NONE) { - if (newType == ACTIVE_EDITOR_SOURCE - && editPart.getVisualMode() == VpeEditorPart.SOURCE_MODE) { - return false; - } + if (type != ACTIVE_EDITOR_NONE || type == ACTIVE_EDITOR_NONE && newType == ACTIVE_EDITOR_SOURCE + && editPart.getVisualMode() == VpeEditorPart.SOURCE_MODE) { + return false; + } else { type = newType; return true; - } else { - return false; } } @@ -2442,7 +2439,7 @@ // node is created, see JBIDE-5105 visualEditor.reinitDesignMode(); - visualBuilder.setSelectionRectangle(null); + visualBuilder.setSelectionRectangle(SelectionManager.EMPTY_SELECTION); IDOMModel sourceModel = (IDOMModel) getModel(); if (sourceModel != null) { IDOMDocument sourceDocument = sourceModel.getDocument(); 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 2011-08-19 22:40:34 UTC (rev 34103) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java 2011-08-19 22:42:38 UTC (rev 34104) @@ -1078,7 +1078,7 @@ public void setSelectionRectangle(/* nsIDOMElement */List<nsIDOMNode> visualNodes) { int resizerConstrains = VpeTagDescription.RESIZE_CONSTRAINS_NONE; - if(visualNodes!=null&&visualNodes.size()==1){ + if(visualNodes.size()==1){ resizerConstrains = getResizerConstrains(visualNodes.get(0)); } visualEditor.setSelectionRectangle(visualNodes, resizerConstrains); Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/SelectionManager.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/SelectionManager.java 2011-08-19 22:40:34 UTC (rev 34103) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/SelectionManager.java 2011-08-19 22:42:38 UTC (rev 34104) @@ -12,6 +12,7 @@ package org.jboss.tools.vpe.editor.template; import java.util.ArrayList; +import java.util.Collections; import java.util.List; import org.eclipse.swt.graphics.Point; @@ -38,7 +39,8 @@ * */ public class SelectionManager implements ISelectionManager { - + + public static final List<nsIDOMNode> EMPTY_SELECTION = Collections.unmodifiableList(new ArrayList<nsIDOMNode>(0)); /** * pageContext keeps information about page */ @@ -179,8 +181,7 @@ targetVisualNodes.add(nodeMapping.getVisualNode()); } } - getPageContext().getVisualBuilder().setSelectionRectangle( - targetVisualNodes); + getPageContext().getVisualBuilder().setSelectionRectangle(targetVisualNodes); } /** Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAbstractTemplate.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAbstractTemplate.java 2011-08-19 22:40:34 UTC (rev 34103) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAbstractTemplate.java 2011-08-19 22:42:38 UTC (rev 34104) @@ -26,8 +26,8 @@ import org.jboss.tools.jst.jsp.util.NodesManagingUtil; import org.jboss.tools.vpe.VpePlugin; import org.jboss.tools.vpe.dnd.VpeDnDHelper; -import org.jboss.tools.vpe.editor.VpeSourceInnerDragInfo; import org.jboss.tools.vpe.editor.VpeSourceDropInfo; +import org.jboss.tools.vpe.editor.VpeSourceInnerDragInfo; import org.jboss.tools.vpe.editor.context.VpePageContext; import org.jboss.tools.vpe.editor.mapping.NodeData; import org.jboss.tools.vpe.editor.mapping.VpeDomMapping; @@ -37,8 +37,6 @@ import org.jboss.tools.vpe.editor.template.resize.VpeResizer; import org.jboss.tools.vpe.editor.template.textformating.TextFormatingData; import org.jboss.tools.vpe.editor.util.Constants; -import org.jboss.tools.vpe.editor.util.SelectionUtil; -import org.jboss.tools.vpe.editor.util.VpeNodesManagingUtil; import org.mozilla.interfaces.nsIDOMDocument; import org.mozilla.interfaces.nsIDOMElement; import org.mozilla.interfaces.nsIDOMNode; Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplate.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplate.java 2011-08-19 22:40:34 UTC (rev 34103) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplate.java 2011-08-19 22:42:38 UTC (rev 34104) @@ -14,8 +14,8 @@ import org.eclipse.swt.graphics.Point; import org.jboss.tools.jst.jsp.editor.ITextFormatter; import org.jboss.tools.jst.jsp.selection.SourceSelection; +import org.jboss.tools.vpe.editor.VpeSourceDropInfo; import org.jboss.tools.vpe.editor.VpeSourceInnerDragInfo; -import org.jboss.tools.vpe.editor.VpeSourceDropInfo; import org.jboss.tools.vpe.editor.context.VpePageContext; import org.jboss.tools.vpe.editor.mapping.NodeData; import org.jboss.tools.vpe.editor.mapping.VpeDomMapping; @@ -430,9 +430,9 @@ boolean containsText(); - public boolean canModify(); + boolean canModify(); - public void setModify(boolean modify); + void setModify(boolean modify); /** * @@ -441,7 +441,7 @@ * @param domMapping * @return */ - public NodeData getNodeData(nsIDOMNode node, VpeElementData elementData, + NodeData getNodeData(nsIDOMNode node, VpeElementData elementData, VpeDomMapping domMapping); /** @@ -451,11 +451,11 @@ * @param domMapping * @return */ - public nsIDOMNode getVisualNodeBySourcePosition( + nsIDOMNode getVisualNodeBySourcePosition( VpeElementMapping elementMapping, Point selectionRange, VpeDomMapping domMapping); - public boolean isInvisible(); + boolean isInvisible(); /** * Calculates and returns sourceRegion, on which we should @@ -464,10 +464,18 @@ * @param domNode * @return sourceRegion on which we should make openOn action */ - public IRegion getSourceRegionForOpenOn(VpePageContext pageContext, Node sourceNode,nsIDOMNode domNode); + IRegion getSourceRegionForOpenOn(VpePageContext pageContext, Node sourceNode,nsIDOMNode domNode); - public double getPriority(); + /** + * + * @return + */ + double getPriority(); - public void setPriority(double priority); - + /** + * + * @param priority + */ + void setPriority(double priority); + } \ No newline at end of file Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateSet.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateSet.java 2011-08-19 22:40:34 UTC (rev 34103) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateSet.java 2011-08-19 22:42:38 UTC (rev 34104) @@ -41,8 +41,8 @@ VpeTemplate getTemplate(VpePageContext pageContext, Node sourceNode, Set ifDependencySet) { VpeTemplate result = defTemplate; boolean initializeCustomTemplate = true; - for (int i = 0; i < templates.size(); i++) { - VpeTemplateSet set = (VpeTemplateSet)templates.get(i); + + for (VpeTemplateSet set : templates) { VpeTemplate template = set.getTemplate(pageContext, sourceNode, ifDependencySet); if (template != null) { if (result == null) { Modified: trunk/vpe/plugins/org.jboss.tools.vpe.ui.palette/src/org/jboss/tools/vpe/ui/palette/model/PaletteCategory.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.ui.palette/src/org/jboss/tools/vpe/ui/palette/model/PaletteCategory.java 2011-08-19 22:40:34 UTC (rev 34103) +++ trunk/vpe/plugins/org.jboss.tools.vpe.ui.palette/src/org/jboss/tools/vpe/ui/palette/model/PaletteCategory.java 2011-08-19 22:42:38 UTC (rev 34104) @@ -21,8 +21,6 @@ public class PaletteCategory extends PaletteDrawer implements PaletteXModelObject { private XModelObject xobject; -/// private String[] natureTypes; -/// private String[] editorTypes; public PaletteCategory(XModelObject xobject, boolean open) { super(null); @@ -47,32 +45,6 @@ p = p.getParent(); } setLabel(label); -/// natureTypes = getTypes("nature type"); -/// editorTypes = getTypes("editor type"); } -/* - public String[] getNatureTypes() { - return natureTypes; - } - - public String[] getEditorTypes() { - return editorTypes; - } -*/ - private String[] getTypes(String name) { - String attr = xobject.getAttributeValue(name); - if (attr == null) { - return null; - } - StringTokenizer st = new StringTokenizer(attr, ";"); //$NON-NLS-1$ - List attrs = new ArrayList(); - while (st.hasMoreTokens()) { - attrs.add(st.nextToken()); - } - if (attrs.size() <= 0) { - return null; - } - return (String[])attrs.toArray(new String[attrs.size()]); - } } Modified: trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/editor/VpeResizerMouseMotionListener.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/editor/VpeResizerMouseMotionListener.java 2011-08-19 22:40:34 UTC (rev 34103) +++ trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/editor/VpeResizerMouseMotionListener.java 2011-08-19 22:42:38 UTC (rev 34104) @@ -40,14 +40,12 @@ public void mouseMove(nsIDOMEvent event) { nsIDOMMouseEvent mouseEvent = XPCOM.queryInterface(event, nsIDOMMouseEvent.class); - if ( mouseEvent == null ) { - return; + if ( mouseEvent != null ) { + vpeResizer.mouseMove(mouseEvent); } - vpeResizer.mouseMove(mouseEvent); } public void dragMove(nsIDOMEvent event) { - } public void handleEvent(nsIDOMEvent event) { Modified: trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/editor/XulRunnerEditor.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/editor/XulRunnerEditor.java 2011-08-19 22:40:34 UTC (rev 34103) +++ trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/editor/XulRunnerEditor.java 2011-08-19 22:42:38 UTC (rev 34104) @@ -267,26 +267,23 @@ * @param scroll */ public void setSelectionRectangle(List<nsIDOMNode> nodes, int resizerConstrains) { - if (getFlasher() == null) { - return; - } + getFlasher(); this.selectedNodes = nodes; - nsIDOMElement element = getSelectedElement(); - if (element != null) { - repaint(); - scrollToElement(element); - } - redrawSelectionRectangle(); + nsIDOMElement element = getSelectedElement(); + if (element != null) { + repaint(); + scrollToElement(element); + } + redrawSelectionRectangle(); - if (xulRunnerVpeResizer != null) { - if (element != null && resizerConstrains != 0) { - xulRunnerVpeResizer.show(element, resizerConstrains); - } else { - xulRunnerVpeResizer.hide(); - } + if (xulRunnerVpeResizer != null) { + if (element != null && resizerConstrains != 0) { + xulRunnerVpeResizer.show(element, resizerConstrains); + } else { + xulRunnerVpeResizer.hide(); } - + } lastResizerConstrains = resizerConstrains; Modified: trunk/vpe/tests/org.jboss.tools.vpe.html.test/src/org/jboss/tools/vpe/html/test/HtmlTestPlugin.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.html.test/src/org/jboss/tools/vpe/html/test/HtmlTestPlugin.java 2011-08-19 22:40:34 UTC (rev 34103) +++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/src/org/jboss/tools/vpe/html/test/HtmlTestPlugin.java 2011-08-19 22:42:38 UTC (rev 34104) @@ -64,16 +64,4 @@ return plugin; } - public static String getPluginResourcePath() { - Bundle bundle = Platform.getBundle(PLUGIN_ID); - URL url = null; - try { - url = bundle == null ? null : FileLocator.resolve(bundle - .getEntry("/resources")); // $NON-NLS-1$ - } catch (Exception e) { - url = bundle.getEntry("/resources"); // $NON-NLS-1$ - } - return (url == null) ? null : url.getPath(); - } - } Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/ProjectsLoader.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/ProjectsLoader.java 2011-08-19 22:40:34 UTC (rev 34103) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/ProjectsLoader.java 2011-08-19 22:42:38 UTC (rev 34104) @@ -96,7 +96,7 @@ public IProject getProject(String projectName) throws IOException { IProject project = getExistingProject(projectName); - if (project == null) { + if (!project.isAccessible()) { ProjectLocation location = projectNameToLocation.get(projectName); if (location == null) { throw new RuntimeException( @@ -115,10 +115,6 @@ throw new RuntimeException("Project by the path='" + location.getPath() + "' cannot be imported.",e); } - if (project == null) { - throw new RuntimeException("Project by the path='" + location.getPath() - + "' cannot be imported."); - } } return project; @@ -129,13 +125,8 @@ * if there is no project with this name in the workspace. */ public static IProject getExistingProject(String projectName) { - IProject project = ResourcesPlugin.getWorkspace().getRoot() + return ResourcesPlugin.getWorkspace().getRoot() .getProject(projectName); - if (project.isAccessible()) { - return project; - } else { - return null; - } } /**