Author: rob.stryker(a)jboss.com Date: 2007-10-17 16:17:13 -0400 (Wed, 17 Oct 2007) New Revision: 4308 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/dialogs/XPathDialogs.java Log: JBIDE-413 table becomes inactive, error message appears code completion fixed for attribute portion Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties 2007-10-17 19:53:26 UTC (rev 4307) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties 2007-10-17 20:17:13 UTC (rev 4308) @@ -92,8 +92,7 @@ XPathNameEmpty=Name must be set. XPathNameInUse=Name already in use. XPathColumnLocation=Location -XPathColumnAttributeVals=Attribute Values -XPathColumnRawXML=Raw XML +XPathColumnAttributeVals=Value XPathName=Name\: XPathPattern=XPath Pattern\: XPathAttribute=Attribute Name\: Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/dialogs/XPathDialogs.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/dialogs/XPathDialogs.java 2007-10-17 19:53:26 UTC (rev 4307) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/dialogs/XPathDialogs.java 2007-10-17 20:17:13 UTC (rev 4308) @@ -176,7 +176,7 @@ protected int previewId = 48879; protected Tree previewTree; - protected TreeColumn column, column2, column3; + protected TreeColumn column, column2; protected TreeViewer previewTreeViewer; protected Composite main; protected XMLDocumentRepository repository; @@ -437,7 +437,9 @@ errorImage.setVisible(true); errorLabel.setText("No XML elements matched your search."); errorLabel.setVisible(true); + previewTreeViewer.getTree().setEnabled(false); } else { + previewTreeViewer.getTree().setEnabled(true); checkErrors(); } main.layout(); @@ -472,15 +474,12 @@ previewTree.setLinesVisible(true); column = new TreeColumn(previewTree, SWT.NONE); column2 = new TreeColumn(previewTree, SWT.NONE); - column3 = new TreeColumn(previewTree, SWT.NONE); column.setText(Messages.XPathColumnLocation); column2.setText(Messages.XPathColumnAttributeVals); - column3.setText(Messages.XPathColumnRawXML); - column.setWidth(100); - column2.setWidth(100); - column3.setWidth(100); + column.setWidth(150); + column2.setWidth(150); previewTreeViewer = new TreeViewer(previewTree); @@ -655,12 +654,8 @@ this.elementText = elementText; } public IContentProposal[] getProposals(String contents, int position) { - int type = getType(elementText.getText()); - if( type == IN_ELEMENT ) { - String[] strings = getAttributeNameProposalStrings(elementText.getText(), contents); - return convertProposals(strings); - } - return new IContentProposal[0]; + String[] strings = getAttributeNameProposalStrings(elementText.getText(), contents.trim()); + return convertProposals(strings); } public String[] getAttributeNameProposalStrings(String parentPath, String remainder) {