Author: mareshkau Date: 2009-06-23 13:13:26 -0400 (Tue, 23 Jun 2009) New Revision: 16148 Modified: trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/browser/XulRunnerBrowser.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/TextNodeSplitterImpl.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/VpeSelectionBuilder.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/VpeVisualInnerDragInfo.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualInnerDropInfo.java 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/dnd/context/xpl/DragNodeCommand2.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/BaseActionManager.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/SetupTemplateContributionItem.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/xpl/ActionHelper.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaPreview.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/preferences/VpeEditorPreferencesPage.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/selection/VpeSourceSelection.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/VpeAnyCreator.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeCreatorUtil.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeDataTableCreator.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeDataTableElements.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeDefineContainerTemplate.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeEditAnyDialog.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeHtmlTemplate.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeJspRootCreator.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeLinkCreator.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpePanelGridCreator.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateManager.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeExpressionBuilder.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/ArrowRight.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/FormatControllerManager.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/SelectionUtil.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/TextUtil.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/VisualDomUtil.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/VpeUIMessages.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/resref/VpeResourcesDialogView.java Log: Some PMD violation has been fixed Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/TextNodeSplitterImpl.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/TextNodeSplitterImpl.java 2009-06-23 16:42:30 UTC (rev 16147) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/TextNodeSplitterImpl.java 2009-06-23 17:13:26 UTC (rev 16148) @@ -75,7 +75,6 @@ if(type == INSERT_AROUND){ if(split1 && split2){ node1 = ((Text)node).splitText(offset1); - node2 = ((Text)node1).splitText(offset2); }else if(split1){ node1 = ((Text)node).splitText(offset1); }else{ 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 2009-06-23 16:42:30 UTC (rev 16147) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java 2009-06-23 17:13:26 UTC (rev 16148) @@ -1029,7 +1029,6 @@ // nsIDOMElement visualDragElement = selectionBuilder // .getDragElement(mouseEvent); if (VpeDebug.PRINT_VISUAL_MOUSE_EVENT) { - nsIDOMNode visualNode = VisualDomUtil.getTargetNode(mouseEvent); System.out.println("<<< mouseDown targetNode: " /* //$NON-NLS-1$ * +visualNode. * getNodeName() @@ -1909,7 +1908,7 @@ System.out.print("<<<<<< canInnerDrag"); //$NON-NLS-1$ } if (innerDragInfo != null) { - innerDragInfo.Release(); + innerDragInfo.release(); innerDragInfo = null; } boolean canDrag = false; @@ -1922,10 +1921,14 @@ .print(" dragNode: " + dragNode.getNodeName() + "(" + dragNode + ")"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } switch (dragNode.getNodeType()) { - case nsIDOMNode.ELEMENT_NODE: - canDrag = visualBuilder.canInnerDrag((nsIDOMElement) dragNode); - case nsIDOMNode.TEXT_NODE: + case nsIDOMNode.ELEMENT_NODE: { + canDrag = visualBuilder.canInnerDrag((nsIDOMElement) dragNode.queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID)); + break; + } + case nsIDOMNode.TEXT_NODE: { canDrag = visualBuilder.isTextEditable(dragNode); + break; + } } if (canDrag) { VpeSourceInnerDragInfo sourceInnerDragInfo = visualBuilder @@ -1943,7 +1946,7 @@ } } if (!canDrag) { - dragInfo.Release(); + dragInfo.release(); } } if (VpeDebug.PRINT_VISUAL_INNER_DRAGDROP_EVENT) { @@ -2022,7 +2025,7 @@ } } } - visualDropInfo.Release(); + visualDropInfo.release(); } if (VpeDebug.PRINT_VISUAL_INNER_DRAGDROP_EVENT) { System.out.println(" canDrop: " + canDrop); //$NON-NLS-1$ @@ -2066,7 +2069,7 @@ visualBuilder.innerDrop(sourceInnerDragInfo, sourceDropInfo); if (innerDragInfo != null) { - innerDragInfo.Release(); + innerDragInfo.release(); innerDragInfo = null; } } @@ -2155,7 +2158,7 @@ } } } - visualDropInfo.Release(); + visualDropInfo.release(); } } else if (XulRunnerEditor.TRANS_FLAVOR_kFileMime.equals(flavor) || XulRunnerEditor.TRANS_FLAVOR_kURLMime.equals(flavor)) { @@ -2222,8 +2225,7 @@ VpeVisualInnerDropInfo visualDropInfo = selectionBuilder.getInnerDropInfo(mouseEvent); Point range = selectionBuilder.getSourceSelectionRangeAtVisualNode(visualDropInfo.getDropContainer(), (int) visualDropInfo .getDropOffset()); - VpeSourceInnerDropInfo sourceDropInfo = null; - + // if (MODEL_FLAVOR.equals(flavor)) { // XModelObject object = PreferenceModelUtilities.getPreferenceModel() // .getModelBuffer().source(); @@ -2236,13 +2238,11 @@ if (VpeDndUtil.isNsIFileInstance(aValue)) { nsIFile aFile = (nsIFile) aValue.queryInterface(nsIFile.NS_IFILE_IID); - if (aValue != null) { // because it is external, convert the path to URL - final String path = aFile.getPath(); - data = path != null ? DropUtils.convertPathToUrl(path) + final String path = aFile.getPath(); + data = path != null ? DropUtils.convertPathToUrl(path) : null; - aFlavor = DndUtil.kFileMime; - } + aFlavor = DndUtil.kFileMime; } else if (VpeDndUtil.isNsICStringInstance(aValue)) { nsISupportsCString aString = (nsISupportsCString) aValue.queryInterface(nsISupportsCString.NS_ISUPPORTSCSTRING_IID); @@ -2285,11 +2285,8 @@ if (VpeDebug.PRINT_VISUAL_INNER_DRAGDROP_EVENT) { System.out.println(" drop! container: " + visualDropInfo.getDropContainer().getNodeName()); //$NON-NLS-1$ } - externalDropAny(aFlavor, data, range, sourceDropInfo == null ? null : sourceDropInfo.getContainer()); + externalDropAny(aFlavor, data, range,null); - DropContext dropContext = new DropContext(); - IDNDTextEditor textEditor = (IDNDTextEditor) VpeController.this.editPart.getSourceEditor(); - // TypedEvent tEvent = new TypedEvent(mouseEvent); // tEvent.data = data; // dropContext.setFlavor(aFlavor); Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeSelectionBuilder.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeSelectionBuilder.java 2009-06-23 16:42:30 UTC (rev 16147) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeSelectionBuilder.java 2009-06-23 17:13:26 UTC (rev 16148) @@ -323,16 +323,6 @@ sourceBuilder.setSelection(sourceNode, 0, 0); } - void setClickSelection(nsIDOMMouseEvent mouseEvent) { - nsIDOMNode visualNode = VisualDomUtil.getTargetNode(mouseEvent); - nsISelection selection = visualSelectionController.getSelection(nsISelectionController.SELECTION_NORMAL); - nsIDOMNode anchorNode = selection.getAnchorNode(); - nsIDOMNode focusNode = selection.getFocusNode(); - if (focusNode != null) { - - } - } - void _setClickContentAreaSelection() { Node sourceNode = sourceBuilder.getSelectedNode(); if (sourceNode != null) { @@ -1170,7 +1160,6 @@ return dragElement; } - nsISelection selection = visualSelectionController.getSelection(nsISelectionController.SELECTION_NORMAL); nsIDOMNode visualNode = VisualDomUtil.getTargetNode(mouseEvent); //FIX FOR JBIDE-1468 added by Sergey Dzmitrovich if (visualNode != null @@ -1294,14 +1283,14 @@ if (anchorNode != null) { System.out.println(" ## anchorNode: " + anchorNode.getNodeName() + " (" + anchorNode + ") offset: " + selection.getAnchorOffset()); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } else { - System.out.println(" ## anchorNode: " + anchorNode); //$NON-NLS-1$ + System.out.println(" ## anchorNode: null"); //$NON-NLS-1$ } } nsIDOMNode focusNode = selection.getFocusNode(); if (focusNode != null) { System.out.println(" ## focusNode: " + focusNode.getNodeName() + " (" + focusNode + ") offset: " + selection.getFocusOffset()); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } else { - System.out.println(" ## focusNode: " + focusNode); //$NON-NLS-1$ + System.out.println(" ## focusNode: null"); //$NON-NLS-1$ } } 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 2009-06-23 16:42:30 UTC (rev 16147) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeSourceDomBuilder.java 2009-06-23 17:13:26 UTC (rev 16148) @@ -376,7 +376,6 @@ // } //Added by Max Areshkau in scope of bug JBIDE-1209 } else { - IndexedRegion region = (IndexedRegion)sourceParent; String text = sourceParent.getNodeValue(); int start= TextUtil.sourcePosition(text, visualText.getNodeValue(), offset); int end =TextUtil.sourcePosition(text, visualText.getNodeValue(), offset+length); 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 2009-06-23 16:42:30 UTC (rev 16147) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java 2009-06-23 17:13:26 UTC (rev 16148) @@ -381,7 +381,7 @@ } border.appendChild(visualNode); } - if (VpeStyleUtil.getAbsolute((Element) sourceNode) && border != null) { + if (VpeStyleUtil.getAbsolute((Element) sourceNode)) { int top = VpeStyleUtil.getSizeFromStyle((Element) sourceNode, VpeStyleUtil.ATTRIBUTE_STYLE + VpeStyleUtil.DOT_STRING + VpeStyleUtil.PARAMETER_TOP); @@ -1873,26 +1873,7 @@ } } } - - private void resetTooltip(Element sourceElement, nsIDOMElement visualElement) { - if (visualElement != null && sourceElement != null - && !((ElementImpl) sourceElement).isJSPTag()) { - if (HTML.TAG_HTML.equalsIgnoreCase(sourceElement.getNodeName())) - return; - String titleValue = getTooltip(sourceElement); - - if (titleValue != null) { - titleValue = titleValue.replaceAll("&", "&amp;"); //$NON-NLS-1$//$NON-NLS-2$ - titleValue = titleValue.replaceAll("<", "&lt;"); //$NON-NLS-1$//$NON-NLS-2$ - titleValue = titleValue.replaceAll(">", "&gt;"); //$NON-NLS-1$//$NON-NLS-2$ - } - - if (titleValue != null) { - resetTooltip(visualElement, titleValue); - } - } - } - + private void resetTooltip(nsIDOMElement visualElement, String titleValue) { visualElement.setAttribute(HTML.ATTR_TITLE, titleValue); nsIDOMNodeList children = visualElement.getChildNodes(); Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualInnerDragInfo.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualInnerDragInfo.java 2009-06-23 16:42:30 UTC (rev 16147) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualInnerDragInfo.java 2009-06-23 17:13:26 UTC (rev 16148) @@ -40,9 +40,7 @@ return length; } - public void Release() { - if (node != null) { + public void release() { node = null; - } } } Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualInnerDropInfo.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualInnerDropInfo.java 2009-06-23 16:42:30 UTC (rev 16147) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualInnerDropInfo.java 2009-06-23 17:13:26 UTC (rev 16148) @@ -45,9 +45,7 @@ return mouseY; } - public void Release() { - if (dropContainer != null) { + public void release() { dropContainer = null; - } } } 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 2009-06-23 16:42:30 UTC (rev 16147) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualKeyHandler.java 2009-06-23 17:13:26 UTC (rev 16148) @@ -1136,9 +1136,6 @@ Node focusNode = selection.getFocusNode(); - int formatStart = 0; - formatStart = ((IDOMNode)focusNode).getStartOffset(); - VpeNodeMapping parentMapping = domMapping.getNearParentMapping(focusNode); if (parentMapping != null) { boolean handled = false; @@ -1587,13 +1584,6 @@ // frameSelection.intraLineMove(true, extend); return true; } - - private boolean moveLeft(boolean extend) { - // TODO Max Areshkau figure out - VpePlugin.getDefault().logInfo("MoveLeft"); -// frameSelection.characterMove(false, extend); - return true; - } /** * @param currentNode - node from which we will be look nearest node Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/dnd/context/xpl/DragNodeCommand2.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/dnd/context/xpl/DragNodeCommand2.java 2009-06-23 16:42:30 UTC (rev 16147) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/dnd/context/xpl/DragNodeCommand2.java 2009-06-23 17:13:26 UTC (rev 16148) @@ -51,7 +51,7 @@ protected void beginModelChange(Node node, boolean batchUpdate) { IStructuredModel structuredModel = getStructuredModel(node); if (structuredModel != null) { - String undoDesc = new String(); + String undoDesc = ""; //$NON-NLS-1$ if (getOperation() == DND.DROP_MOVE) { undoDesc = XMLUIMessages.DragNodeCommand_0; } else if (getOperation() == DND.DROP_COPY) { @@ -59,9 +59,6 @@ } structuredModel.beginRecording(this, undoDesc); - if (batchUpdate) { - // structuredModel.aboutToChangeModel(); - } } } Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/BaseActionManager.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/BaseActionManager.java 2009-06-23 16:42:30 UTC (rev 16147) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/BaseActionManager.java 2009-06-23 17:13:26 UTC (rev 16148) @@ -544,14 +544,14 @@ static HashSet noContainerTags = new HashSet(); static { - noContainerTags.add(new String("basefont")); - noContainerTags.add(new String("bgsound")); - noContainerTags.add(new String("br")); - noContainerTags.add(new String("img")); - noContainerTags.add(new String("input")); - noContainerTags.add(new String("isindex")); - noContainerTags.add(new String("script")); - noContainerTags.add(new String("wbr")); + noContainerTags.add("basefont"); + noContainerTags.add("bgsound"); + noContainerTags.add("br"); + noContainerTags.add("img"); + noContainerTags.add("input"); + noContainerTags.add("isindex"); + noContainerTags.add("script"); + noContainerTags.add("wbr"); } public class ActionHelper extends ModelQueryActionHelper { Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/SetupTemplateContributionItem.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/SetupTemplateContributionItem.java 2009-06-23 16:42:30 UTC (rev 16147) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/SetupTemplateContributionItem.java 2009-06-23 17:13:26 UTC (rev 16148) @@ -73,7 +73,6 @@ element.getNodeName())); getAction().setActionNode(element); getAction().setData(elementMapping.getTemplate().getAnyData()); - MenuItem item = new MenuItem(menu, SWT.SEPARATOR, index ); super.fill(menu, index+1); } } Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/xpl/ActionHelper.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/xpl/ActionHelper.java 2009-06-23 16:42:30 UTC (rev 16147) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/xpl/ActionHelper.java 2009-06-23 17:13:26 UTC (rev 16148) @@ -138,9 +138,6 @@ CMElementDeclaration ed, int index, int includeOptions, int validityChecking, List actionList) { // get actions for each insertable attribute - int size = parent.getChildNodes().getLength(); - List contentSpecificationList = modelQuery.getValidator() - .createContentSpecificationList(parent, ed); List availableChildNodeList = modelQuery.getAvailableContent(parent, ed, includeOptions); @@ -180,8 +177,6 @@ CMElementDeclaration ed, int includeOptions, int validityChecking, List actionList) { int size = parent.getChildNodes().getLength(); - List contentSpecificationList = modelQuery.getValidator() - .createContentSpecificationList(parent, ed); List availableChildNodeList = modelQuery.getAvailableContent(parent, ed, includeOptions); @@ -317,7 +312,6 @@ List selectedNodeList) { boolean result = true; NodeList nodeList = parent.getChildNodes(); - int nodeListLength = nodeList.getLength(); for (int i = range[0]; i < range[1]; i++) { Node node = nodeList.item(i); if (!isWhitespaceNode(node) && !selectedNodeList.contains(node)) { Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaPreview.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaPreview.java 2009-06-23 16:42:30 UTC (rev 16147) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaPreview.java 2009-06-23 17:13:26 UTC (rev 16148) @@ -247,7 +247,7 @@ @Override public MozillaDomEventListener getContentAreaEventListener() { - if(this.contentAreaEventListener==null||!(contentAreaEventListener instanceof PreviewDomEventListener)){ + if(this.contentAreaEventListener==null){ contentAreaEventListener = new PreviewDomEventListener(); } Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/preferences/VpeEditorPreferencesPage.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/preferences/VpeEditorPreferencesPage.java 2009-06-23 16:42:30 UTC (rev 16147) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/preferences/VpeEditorPreferencesPage.java 2009-06-23 17:13:26 UTC (rev 16148) @@ -33,7 +33,6 @@ public static void openPreferenceDialog() { - Preferences preferences = VpePlugin.getDefault().getPluginPreferences(); PreferenceDialog prefsdlg = PreferencesUtil.createPreferenceDialogOn( PlatformUI.getWorkbench().getDisplay().getActiveShell(), ID, new String[] { Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/selection/VpeSourceSelection.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/selection/VpeSourceSelection.java 2009-06-23 16:42:30 UTC (rev 16147) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/selection/VpeSourceSelection.java 2009-06-23 17:13:26 UTC (rev 16148) @@ -24,8 +24,6 @@ private Node endNode; private int endOffset; private List selectedNodes; - private Node focusNode; - private int focusOffset; private Attr focusAttribute; private Point focusAttributeRange; 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 2009-06-23 16:42:30 UTC (rev 16147) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/SelectionManager.java 2009-06-23 17:13:26 UTC (rev 16148) @@ -274,9 +274,6 @@ Point range = SelectionUtil .getSourceSelectionRange(getSourceEditor()); - ISelection selection = getSourceEditor().getTextViewer() - .getSelection(); - if (range == null) return; Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAnyCreator.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAnyCreator.java 2009-06-23 16:42:30 UTC (rev 16147) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAnyCreator.java 2009-06-23 17:13:26 UTC (rev 16148) @@ -57,7 +57,6 @@ private String valueStr; private String styleStr; private boolean showIconBool; - private boolean children; VpeAnyCreator(Element element, VpeDependencyMap dependencyMap, boolean caseSensitive) { build(element, dependencyMap); Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeCreatorUtil.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeCreatorUtil.java 2009-06-23 16:42:30 UTC (rev 16147) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeCreatorUtil.java 2009-06-23 17:13:26 UTC (rev 16148) @@ -96,7 +96,7 @@ pageName = ((Element)includeNode).getAttribute("file"); } if (pageName != null) { - IDOMModel wtpModel = wtpModel = getWtpModelForRead(pageName, pageContext); + IDOMModel wtpModel = getWtpModelForRead(pageName, pageContext); if (wtpModel != null) { return wtpModel.getDocument(); } Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeDataTableCreator.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeDataTableCreator.java 2009-06-23 16:42:30 UTC (rev 16147) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeDataTableCreator.java 2009-06-23 17:13:26 UTC (rev 16148) @@ -11,6 +11,8 @@ package org.jboss.tools.vpe.editor.template; import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; import java.util.List; import java.util.Map; @@ -555,7 +557,7 @@ if (value != null) { return value.split(","); //$NON-NLS-1$ } - return null; + return new String[0]; } private void setCellsClass(nsIDOMElement row, String value) { Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeDataTableElements.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeDataTableElements.java 2009-06-23 16:42:30 UTC (rev 16147) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeDataTableElements.java 2009-06-23 17:13:26 UTC (rev 16148) @@ -268,7 +268,6 @@ public static class VisualDataTableElements { private nsIDOMElement caption; - private nsIDOMElement tableCaptionTag; private nsIDOMElement tableHeader; private nsIDOMElement tableHeaderRow; Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeDefineContainerTemplate.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeDefineContainerTemplate.java 2009-06-23 16:42:30 UTC (rev 16147) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeDefineContainerTemplate.java 2009-06-23 17:13:26 UTC (rev 16148) @@ -174,8 +174,6 @@ int lastPos = 0; StringBuilder sb = new StringBuilder(); - lastPos = 0; - sb = new StringBuilder(); curlyBracketMatcher.reset(nodeValue); boolean firstFind = false; boolean find = curlyBracketMatcher.find(); Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeEditAnyDialog.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeEditAnyDialog.java 2009-06-23 16:42:30 UTC (rev 16147) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeEditAnyDialog.java 2009-06-23 17:13:26 UTC (rev 16148) @@ -205,10 +205,6 @@ return data.isChanged() || isChanged; } - private boolean isChanged(VpeAnyData data, boolean oldValue, boolean newValue) { - return data.isChanged() || (oldValue != newValue); - } - /** * Sets the message for this dialog with an indication of what type of * message it is. Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeHtmlTemplate.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeHtmlTemplate.java 2009-06-23 16:42:30 UTC (rev 16147) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeHtmlTemplate.java 2009-06-23 17:13:26 UTC (rev 16148) @@ -335,8 +335,6 @@ private static final String PREFIX_SEPARATOR = ":"; private String getPageLocale(VpePageContext pageContext, IDOMElement sourceElement) { - IStructuredModel model = null; - try { List<TaglibData> taglibs = pageContext.getTagLibs(sourceElement); // Find F tracker @@ -371,9 +369,6 @@ String locale = jsfCoreViewTag.getAttribute(LOCALE_ATTRNAME); if (locale == null || locale.length() == 0) return null; return locale; - } finally { - if (model != null) model.releaseFromRead(); - } } /** * Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeJspRootCreator.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeJspRootCreator.java 2009-06-23 16:42:30 UTC (rev 16147) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeJspRootCreator.java 2009-06-23 17:13:26 UTC (rev 16148) @@ -10,20 +10,13 @@ ******************************************************************************/ package org.jboss.tools.vpe.editor.template; -import java.util.ArrayList; import java.util.List; import java.util.Map; - -import org.w3c.dom.Attr; -import org.w3c.dom.Document; -import org.w3c.dom.Element; -import org.w3c.dom.NamedNodeMap; -import org.w3c.dom.Node; - import org.jboss.tools.vpe.editor.context.VpePageContext; -import org.jboss.tools.vpe.editor.template.expression.VpeExpressionBuilder; import org.mozilla.interfaces.nsIDOMDocument; import org.mozilla.interfaces.nsIDOMElement; +import org.w3c.dom.Element; +import org.w3c.dom.Node; public class VpeJspRootCreator extends VpeAbstractCreator { private static final String ATTR_PREFIX = "xmlns:"; @@ -42,18 +35,6 @@ // setTaglib(pageContext, (Element)sourceNode); return null; } - - public void setAttribute(VpePageContext pageContext, Element sourceElement, Map visualNodeMap, String name, String value) { -// setTaglib(pageContext, sourceElement); - } - - public void removeAttribute(VpePageContext pageContext, Element sourceElement, Map visualNodeMap, String name) { - int address = getAddress(name); -// if (address > 0) { -// pageContext.setTaglib(address, null, null, true); -// } -// setTaglib(pageContext, sourceElement); - } // private void setTaglib(VpePageContext pageContext, Element sourceElement) { // attrs = new ArrayList(); Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeLinkCreator.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeLinkCreator.java 2009-06-23 16:42:30 UTC (rev 16147) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeLinkCreator.java 2009-06-23 17:13:26 UTC (rev 16148) @@ -70,7 +70,6 @@ @Override public VpeCreatorInfo create(VpePageContext pageContext, Node sourceNode, nsIDOMDocument visualDocument, nsIDOMElement visualElement, Map visualNodeMap) { String href_value = getExprValue(pageContext, hrefExpr, sourceNode); - String rel_value = getExprValue(pageContext, relExpr, sourceNode); nsIDOMNode newNode = pageContext.getVisualBuilder().addLinkNodeToHead(href_value, "no", false); visualNodeMap.put(this, newNode); @@ -88,7 +87,6 @@ public void refreshElement(VpePageContext pageContext, Element sourceElement, Map visualNodeMap) { String href_value = getExprValue(pageContext, hrefExpr, sourceElement); - String rel_value = getExprValue(pageContext, relExpr, sourceElement); nsIDOMNode oldNode = (nsIDOMNode)visualNodeMap.get(this); nsIDOMNode newNode; Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpePanelGridCreator.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpePanelGridCreator.java 2009-06-23 16:42:30 UTC (rev 16147) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpePanelGridCreator.java 2009-06-23 17:13:26 UTC (rev 16148) @@ -58,8 +58,6 @@ private void build(Element gridElement, VpeDependencyMap dependencyMap) { - NamedNodeMap map = gridElement.getAttributes(); - Attr tableSizeAttr = gridElement .getAttributeNode(VpeTemplateManager.ATTR_PANELGRID_TABLE_SIZE); if (tableSizeAttr != null) { @@ -242,8 +240,8 @@ Node node = children.item(i); int type = node.getNodeType(); if ((type == Node.ELEMENT_NODE) - || ((type == Node.TEXT_NODE) && (node != null) - && (node.getNodeValue() != null) + || ((type == Node.TEXT_NODE) + && (node.getNodeValue() != null) && (node.getNodeValue().trim().length() > 0))) { switch (VpeCreatorUtil.getFacetType(node, pageContext)) { case VpeCreatorUtil.FACET_TYPE_HEADER: Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateManager.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateManager.java 2009-06-23 16:42:30 UTC (rev 16147) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateManager.java 2009-06-23 17:13:26 UTC (rev 16148) @@ -938,8 +938,6 @@ .getAttribute(VpeTemplateManager.ATTR_TEMPLATE_CLASS); String nameSpaceIdentifyer = templateElement .getAttribute(VpeTemplateManager.NAMESPACE_IDENTIFIER_ATTRIBUTE); - String isInvisibleTemplate = templateElement - .getAttribute(VpeTemplateManager.ATTR_TEMPLATE_INVISIBLE); if (templateClassName != null && templateClassName.length() > 0) { try { Bundle bundle; Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeExpressionBuilder.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeExpressionBuilder.java 2009-06-23 16:42:30 UTC (rev 16147) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeExpressionBuilder.java 2009-06-23 17:13:26 UTC (rev 16148) @@ -315,9 +315,7 @@ throw new VpeExpressionBuilderException(originalText, message, pos); } - private void error(String message) throws VpeExpressionBuilderException { - error(message, currentPosition()); - } + private void undefinedCharacter(int pos) throws VpeExpressionBuilderException { error("Undefined character \'" + originalText.charAt(pos) + '\'', pos); Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/ArrowRight.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/ArrowRight.java 2009-06-23 16:42:30 UTC (rev 16147) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/ArrowRight.java 2009-06-23 17:13:26 UTC (rev 16148) @@ -34,10 +34,8 @@ void paintControl(PaintEvent e) { GC gc = e.gc; - int x = 1; if (image != null) { - gc.drawImage(image, x, 1); - x = image.getBounds().width + 5; + gc.drawImage(image, 1, 1); } } Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/FormatControllerManager.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/FormatControllerManager.java 2009-06-23 16:42:30 UTC (rev 16147) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/FormatControllerManager.java 2009-06-23 17:13:26 UTC (rev 16148) @@ -223,9 +223,6 @@ if(nodeMapping instanceof VpeElementMapping) { VpeElementMapping elementMapping = (VpeElementMapping)nodeMapping; - if(elementMapping==null) { - return null; - } VpeTemplate template = elementMapping.getTemplate(); if(template!=null) { return template.getTextFormattingData(); Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/SelectionUtil.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/SelectionUtil.java 2009-06-23 16:42:30 UTC (rev 16147) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/SelectionUtil.java 2009-06-23 17:13:26 UTC (rev 16148) @@ -280,7 +280,6 @@ public static Node getNodeBySourcePosition( StructuredTextEditor sourceEditor, int position) { - Point range = sourceEditor.getTextViewer().getSelectedRange(); IDocument document = sourceEditor.getTextViewer().getDocument(); Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/TextUtil.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/TextUtil.java 2009-06-23 16:42:30 UTC (rev 16147) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/TextUtil.java 2009-06-23 17:13:26 UTC (rev 16148) @@ -57,11 +57,11 @@ public static boolean containsKey(char key) { - return textSet.containsKey(new Character(key)); + return textSet.containsKey(key); } public static String getValue(char key) { - return (String) textSet.get(new Character(key)); + return (String) textSet.get(key); } /** @@ -217,7 +217,7 @@ int sourceIndex = 0; int visualIndex = 0; for (visualIndex = 0; visualIndex < s3.length(); visualIndex++) { - ch = new Character(s3.charAt(visualIndex)); + ch = s3.charAt(visualIndex); String value = (String) textSet.get(ch); char sourceChar = sourceText.charAt(sourceIndex); @@ -402,14 +402,11 @@ } public static boolean isWhitespace(char sourceString) { - String visualString = visualText((new Character(sourceString)) - .toString()); return SPCHARS.indexOf(sourceString) != -1; } public static boolean isWhitespaceText(String sourceString) { if (sourceString != null && sourceString.length() > 0) { - char[] chars = sourceString.toCharArray(); for (int i = 0; i < sourceString.length(); i++) { if (!TextUtil.isWhitespace(sourceString.charAt(i))) return false; Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/VisualDomUtil.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/VisualDomUtil.java 2009-06-23 16:42:30 UTC (rev 16147) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/VisualDomUtil.java 2009-06-23 17:13:26 UTC (rev 16148) @@ -160,7 +160,7 @@ String subAttributeValue) { String attributeValue = element.getAttribute(attributeName); if (attributeValue == null) { - attributeValue = new String(); + attributeValue = ""; //$NON-NLS-1$ } else {// remove old sub-attribute from the attributeValue attributeValue = VpeStyleUtil.deleteFromString(attributeValue, subAttributeName, Constants.SEMICOLON); Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/VpeUIMessages.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/VpeUIMessages.java 2009-06-23 16:42:30 UTC (rev 16147) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/VpeUIMessages.java 2009-06-23 17:13:26 UTC (rev 16148) @@ -12,7 +12,7 @@ import org.eclipse.osgi.util.NLS; -public class VpeUIMessages extends NLS { +public final class VpeUIMessages extends NLS { private static final String BUNDLE_NAME = "org.jboss.tools.vpe.messages.messages";//$NON-NLS-1$ static { Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/resref/VpeResourcesDialogView.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/resref/VpeResourcesDialogView.java 2009-06-23 16:42:30 UTC (rev 16147) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/resref/VpeResourcesDialogView.java 2009-06-23 17:13:26 UTC (rev 16148) @@ -69,8 +69,8 @@ Composite compositeControl = new Composite(tabFolder, SWT.NONE); compositeControl.setLayout(new GridLayout(1, false)); - Control absControl = absFolder.createControl(compositeControl); - Control relControl = relFolder.createControl(compositeControl); + absFolder.createControl(compositeControl); + relFolder.createControl(compositeControl); Control cssControl = css.createControl(tabFolder); Control tldControl = tld.createControl(tabFolder); Modified: trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/browser/XulRunnerBrowser.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/browser/XulRunnerBrowser.java 2009-06-23 16:42:30 UTC (rev 16147) +++ trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/browser/XulRunnerBrowser.java 2009-06-23 17:13:26 UTC (rev 16148) @@ -212,8 +212,7 @@ }*/ // JBIDE-1222 end - if (xulRunnerFile == null - || !xulRunnerFile.exists()) { + Bundle xulRunnerBundle = Platform.getBundle(getXulRunnerBundle()); if (xulRunnerBundle == null) { throw new XulRunnerException("Bundle " + getXulRunnerBundle() + " is not found."); //$NON-NLS-1$ //$NON-NLS-2$ @@ -237,8 +236,7 @@ } catch (IOException ioe) { throw new XulRunnerException("Cannot get path to XULRunner from bundle " + getXulRunnerBundle(), ioe); // $NON-NLS-1$ } - } - + xulRunnerPath = xulRunnerFile.getAbsolutePath(); System.setProperty(XULRUNNER_PATH, xulRunnerPath); }