JBoss Tools SVN: r8824 - branches/jbosstools-2.1.x/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/text/java.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2008-06-18 08:06:37 -0400 (Wed, 18 Jun 2008)
New Revision: 8824
Modified:
branches/jbosstools-2.1.x/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/text/java/SeamELProposalProcessor.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-2227 CA shows useless proposals when we editing style for h:output text in seam project
The issue is rejected.
The changes related to the issue are rolled back
Modified: branches/jbosstools-2.1.x/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/text/java/SeamELProposalProcessor.java
===================================================================
--- branches/jbosstools-2.1.x/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/text/java/SeamELProposalProcessor.java 2008-06-18 11:51:18 UTC (rev 8823)
+++ branches/jbosstools-2.1.x/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/text/java/SeamELProposalProcessor.java 2008-06-18 12:06:37 UTC (rev 8824)
@@ -18,13 +18,11 @@
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.jdt.ui.PreferenceConstants;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.text.BadLocationException;
import org.eclipse.jface.text.DocumentEvent;
import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IDocumentExtension4;
import org.eclipse.jface.text.IInformationControlCreator;
import org.eclipse.jface.text.ITextViewer;
import org.eclipse.jface.text.contentassist.ICompletionProposal;
@@ -32,7 +30,6 @@
import org.eclipse.jface.text.contentassist.ICompletionProposalExtension2;
import org.eclipse.jface.text.contentassist.ICompletionProposalExtension3;
import org.eclipse.jface.text.contentassist.ICompletionProposalExtension4;
-import org.eclipse.jface.text.contentassist.ICompletionProposalExtension5;
import org.eclipse.jface.text.contentassist.IContextInformation;
import org.eclipse.jface.text.contentassist.IContextInformationValidator;
import org.eclipse.swt.graphics.Image;
@@ -62,7 +59,6 @@
import org.jboss.tools.seam.internal.core.el.SeamELCompletionEngine;
import org.jboss.tools.seam.ui.SeamGuiPlugin;
import org.w3c.dom.Node;
-import org.w3c.tidy.AttrCheckImpl.CheckBool;
/**
* Content assist proposal processor.
@@ -72,524 +68,429 @@
*/
public class SeamELProposalProcessor extends AbstractContentAssistProcessor {
- private static final ICompletionProposal[] NO_PROPOSALS= new ICompletionProposal[0];
- private static final IContextInformation[] NO_CONTEXTS= new IContextInformation[0];
- public static final String EL_END_EXPRESSION = "}";
- public static final String EL_START_EXPRESSION = "#{";
-
- public static final class Proposal implements ICompletionProposal, ICompletionProposalExtension, ICompletionProposalExtension2, ICompletionProposalExtension3, ICompletionProposalExtension4,ICompletionProposalExtension5{
+ private static final ICompletionProposal[] NO_PROPOSALS= new ICompletionProposal[0];
+ private static final IContextInformation[] NO_CONTEXTS= new IContextInformation[0];
- private final String fString;
- private final String fPrefix;
- private final String fNewPrefix;
- private final int fOffset;
- private int fNewPosition;
- private final String fDisplaySuffix;
- private final String fDisplayPrefix;
+ public static final class Proposal implements ICompletionProposal, ICompletionProposalExtension, ICompletionProposalExtension2, ICompletionProposalExtension3, ICompletionProposalExtension4 {
-// public Proposal(String string, String prefix, int offset) {
-// this(string, prefix, offset, offset + string.length());
-// }
-// public Proposal(String string, String prefix, int offset, String fDisplayPrefix,String fDisplaySuffix) {
-// this(string, prefix, offset, offset + string.length());
-// }
-//
-
- public Proposal(String string, String prefix, int offset, int newPosition,String fDisplayPrefix,String fDisplaySuffix) {
- this(string, prefix, prefix, offset, offset + string.length(),fDisplayPrefix,fDisplaySuffix);
- }
+ private final String fString;
+ private final String fPrefix;
+ private final String fNewPrefix;
+ private final int fOffset;
+ private int fNewPosition;
- public Proposal(String string, String prefix, String newPrefix, int offset, int newPosition,String fDisplayPrefix,String fDisplaySuffix) {
- fString = string;
- fPrefix = prefix;
- fNewPrefix = newPrefix;
- fOffset = offset;
- fNewPosition = newPosition;
- this.fDisplayPrefix = fDisplayPrefix;
- this.fDisplaySuffix = fDisplaySuffix;
- }
+ public Proposal(String string, String prefix, int offset) {
+ this(string, prefix, offset, offset + string.length());
+ }
- /*
- * @see org.eclipse.jface.text.contentassist.ICompletionProposal#apply(IDocument)
- */
- public void apply(IDocument document) {
- apply(null, '\0', 0, fOffset);
- }
+ public Proposal(String string, String prefix, int offset, int newPosition) {
+ this(string, prefix, prefix, offset, offset + string.length());
+ }
- /*
- * @see org.eclipse.jface.text.contentassist.ICompletionProposal#getSelection(IDocument)
- */
- public Point getSelection(IDocument document) {
- int position = fNewPosition;
- //added by estherbin
- //fix http://jira.jboss.com/jira/browse/JBIDE-2277
- if(isStartsWithEl()){
- position+=EL_START_EXPRESSION.length();
- }
- return new Point(position, 0);
- }
+ public Proposal(String string, String prefix, String newPrefix, int offset, int newPosition) {
+ fString = string;
+ fPrefix = prefix;
+ fNewPrefix = newPrefix;
+ fOffset = offset;
+ fNewPosition = newPosition;
+ }
- /*
- * @see org.eclipse.jface.text.contentassist.ICompletionProposal#getAdditionalProposalInfo()
- */
- public String getAdditionalProposalInfo() {
- return null;
- }
+ /*
+ * @see org.eclipse.jface.text.contentassist.ICompletionProposal#apply(IDocument)
+ */
+ public void apply(IDocument document) {
+ apply(null, '\0', 0, fOffset);
+ }
- /*
- * @see org.eclipse.jface.text.contentassist.ICompletionProposal#getDisplayString()
- */
- public String getDisplayString() {
- final StringBuffer sb = new StringBuffer();
-
- //added by estherbin
- //fix http://jira.jboss.com/jira/browse/JBIDE-2277
- if((this.fDisplayPrefix.length() > 0) && (this.fDisplaySuffix.length() > 0)){
- sb.append(fDisplayPrefix+fPrefix+fString+fDisplaySuffix);
- }else{
- sb.append((fNewPrefix == null ? fPrefix : fNewPrefix) + fString);
- }
- return sb.toString();
- }
+ /*
+ * @see org.eclipse.jface.text.contentassist.ICompletionProposal#getSelection(IDocument)
+ */
+ public Point getSelection(IDocument document) {
+ return new Point(fNewPosition, 0);
+ }
- /*
- * @see org.eclipse.jface.text.contentassist.ICompletionProposal#getImage()
- */
- public Image getImage() {
- return SharedXMLEditorPluginImageHelper.getImage(SharedXMLEditorPluginImageHelper.IMG_OBJ_ATTRIBUTE);
- }
+ /*
+ * @see org.eclipse.jface.text.contentassist.ICompletionProposal#getAdditionalProposalInfo()
+ */
+ public String getAdditionalProposalInfo() {
+ return null;
+ }
- /*
- * @see org.eclipse.jface.text.contentassist.ICompletionProposal#getContextInformation()
- */
- public IContextInformation getContextInformation() {
- return null;
- }
+ /*
+ * @see org.eclipse.jface.text.contentassist.ICompletionProposal#getDisplayString()
+ */
+ public String getDisplayString() {
+ return (fNewPrefix == null ? fPrefix : fNewPrefix) + fString;
+ }
- /*
- * @see org.eclipse.jface.text.contentassist.ICompletionProposalExtension#apply(IDocument, char, int)
- */
- public void apply(IDocument document, char trigger, int offset) {
- try {
- int docCharsToReplace = (fNewPrefix == null || fPrefix == null) ? 0 : fPrefix.length() - fNewPrefix.length();
- String replacement = fString.substring(offset - fOffset);
- //added by estherbin
- //fix http://jira.jboss.com/jira/browse/JBIDE-2277
- if (isStartsWithEl()) {
- replacement = EL_START_EXPRESSION + fPrefix + fString + EL_END_EXPRESSION;
- if (document instanceof IDocumentExtension4) {
- ((IDocumentExtension4) document).replace(offset - fPrefix.length(), getRemovedLength(offset,document,fPrefix.length()), "",
- ((IDocumentExtension4) document).getModificationStamp());
- }
- document.replace(offset - fPrefix.length(), 0, replacement);
+ /*
+ * @see org.eclipse.jface.text.contentassist.ICompletionProposal#getImage()
+ */
+ public Image getImage() {
+ return SharedXMLEditorPluginImageHelper.getImage(SharedXMLEditorPluginImageHelper.IMG_OBJ_ATTRIBUTE);
+ }
- } else {
- document.replace(offset - docCharsToReplace, docCharsToReplace, replacement);
- }
- } catch (BadLocationException x) {
- SeamGuiPlugin.getPluginLog().logError(x);
- }
- }
-
- /**
- * @param document
- * @param length
- * @return
- */
- private int getRemovedLength(int offset,IDocument document, int length) {
- int len = length;
-// int _offset = offset;
-// while(document.getChar(offset))
- return len;
- }
+ /*
+ * @see org.eclipse.jface.text.contentassist.ICompletionProposal#getContextInformation()
+ */
+ public IContextInformation getContextInformation() {
+ return null;
+ }
- protected boolean isStartsWithEl(){
- return ((this.fDisplayPrefix.length() > 0) && (this.fDisplaySuffix.length() > 0));
- }
+ /*
+ * @see org.eclipse.jface.text.contentassist.ICompletionProposalExtension#apply(IDocument, char, int)
+ */
+ public void apply(IDocument document, char trigger, int offset) {
+ try {
+ int docCharsToReplace = (fNewPrefix == null || fPrefix == null) ? 0 :
+ fPrefix.length() - fNewPrefix.length();
+ String replacement= fString.substring(offset - fOffset);
+ document.replace(offset - docCharsToReplace, docCharsToReplace, replacement);
+ } catch (BadLocationException x) {
+ SeamGuiPlugin.getPluginLog().logError(x);
+ }
+ }
- /**
- * @param document
- * @param offset
- * @return
- */
- private int getBeginOffset(IDocument document, int offset) {
- int _offset = offset;
- while(_offset-- > 0){
- try {
- if ('"' == document.getChar(offset) || '\'' == document.getChar(offset)) {
- return _offset;
- }
- } catch (BadLocationException e) {
- SeamGuiPlugin.getPluginLog().logError(e);
- }
- }
- return 0;
- }
+ /*
+ * @see org.eclipse.jface.text.contentassist.ICompletionProposalExtension#isValidFor(IDocument, int)
+ */
+ public boolean isValidFor(IDocument document, int offset) {
+ return validate(document, offset, null);
+ }
- /*
- * @see org.eclipse.jface.text.contentassist.ICompletionProposalExtension#isValidFor(IDocument, int)
- */
- public boolean isValidFor(IDocument document, int offset) {
- return validate(document, offset, null);
- }
+ /*
+ * @see org.eclipse.jface.text.contentassist.ICompletionProposalExtension#getTriggerCharacters()
+ */
+ public char[] getTriggerCharacters() {
+ return null;
+ }
- /*
- * @see org.eclipse.jface.text.contentassist.ICompletionProposalExtension#getTriggerCharacters()
- */
- public char[] getTriggerCharacters() {
- return null;
- }
+ /*
+ * @see org.eclipse.jface.text.contentassist.ICompletionProposalExtension#getContextInformationPosition()
+ */
+ public int getContextInformationPosition() {
+ return 0;
+ }
- /*
- * @see org.eclipse.jface.text.contentassist.ICompletionProposalExtension#getContextInformationPosition()
- */
- public int getContextInformationPosition() {
- return 0;
- }
+ /*
+ * @see org.eclipse.jface.text.contentassist.ICompletionProposalExtension2#apply(ITextViewer, char, int, int)
+ */
+ public void apply(ITextViewer viewer, char trigger, int stateMask, int offset) {
+ apply(viewer.getDocument(), trigger, offset);
+
+ if (fString != null && fString.endsWith("}")) {
+ fNewPosition -= 1;
+ }
+ }
- /*
- * @see org.eclipse.jface.text.contentassist.ICompletionProposalExtension2#apply(ITextViewer, char, int, int)
- */
- public void apply(ITextViewer viewer, char trigger, int stateMask, int offset) {
- apply(viewer.getDocument(), trigger, offset);
- if (fString != null && fString.endsWith(EL_END_EXPRESSION)) {
- fNewPosition -= 1;
- }
- }
+ /*
+ * @see org.eclipse.jface.text.contentassist.ICompletionProposalExtension2#selected(ITextViewer, boolean)
+ */
+ public void selected(ITextViewer viewer, boolean smartToggle) {
+ }
- /*
- * @see org.eclipse.jface.text.contentassist.ICompletionProposalExtension2#selected(ITextViewer, boolean)
- */
- public void selected(ITextViewer viewer, boolean smartToggle) {
- }
+ /*
+ * @see org.eclipse.jface.text.contentassist.ICompletionProposalExtension2#unselected(ITextViewer)
+ */
+ public void unselected(ITextViewer viewer) {
+ }
- /*
- * @see org.eclipse.jface.text.contentassist.ICompletionProposalExtension2#unselected(ITextViewer)
- */
- public void unselected(ITextViewer viewer) {
- }
+ /*
+ * @see org.eclipse.jface.text.contentassist.ICompletionProposalExtension2#validate(IDocument document, int offset, DocumentEvent event)
+ */
+ public boolean validate(IDocument document, int offset, DocumentEvent event) {
+ try {
+ int prefixStart= fOffset - fPrefix.length();
+ return offset >= fOffset && offset < fOffset + fString.length() && document.get(prefixStart, offset - (prefixStart)).equals((fPrefix + fString).substring(0, offset - prefixStart));
+ } catch (BadLocationException x) {
+ return false;
+ }
+ }
- /*
- * @see org.eclipse.jface.text.contentassist.ICompletionProposalExtension2#validate(IDocument document, int offset, DocumentEvent event)
- */
- public boolean validate(IDocument document, int offset, DocumentEvent event) {
- try {
- int prefixStart= fOffset - fPrefix.length();
- return offset >= fOffset && offset < fOffset + fString.length() && document.get(prefixStart, offset - (prefixStart)).equals((fPrefix + fString).substring(0, offset - prefixStart));
- } catch (BadLocationException x) {
- return false;
- }
- }
+ /*
+ * @see org.eclipse.jface.text.contentassist.ICompletionProposalExtension3#getInformationControlCreator()
+ */
+ public IInformationControlCreator getInformationControlCreator() {
+ return null;
+ }
- /*
- * @see org.eclipse.jface.text.contentassist.ICompletionProposalExtension3#getInformationControlCreator()
- */
- public IInformationControlCreator getInformationControlCreator() {
- return null;
- }
+ /*
+ * @see org.eclipse.jface.text.contentassist.ICompletionProposalExtension3#getPrefixCompletionText(IDocument, int)
+ */
+ public CharSequence getPrefixCompletionText(IDocument document, int completionOffset) {
+ return fPrefix + fString;
+ }
- /*
- * @see org.eclipse.jface.text.contentassist.ICompletionProposalExtension3#getPrefixCompletionText(IDocument, int)
- */
- public CharSequence getPrefixCompletionText(IDocument document, int completionOffset) {
- return fPrefix + fString;
- }
+ /*
+ * @see org.eclipse.jface.text.contentassist.ICompletionProposalExtension3#getPrefixCompletionStart(IDocument, int)
+ */
+ public int getPrefixCompletionStart(IDocument document, int completionOffset) {
+ return fOffset - fPrefix.length();
+ }
- /*
- * @see org.eclipse.jface.text.contentassist.ICompletionProposalExtension3#getPrefixCompletionStart(IDocument, int)
- */
- public int getPrefixCompletionStart(IDocument document, int completionOffset) {
- return fOffset - fPrefix.length();
- }
+ /*
+ * @see org.eclipse.jface.text.contentassist.ICompletionProposalExtension4#isAutoInsertable()
+ */
+ public boolean isAutoInsertable() {
+ return false;
+ }
+
+ /**
+ * Return cursor position of proposal replacement string.
+ */
+ public int getCursorPosition() {
+ return fNewPosition;
+ }
- /*
- * @see org.eclipse.jface.text.contentassist.ICompletionProposalExtension4#isAutoInsertable()
- */
- public boolean isAutoInsertable() {
- return false;
- }
-
- /**
- * Return cursor position of proposal replacement string.
- */
- public int getCursorPosition() {
- return fNewPosition;
- }
+ }
- /* (non-Javadoc)
- * @see org.eclipse.jface.text.contentassist.ICompletionProposalExtension5#getAdditionalProposalInfo(org.eclipse.core.runtime.IProgressMonitor)
- */
- public Object getAdditionalProposalInfo(IProgressMonitor monitor) {
- // TODO Auto-generated method stub
- return null;
- }
+ private final SeamELCompletionEngine fEngine= new SeamELCompletionEngine();
- }
+ /**
+ * Creates a new Seam EL completion proposal computer.
+ */
+ public SeamELProposalProcessor() {
+ }
- private final SeamELCompletionEngine fEngine= new SeamELCompletionEngine();
+ /*
+ * @see org.eclipse.jface.text.contentassist.IContentAssistProcessor#computeCompletionProposals(org.eclipse.jface.text.ITextViewer, int)
+ */
+ public ICompletionProposal[] computeCompletionProposals(ITextViewer viewer, int offset) {
+ try {
+ ITextEditor part = getActiveEditor();
+ if (part == null) {
+ return NO_PROPOSALS;
+ }
- /**
- * Creates a new Seam EL completion proposal computer.
- */
- public SeamELProposalProcessor() {
- }
+ IEditorInput editorInput = part.getEditorInput();
+ if (!(editorInput instanceof IFileEditorInput)) {
+ return NO_PROPOSALS;
+ }
- /*
- * @see org.eclipse.jface.text.contentassist.IContentAssistProcessor#computeCompletionProposals(org.eclipse.jface.text.ITextViewer, int)
- */
- public ICompletionProposal[] computeCompletionProposals(ITextViewer viewer, int offset) {
- try {
- ITextEditor part = getActiveEditor();
- if (part == null) {
- return NO_PROPOSALS;
- }
+ IFile file = ((IFileEditorInput)editorInput).getFile();
+ IProject project = (file == null ? null : file.getProject());
- IEditorInput editorInput = part.getEditorInput();
- if (!(editorInput instanceof IFileEditorInput)) {
- return NO_PROPOSALS;
- }
+ ISeamProject seamProject = SeamCorePlugin.getSeamProject(project, true);
+ if (seamProject == null) {
+ return NO_PROPOSALS;
+ }
- IFile file = ((IFileEditorInput)editorInput).getFile();
- IProject project = (file == null ? null : file.getProject());
+ String prefix= SeamELCompletionEngine.getPrefix(viewer, offset);
+ prefix = (prefix == null ? "" : prefix); //$NON-NLS-1$
- ISeamProject seamProject = SeamCorePlugin.getSeamProject(project, true);
- if (seamProject == null) {
- return NO_PROPOSALS;
- }
+ String proposalPrefix = "";
+ String proposalSufix = "";
+ String documentContent = null;
+ IDocument document = viewer.getDocument();
+ if (!checkStartPositionInEL(viewer, offset)) {
+ // Work only with attribute value for JSP/HTML
+ if((part instanceof XMLTextEditor) || (!isAttributeValue(viewer, offset))) {
+ return NO_PROPOSALS;
+ }
+ prefix = ""; // Clear prefix because it's not the part of EL
+ if(isCharSharp(viewer, offset-1)) {
+ proposalPrefix = "{"; //$NON-NLS-1$
+ } else {
+ proposalPrefix = "#{"; //$NON-NLS-1$
+ }
+
+ if(document != null) {
+ documentContent = document.get(0,offset) + proposalPrefix + document.get(offset, document.getLength() - offset);
+ }
+
+ proposalSufix = "}"; //$NON-NLS-1$
+ } else {
+ if(viewer.getDocument() != null) {
+ documentContent = document.get();
+ }
+ }
- String prefix= SeamELCompletionEngine.getPrefix(viewer, offset);
- prefix = (prefix == null ? "" : prefix); //$NON-NLS-1$
+ List<ElVarSearcher.Var> vars = ElVarSearcher.findAllVars(viewer, offset);
+ List<String> suggestions = fEngine.getCompletions(seamProject, file, documentContent, prefix, offset + proposalPrefix.length() - prefix.length(), false, vars);
+ List<String> uniqueSuggestions = fEngine.makeUnique(suggestions);
- String proposalPrefix = "";
- String proposalSufix = "";
- String documentContent = null;
- IDocument document = viewer.getDocument();
- if (!checkStartPositionInEL(viewer, offset,true)) {
- // Work only with attribute value for JSP/HTML
- if((part instanceof XMLTextEditor) || (!isAttributeValue(viewer, offset))) {
- return NO_PROPOSALS;
- }
- prefix = ""; // Clear prefix because it's not the part of EL
- if(isCharSharp(viewer, offset-1)) {
- proposalPrefix = "{"; //$NON-NLS-1$
- } else {
- proposalPrefix = "#{"; //$NON-NLS-1$
- }
-
- if(document != null) {
- documentContent = document.get(0,offset) + proposalPrefix + document.get(offset, document.getLength() - offset);
- }
-
- proposalSufix = "}"; //$NON-NLS-1$
- } else {
- if(viewer.getDocument() != null) {
- documentContent = document.get();
- }
- }
+ List<ICompletionProposal> result= new ArrayList<ICompletionProposal>();
+ for (String string : uniqueSuggestions) {
+ if (string.length() >= 0) {
+ string = proposalPrefix + string + proposalSufix;
+ if (string.startsWith("['") && string.endsWith("']") && prefix != null && prefix.endsWith(".")) {
+ String newPrefix = prefix.substring(0, prefix.length() - 1);
+ result.add(new Proposal(string, prefix, newPrefix, offset, offset - 1 + string.length() - proposalSufix.length()));
+ } else {
+ result.add(new Proposal(string, prefix, offset, offset + string.length() - proposalSufix.length()));
+ }
+ }
+ }
- List<ElVarSearcher.Var> vars = ElVarSearcher.findAllVars(viewer, offset);
- List<String> suggestions = fEngine.getCompletions(seamProject, file, documentContent, prefix, offset + proposalPrefix.length() - prefix.length(), false, vars);
- List<String> uniqueSuggestions = fEngine.makeUnique(suggestions);
+ if (result == null || result.size() == 0) {
+ return NO_PROPOSALS;
+ }
+ ICompletionProposal[] resultArray = result.toArray(new ICompletionProposal[result.size()]);
+ Arrays.sort(resultArray, new Comparator<ICompletionProposal>() {
+ public int compare(ICompletionProposal arg0,
+ ICompletionProposal arg1) {
+ String str0 = (arg0 == null ? "" : arg0.getDisplayString()); //$NON-NLS-1$
+ String str1 = (arg1 == null ? "" : arg1.getDisplayString()); //$NON-NLS-1$
+ return str0.compareTo(str1);
+ }});
+ return resultArray;
+ } catch (BadLocationException x) {
+ SeamGuiPlugin.getPluginLog().logError(x);
+ return NO_PROPOSALS;
+ } catch (StringIndexOutOfBoundsException e) {
+ SeamGuiPlugin.getPluginLog().logError(e);
+ return NO_PROPOSALS;
+ }
+ }
- List<ICompletionProposal> result= new ArrayList<ICompletionProposal>();
- for (String string : uniqueSuggestions) {
-
- if (string.length() >= 0) {
- //added by estherbin
- //fix http://jira.jboss.com/jira/browse/JBIDE-2277
- string = proposalPrefix + string + proposalSufix;
- String elDisplaySuffix ="";
- String elDisplayPrefix ="";
- if(!checkStartPositionInEL(viewer, offset,false) && !string.endsWith(".")){
- elDisplaySuffix="}";
- elDisplayPrefix="#{";
- }
- if (string.startsWith("['") && string.endsWith("']") && prefix != null && prefix.endsWith(".")) {
- String newPrefix = prefix.substring(0, prefix.length() - 1);
- result.add(new Proposal(string, prefix, newPrefix, offset, (offset - 1 + string.length() - proposalSufix.length()),elDisplayPrefix,elDisplaySuffix));
- } else {
- result.add(new Proposal(string, prefix, offset, offset + string.length() - proposalSufix.length(),elDisplayPrefix,elDisplaySuffix));
- }
- }
- }
+ private boolean isAttributeValue(ITextViewer viewer, int offset) {
+ IndexedRegion treeNode = ContentAssistUtils.getNodeAt(viewer, offset);
- if (result == null || result.size() == 0) {
- return NO_PROPOSALS;
- }
- ICompletionProposal[] resultArray = result.toArray(new ICompletionProposal[result.size()]);
- Arrays.sort(resultArray, new Comparator<ICompletionProposal>() {
- public int compare(ICompletionProposal arg0,
- ICompletionProposal arg1) {
- String str0 = (arg0 == null ? "" : arg0.getDisplayString()); //$NON-NLS-1$
- String str1 = (arg1 == null ? "" : arg1.getDisplayString()); //$NON-NLS-1$
- return str0.compareTo(str1);
- }});
- return resultArray;
- } catch (BadLocationException x) {
- SeamGuiPlugin.getPluginLog().logError(x);
- return NO_PROPOSALS;
- } catch (StringIndexOutOfBoundsException e) {
- SeamGuiPlugin.getPluginLog().logError(e);
- return NO_PROPOSALS;
- }
- }
+ if(treeNode instanceof Node) {
+ Node node = (Node) treeNode;
+ while ((node != null) && (node.getNodeType() == Node.TEXT_NODE) && (node.getParentNode() != null)) {
+ node = node.getParentNode();
+ }
+ if(node instanceof IDOMNode) {
+ IDOMNode xmlnode = (IDOMNode) node;
+ ITextRegion completionRegion = getCompletionRegion(offset, node);
+ if (DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE != completionRegion.getType())
+ return false;
+ ITextRegion nextRegion = getCompletionRegion(offset + 1, node);
+ return DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE == nextRegion.getType();
+ }
+ }
+ return false;
+ }
- private boolean isAttributeValue(ITextViewer viewer, int offset) {
- IndexedRegion treeNode = ContentAssistUtils.getNodeAt(viewer, offset);
+ /*
+ * @see org.eclipse.jface.text.contentassist.IContentAssistProcessor#computeContextInformation(org.eclipse.jface.text.ITextViewer, int)
+ */
+ public IContextInformation[] computeContextInformation(ITextViewer viewer, int offset) {
+ // no context informations for Seam EL completions
+ return NO_CONTEXTS;
+ }
+
+ private char[] autoActivChars;
- if(treeNode instanceof Node) {
- Node node = (Node) treeNode;
- while ((node != null) && (node.getNodeType() == Node.TEXT_NODE) && (node.getParentNode() != null)) {
- node = node.getParentNode();
- }
- if(node instanceof IDOMNode) {
- IDOMNode xmlnode = (IDOMNode) node;
- ITextRegion completionRegion = getCompletionRegion(offset, node);
- if (DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE != completionRegion.getType())
- return false;
- ITextRegion nextRegion = getCompletionRegion(offset + 1, node);
- return DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE == nextRegion.getType();
- }
- }
- return false;
- }
+ /*
+ * @see org.eclipse.jface.text.contentassist.IContentAssistProcessor#getCompletionProposalAutoActivationCharacters()
+ */
+ public char[] getCompletionProposalAutoActivationCharacters() {
+ if(autoActivChars==null) {
+ IPreferenceStore store= EditorsUI.getPreferenceStore();
+ String superDefaultChars = store.getDefaultString(PreferenceConstants.CODEASSIST_AUTOACTIVATION_TRIGGERS_JAVA);
+ StringBuffer redhatDefaultChars = new StringBuffer(superDefaultChars);
+ if(superDefaultChars.indexOf("{")<0) { //$NON-NLS-1$
+ redhatDefaultChars.append('{');
+ }
+ if(superDefaultChars.indexOf(".")<0) { //$NON-NLS-1$
+ redhatDefaultChars.append('.');
+ }
+ autoActivChars = new char[redhatDefaultChars.length()];
+ redhatDefaultChars.getChars(0, redhatDefaultChars.length(), autoActivChars, 0);
+ store.setDefault(PreferenceConstants.CODEASSIST_AUTOACTIVATION_TRIGGERS_JAVA, redhatDefaultChars.toString());
+ store.setValue(PreferenceConstants.CODEASSIST_AUTOACTIVATION_TRIGGERS_JAVA, redhatDefaultChars.toString());
+ }
+ return autoActivChars;
+ }
- /*
- * @see org.eclipse.jface.text.contentassist.IContentAssistProcessor#computeContextInformation(org.eclipse.jface.text.ITextViewer, int)
- */
- public IContextInformation[] computeContextInformation(ITextViewer viewer, int offset) {
- // no context informations for Seam EL completions
- return NO_CONTEXTS;
- }
-
- private char[] autoActivChars;
+ /*
+ * @see org.eclipse.jface.text.contentassist.IContentAssistProcessor#getContextInformationAutoActivationCharacters()
+ */
+ public char[] getContextInformationAutoActivationCharacters() {
+ return null;
+ }
+
+ /*
+ * @see org.eclipse.jface.text.contentassist.IContentAssistProcessor#getContextInformationValidator()
+ */
+ public IContextInformationValidator getContextInformationValidator() {
+ return null;
+ }
- /*
- * @see org.eclipse.jface.text.contentassist.IContentAssistProcessor#getCompletionProposalAutoActivationCharacters()
- */
- public char[] getCompletionProposalAutoActivationCharacters() {
- if(autoActivChars==null) {
- IPreferenceStore store= EditorsUI.getPreferenceStore();
- String superDefaultChars = store.getDefaultString(PreferenceConstants.CODEASSIST_AUTOACTIVATION_TRIGGERS_JAVA);
- StringBuffer redhatDefaultChars = new StringBuffer(superDefaultChars);
- if(superDefaultChars.indexOf("{")<0) { //$NON-NLS-1$
- redhatDefaultChars.append('{');
- }
- if(superDefaultChars.indexOf(".")<0) { //$NON-NLS-1$
- redhatDefaultChars.append('.');
- }
- autoActivChars = new char[redhatDefaultChars.length()];
- redhatDefaultChars.getChars(0, redhatDefaultChars.length(), autoActivChars, 0);
- store.setDefault(PreferenceConstants.CODEASSIST_AUTOACTIVATION_TRIGGERS_JAVA, redhatDefaultChars.toString());
- store.setValue(PreferenceConstants.CODEASSIST_AUTOACTIVATION_TRIGGERS_JAVA, redhatDefaultChars.toString());
- }
- return autoActivChars;
- }
+ /*
+ * @see org.eclipse.jface.text.contentassist.ICompletionProposalComputer#getErrorMessage()
+ */
+ public String getErrorMessage() {
+ return null; // no custom error message
+ }
- /*
- * @see org.eclipse.jface.text.contentassist.IContentAssistProcessor#getContextInformationAutoActivationCharacters()
- */
- public char[] getContextInformationAutoActivationCharacters() {
- return null;
- }
-
- /*
- * @see org.eclipse.jface.text.contentassist.IContentAssistProcessor#getContextInformationValidator()
- */
- public IContextInformationValidator getContextInformationValidator() {
- return null;
- }
+ /*
+ * Returns active text editor
+ * @return
+ */
+ private ITextEditor getActiveEditor() {
+ IWorkbenchWindow window= PlatformUI.getWorkbench().getActiveWorkbenchWindow();
+ if (window != null) {
+ IWorkbenchPage page= window.getActivePage();
+ if (page != null) {
+ IEditorPart editor= page.getActiveEditor();
+ if (editor instanceof IEditorWrapper)
+ editor = ((IEditorWrapper) editor).getEditor();
+
+ if (editor instanceof ITextEditor)
+ return (ITextEditor) editor;
+ else
+ return (ITextEditor)editor.getAdapter(ITextEditor.class);
+ }
+ }
+ return null;
+ }
- /*
- * @see org.eclipse.jface.text.contentassist.ICompletionProposalComputer#getErrorMessage()
- */
- public String getErrorMessage() {
- return null; // no custom error message
- }
+ private boolean isCharSharp(ITextViewer viewer, int offset) throws BadLocationException {
+ IDocument doc= viewer.getDocument();
+ if (doc == null || offset > doc.getLength() || offset < 0) {
+ return false;
+ }
- /*
- * Returns active text editor
- * @return
- */
- private ITextEditor getActiveEditor() {
- IWorkbenchWindow window= PlatformUI.getWorkbench().getActiveWorkbenchWindow();
- if (window != null) {
- IWorkbenchPage page= window.getActivePage();
- if (page != null) {
- IEditorPart editor= page.getActiveEditor();
- if (editor instanceof IEditorWrapper)
- editor = ((IEditorWrapper) editor).getEditor();
-
- if (editor instanceof ITextEditor)
- return (ITextEditor) editor;
- else
- return (ITextEditor)editor.getAdapter(ITextEditor.class);
- }
- }
- return null;
- }
+ return '#' == doc.getChar(offset);
+ }
- private boolean isCharSharp(ITextViewer viewer, int offset) throws BadLocationException {
- IDocument doc= viewer.getDocument();
- if (doc == null || offset > doc.getLength() || offset < 0) {
- return false;
- }
+ /*
+ * Checks if the EL start starting characters are present
+ * @param viewer
+ * @param offset
+ * @return
+ * @throws BadLocationException
+ */
+ private boolean checkStartPositionInEL(ITextViewer viewer, int offset) throws BadLocationException {
+
+ // JBIDE-1676: Do not even try to get IStructuredDocument in case of not-a-structured document
+ // This will prevent class cast exceptions while using the editors other than StructuredEditor
+ // (CompilationUnitEditor, for example).
+ IStructuredDocumentRegion sdRegion =
+ (viewer.getDocument() instanceof IStructuredDocument ?
+ ContentAssistUtils.getStructuredDocumentRegion(viewer, offset) :
+ null);
+ ITextRegion region = (sdRegion == null ? null : sdRegion.getRegionAtCharacterOffset(offset));
+
+ int startIndex = (region == null ? 0 : sdRegion.getStartOffset() + region.getStart());
+
+ IDocument doc= viewer.getDocument();
+ if (doc == null || offset > doc.getLength())
+ return false;
- return '#' == doc.getChar(offset);
- }
+ while (--offset >= startIndex) {
+ if ('}' == doc.getChar(offset))
+ return false;
- /*
- * Checks if the EL start starting characters are present
- * @param viewer
- * @param offset
- * @return
- * @throws BadLocationException
- */
- private boolean checkStartPositionInEL(ITextViewer viewer, int offset,boolean isCheckBackslashes) throws BadLocationException {
-
- // JBIDE-1676: Do not even try to get IStructuredDocument in case of not-a-structured document
- // This will prevent class cast exceptions while using the editors other than StructuredEditor
- // (CompilationUnitEditor, for example).
- IStructuredDocumentRegion sdRegion =
- (viewer.getDocument() instanceof IStructuredDocument ?
- ContentAssistUtils.getStructuredDocumentRegion(viewer, offset) :
- null);
- ITextRegion region = (sdRegion == null ? null : sdRegion.getRegionAtCharacterOffset(offset));
-
- int startIndex = (region == null ? 0 : sdRegion.getStartOffset() + region.getStart());
-
- IDocument doc= viewer.getDocument();
- if (doc == null || offset > doc.getLength())
- return false;
+ if ('"' == doc.getChar(offset) || '\'' == doc.getChar(offset)) {
+ int backslashCount = 0;
+ while (doc.getChar(offset - 1 - backslashCount) == '\\') {
+ backslashCount++;
+ }
+ if (backslashCount%2 == 0)
+ return false;
+ }
- while (--offset >= startIndex) {
- if ('}' == doc.getChar(offset))
- return false;
-
- if (isCheckBackslashes) {
- if ('"' == doc.getChar(offset) || '\'' == doc.getChar(offset)) {
- int backslashCount = 0;
- while (doc.getChar(offset - 1 - backslashCount) == '\\') {
- backslashCount++;
- }
- // Added by estherbin
- // JBIDE-2227
- if (backslashCount > 0 && (backslashCount % 2 == 0)) {
- return false;
- } else {
- return true;
- }
- }
- }
-
- if ('{' == doc.getChar(offset) &&
- (offset - 1) >= 0 &&
- ('#' == doc.getChar(offset - 1) ||
- '$' == doc.getChar(offset - 1))) {
- return true;
- }
-
- }
- return false;
- }
+ if ('{' == doc.getChar(offset) &&
+ (offset - 1) >= 0 &&
+ ('#' == doc.getChar(offset - 1) ||
+ '$' == doc.getChar(offset - 1))) {
+ return true;
+ }
+ }
+ return false;
+ }
}
\ No newline at end of file
17 years, 10 months
- 1
- 0
JBoss Tools SVN: r8823 - trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/text/java.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2008-06-18 07:51:18 -0400 (Wed, 18 Jun 2008)
New Revision: 8823
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/text/java/SeamELProposalProcessor.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-2227 CA shows useless proposals when we editing style for h:output text in seam project
The issue is rejected.
The changes related to the issue are rolled back
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/text/java/SeamELProposalProcessor.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/text/java/SeamELProposalProcessor.java 2008-06-18 11:01:20 UTC (rev 8822)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/text/java/SeamELProposalProcessor.java 2008-06-18 11:51:18 UTC (rev 8823)
@@ -18,13 +18,11 @@
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.jdt.ui.PreferenceConstants;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.text.BadLocationException;
import org.eclipse.jface.text.DocumentEvent;
import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IDocumentExtension4;
import org.eclipse.jface.text.IInformationControlCreator;
import org.eclipse.jface.text.ITextViewer;
import org.eclipse.jface.text.contentassist.ICompletionProposal;
@@ -32,7 +30,6 @@
import org.eclipse.jface.text.contentassist.ICompletionProposalExtension2;
import org.eclipse.jface.text.contentassist.ICompletionProposalExtension3;
import org.eclipse.jface.text.contentassist.ICompletionProposalExtension4;
-import org.eclipse.jface.text.contentassist.ICompletionProposalExtension5;
import org.eclipse.jface.text.contentassist.IContextInformation;
import org.eclipse.jface.text.contentassist.IContextInformationValidator;
import org.eclipse.swt.graphics.Image;
@@ -62,7 +59,6 @@
import org.jboss.tools.seam.internal.core.el.SeamELCompletionEngine;
import org.jboss.tools.seam.ui.SeamGuiPlugin;
import org.w3c.dom.Node;
-import org.w3c.tidy.AttrCheckImpl.CheckBool;
/**
* Content assist proposal processor.
@@ -72,524 +68,429 @@
*/
public class SeamELProposalProcessor extends AbstractContentAssistProcessor {
- private static final ICompletionProposal[] NO_PROPOSALS= new ICompletionProposal[0];
- private static final IContextInformation[] NO_CONTEXTS= new IContextInformation[0];
- public static final String EL_END_EXPRESSION = "}";
- public static final String EL_START_EXPRESSION = "#{";
-
- public static final class Proposal implements ICompletionProposal, ICompletionProposalExtension, ICompletionProposalExtension2, ICompletionProposalExtension3, ICompletionProposalExtension4,ICompletionProposalExtension5{
+ private static final ICompletionProposal[] NO_PROPOSALS= new ICompletionProposal[0];
+ private static final IContextInformation[] NO_CONTEXTS= new IContextInformation[0];
- private final String fString;
- private final String fPrefix;
- private final String fNewPrefix;
- private final int fOffset;
- private int fNewPosition;
- private final String fDisplaySuffix;
- private final String fDisplayPrefix;
+ public static final class Proposal implements ICompletionProposal, ICompletionProposalExtension, ICompletionProposalExtension2, ICompletionProposalExtension3, ICompletionProposalExtension4 {
-// public Proposal(String string, String prefix, int offset) {
-// this(string, prefix, offset, offset + string.length());
-// }
-// public Proposal(String string, String prefix, int offset, String fDisplayPrefix,String fDisplaySuffix) {
-// this(string, prefix, offset, offset + string.length());
-// }
-//
-
- public Proposal(String string, String prefix, int offset, int newPosition,String fDisplayPrefix,String fDisplaySuffix) {
- this(string, prefix, prefix, offset, offset + string.length(),fDisplayPrefix,fDisplaySuffix);
- }
+ private final String fString;
+ private final String fPrefix;
+ private final String fNewPrefix;
+ private final int fOffset;
+ private int fNewPosition;
- public Proposal(String string, String prefix, String newPrefix, int offset, int newPosition,String fDisplayPrefix,String fDisplaySuffix) {
- fString = string;
- fPrefix = prefix;
- fNewPrefix = newPrefix;
- fOffset = offset;
- fNewPosition = newPosition;
- this.fDisplayPrefix = fDisplayPrefix;
- this.fDisplaySuffix = fDisplaySuffix;
- }
+ public Proposal(String string, String prefix, int offset) {
+ this(string, prefix, offset, offset + string.length());
+ }
- /*
- * @see org.eclipse.jface.text.contentassist.ICompletionProposal#apply(IDocument)
- */
- public void apply(IDocument document) {
- apply(null, '\0', 0, fOffset);
- }
+ public Proposal(String string, String prefix, int offset, int newPosition) {
+ this(string, prefix, prefix, offset, offset + string.length());
+ }
- /*
- * @see org.eclipse.jface.text.contentassist.ICompletionProposal#getSelection(IDocument)
- */
- public Point getSelection(IDocument document) {
- int position = fNewPosition;
- //added by estherbin
- //fix http://jira.jboss.com/jira/browse/JBIDE-2277
- if(isStartsWithEl()){
- position+=EL_START_EXPRESSION.length();
- }
- return new Point(position, 0);
- }
+ public Proposal(String string, String prefix, String newPrefix, int offset, int newPosition) {
+ fString = string;
+ fPrefix = prefix;
+ fNewPrefix = newPrefix;
+ fOffset = offset;
+ fNewPosition = newPosition;
+ }
- /*
- * @see org.eclipse.jface.text.contentassist.ICompletionProposal#getAdditionalProposalInfo()
- */
- public String getAdditionalProposalInfo() {
- return null;
- }
+ /*
+ * @see org.eclipse.jface.text.contentassist.ICompletionProposal#apply(IDocument)
+ */
+ public void apply(IDocument document) {
+ apply(null, '\0', 0, fOffset);
+ }
- /*
- * @see org.eclipse.jface.text.contentassist.ICompletionProposal#getDisplayString()
- */
- public String getDisplayString() {
- final StringBuffer sb = new StringBuffer();
-
- //added by estherbin
- //fix http://jira.jboss.com/jira/browse/JBIDE-2277
- if((this.fDisplayPrefix.length() > 0) && (this.fDisplaySuffix.length() > 0)){
- sb.append(fDisplayPrefix+fPrefix+fString+fDisplaySuffix);
- }else{
- sb.append((fNewPrefix == null ? fPrefix : fNewPrefix) + fString);
- }
- return sb.toString();
- }
+ /*
+ * @see org.eclipse.jface.text.contentassist.ICompletionProposal#getSelection(IDocument)
+ */
+ public Point getSelection(IDocument document) {
+ return new Point(fNewPosition, 0);
+ }
- /*
- * @see org.eclipse.jface.text.contentassist.ICompletionProposal#getImage()
- */
- public Image getImage() {
- return SharedXMLEditorPluginImageHelper.getImage(SharedXMLEditorPluginImageHelper.IMG_OBJ_ATTRIBUTE);
- }
+ /*
+ * @see org.eclipse.jface.text.contentassist.ICompletionProposal#getAdditionalProposalInfo()
+ */
+ public String getAdditionalProposalInfo() {
+ return null;
+ }
- /*
- * @see org.eclipse.jface.text.contentassist.ICompletionProposal#getContextInformation()
- */
- public IContextInformation getContextInformation() {
- return null;
- }
+ /*
+ * @see org.eclipse.jface.text.contentassist.ICompletionProposal#getDisplayString()
+ */
+ public String getDisplayString() {
+ return (fNewPrefix == null ? fPrefix : fNewPrefix) + fString;
+ }
- /*
- * @see org.eclipse.jface.text.contentassist.ICompletionProposalExtension#apply(IDocument, char, int)
- */
- public void apply(IDocument document, char trigger, int offset) {
- try {
- int docCharsToReplace = (fNewPrefix == null || fPrefix == null) ? 0 : fPrefix.length() - fNewPrefix.length();
- String replacement = fString.substring(offset - fOffset);
- //added by estherbin
- //fix http://jira.jboss.com/jira/browse/JBIDE-2277
- if (isStartsWithEl()) {
- replacement = EL_START_EXPRESSION + fPrefix + fString + EL_END_EXPRESSION;
- if (document instanceof IDocumentExtension4) {
- ((IDocumentExtension4) document).replace(offset - fPrefix.length(), getRemovedLength(offset,document,fPrefix.length()), "",
- ((IDocumentExtension4) document).getModificationStamp());
- }
- document.replace(offset - fPrefix.length(), 0, replacement);
+ /*
+ * @see org.eclipse.jface.text.contentassist.ICompletionProposal#getImage()
+ */
+ public Image getImage() {
+ return SharedXMLEditorPluginImageHelper.getImage(SharedXMLEditorPluginImageHelper.IMG_OBJ_ATTRIBUTE);
+ }
- } else {
- document.replace(offset - docCharsToReplace, docCharsToReplace, replacement);
- }
- } catch (BadLocationException x) {
- SeamGuiPlugin.getPluginLog().logError(x);
- }
- }
-
- /**
- * @param document
- * @param length
- * @return
- */
- private int getRemovedLength(int offset,IDocument document, int length) {
- int len = length;
-// int _offset = offset;
-// while(document.getChar(offset))
- return len;
- }
+ /*
+ * @see org.eclipse.jface.text.contentassist.ICompletionProposal#getContextInformation()
+ */
+ public IContextInformation getContextInformation() {
+ return null;
+ }
- protected boolean isStartsWithEl(){
- return ((this.fDisplayPrefix.length() > 0) && (this.fDisplaySuffix.length() > 0));
- }
+ /*
+ * @see org.eclipse.jface.text.contentassist.ICompletionProposalExtension#apply(IDocument, char, int)
+ */
+ public void apply(IDocument document, char trigger, int offset) {
+ try {
+ int docCharsToReplace = (fNewPrefix == null || fPrefix == null) ? 0 :
+ fPrefix.length() - fNewPrefix.length();
+ String replacement= fString.substring(offset - fOffset);
+ document.replace(offset - docCharsToReplace, docCharsToReplace, replacement);
+ } catch (BadLocationException x) {
+ SeamGuiPlugin.getPluginLog().logError(x);
+ }
+ }
- /**
- * @param document
- * @param offset
- * @return
- */
- private int getBeginOffset(IDocument document, int offset) {
- int _offset = offset;
- while(_offset-- > 0){
- try {
- if ('"' == document.getChar(offset) || '\'' == document.getChar(offset)) {
- return _offset;
- }
- } catch (BadLocationException e) {
- SeamGuiPlugin.getPluginLog().logError(e);
- }
- }
- return 0;
- }
+ /*
+ * @see org.eclipse.jface.text.contentassist.ICompletionProposalExtension#isValidFor(IDocument, int)
+ */
+ public boolean isValidFor(IDocument document, int offset) {
+ return validate(document, offset, null);
+ }
- /*
- * @see org.eclipse.jface.text.contentassist.ICompletionProposalExtension#isValidFor(IDocument, int)
- */
- public boolean isValidFor(IDocument document, int offset) {
- return validate(document, offset, null);
- }
+ /*
+ * @see org.eclipse.jface.text.contentassist.ICompletionProposalExtension#getTriggerCharacters()
+ */
+ public char[] getTriggerCharacters() {
+ return null;
+ }
- /*
- * @see org.eclipse.jface.text.contentassist.ICompletionProposalExtension#getTriggerCharacters()
- */
- public char[] getTriggerCharacters() {
- return null;
- }
+ /*
+ * @see org.eclipse.jface.text.contentassist.ICompletionProposalExtension#getContextInformationPosition()
+ */
+ public int getContextInformationPosition() {
+ return 0;
+ }
- /*
- * @see org.eclipse.jface.text.contentassist.ICompletionProposalExtension#getContextInformationPosition()
- */
- public int getContextInformationPosition() {
- return 0;
- }
+ /*
+ * @see org.eclipse.jface.text.contentassist.ICompletionProposalExtension2#apply(ITextViewer, char, int, int)
+ */
+ public void apply(ITextViewer viewer, char trigger, int stateMask, int offset) {
+ apply(viewer.getDocument(), trigger, offset);
+
+ if (fString != null && fString.endsWith("}")) {
+ fNewPosition -= 1;
+ }
+ }
- /*
- * @see org.eclipse.jface.text.contentassist.ICompletionProposalExtension2#apply(ITextViewer, char, int, int)
- */
- public void apply(ITextViewer viewer, char trigger, int stateMask, int offset) {
- apply(viewer.getDocument(), trigger, offset);
- if (fString != null && fString.endsWith(EL_END_EXPRESSION)) {
- fNewPosition -= 1;
- }
- }
+ /*
+ * @see org.eclipse.jface.text.contentassist.ICompletionProposalExtension2#selected(ITextViewer, boolean)
+ */
+ public void selected(ITextViewer viewer, boolean smartToggle) {
+ }
- /*
- * @see org.eclipse.jface.text.contentassist.ICompletionProposalExtension2#selected(ITextViewer, boolean)
- */
- public void selected(ITextViewer viewer, boolean smartToggle) {
- }
+ /*
+ * @see org.eclipse.jface.text.contentassist.ICompletionProposalExtension2#unselected(ITextViewer)
+ */
+ public void unselected(ITextViewer viewer) {
+ }
- /*
- * @see org.eclipse.jface.text.contentassist.ICompletionProposalExtension2#unselected(ITextViewer)
- */
- public void unselected(ITextViewer viewer) {
- }
+ /*
+ * @see org.eclipse.jface.text.contentassist.ICompletionProposalExtension2#validate(IDocument document, int offset, DocumentEvent event)
+ */
+ public boolean validate(IDocument document, int offset, DocumentEvent event) {
+ try {
+ int prefixStart= fOffset - fPrefix.length();
+ return offset >= fOffset && offset < fOffset + fString.length() && document.get(prefixStart, offset - (prefixStart)).equals((fPrefix + fString).substring(0, offset - prefixStart));
+ } catch (BadLocationException x) {
+ return false;
+ }
+ }
- /*
- * @see org.eclipse.jface.text.contentassist.ICompletionProposalExtension2#validate(IDocument document, int offset, DocumentEvent event)
- */
- public boolean validate(IDocument document, int offset, DocumentEvent event) {
- try {
- int prefixStart= fOffset - fPrefix.length();
- return offset >= fOffset && offset < fOffset + fString.length() && document.get(prefixStart, offset - (prefixStart)).equals((fPrefix + fString).substring(0, offset - prefixStart));
- } catch (BadLocationException x) {
- return false;
- }
- }
+ /*
+ * @see org.eclipse.jface.text.contentassist.ICompletionProposalExtension3#getInformationControlCreator()
+ */
+ public IInformationControlCreator getInformationControlCreator() {
+ return null;
+ }
- /*
- * @see org.eclipse.jface.text.contentassist.ICompletionProposalExtension3#getInformationControlCreator()
- */
- public IInformationControlCreator getInformationControlCreator() {
- return null;
- }
+ /*
+ * @see org.eclipse.jface.text.contentassist.ICompletionProposalExtension3#getPrefixCompletionText(IDocument, int)
+ */
+ public CharSequence getPrefixCompletionText(IDocument document, int completionOffset) {
+ return fPrefix + fString;
+ }
- /*
- * @see org.eclipse.jface.text.contentassist.ICompletionProposalExtension3#getPrefixCompletionText(IDocument, int)
- */
- public CharSequence getPrefixCompletionText(IDocument document, int completionOffset) {
- return fPrefix + fString;
- }
+ /*
+ * @see org.eclipse.jface.text.contentassist.ICompletionProposalExtension3#getPrefixCompletionStart(IDocument, int)
+ */
+ public int getPrefixCompletionStart(IDocument document, int completionOffset) {
+ return fOffset - fPrefix.length();
+ }
- /*
- * @see org.eclipse.jface.text.contentassist.ICompletionProposalExtension3#getPrefixCompletionStart(IDocument, int)
- */
- public int getPrefixCompletionStart(IDocument document, int completionOffset) {
- return fOffset - fPrefix.length();
- }
+ /*
+ * @see org.eclipse.jface.text.contentassist.ICompletionProposalExtension4#isAutoInsertable()
+ */
+ public boolean isAutoInsertable() {
+ return false;
+ }
+
+ /**
+ * Return cursor position of proposal replacement string.
+ */
+ public int getCursorPosition() {
+ return fNewPosition;
+ }
- /*
- * @see org.eclipse.jface.text.contentassist.ICompletionProposalExtension4#isAutoInsertable()
- */
- public boolean isAutoInsertable() {
- return false;
- }
-
- /**
- * Return cursor position of proposal replacement string.
- */
- public int getCursorPosition() {
- return fNewPosition;
- }
+ }
- /* (non-Javadoc)
- * @see org.eclipse.jface.text.contentassist.ICompletionProposalExtension5#getAdditionalProposalInfo(org.eclipse.core.runtime.IProgressMonitor)
- */
- public Object getAdditionalProposalInfo(IProgressMonitor monitor) {
- // TODO Auto-generated method stub
- return null;
- }
+ private final SeamELCompletionEngine fEngine= new SeamELCompletionEngine();
- }
+ /**
+ * Creates a new Seam EL completion proposal computer.
+ */
+ public SeamELProposalProcessor() {
+ }
- private final SeamELCompletionEngine fEngine= new SeamELCompletionEngine();
+ /*
+ * @see org.eclipse.jface.text.contentassist.IContentAssistProcessor#computeCompletionProposals(org.eclipse.jface.text.ITextViewer, int)
+ */
+ public ICompletionProposal[] computeCompletionProposals(ITextViewer viewer, int offset) {
+ try {
+ ITextEditor part = getActiveEditor();
+ if (part == null) {
+ return NO_PROPOSALS;
+ }
- /**
- * Creates a new Seam EL completion proposal computer.
- */
- public SeamELProposalProcessor() {
- }
+ IEditorInput editorInput = part.getEditorInput();
+ if (!(editorInput instanceof IFileEditorInput)) {
+ return NO_PROPOSALS;
+ }
- /*
- * @see org.eclipse.jface.text.contentassist.IContentAssistProcessor#computeCompletionProposals(org.eclipse.jface.text.ITextViewer, int)
- */
- public ICompletionProposal[] computeCompletionProposals(ITextViewer viewer, int offset) {
- try {
- ITextEditor part = getActiveEditor();
- if (part == null) {
- return NO_PROPOSALS;
- }
+ IFile file = ((IFileEditorInput)editorInput).getFile();
+ IProject project = (file == null ? null : file.getProject());
- IEditorInput editorInput = part.getEditorInput();
- if (!(editorInput instanceof IFileEditorInput)) {
- return NO_PROPOSALS;
- }
+ ISeamProject seamProject = SeamCorePlugin.getSeamProject(project, true);
+ if (seamProject == null) {
+ return NO_PROPOSALS;
+ }
- IFile file = ((IFileEditorInput)editorInput).getFile();
- IProject project = (file == null ? null : file.getProject());
+ String prefix= SeamELCompletionEngine.getPrefix(viewer, offset);
+ prefix = (prefix == null ? "" : prefix); //$NON-NLS-1$
- ISeamProject seamProject = SeamCorePlugin.getSeamProject(project, true);
- if (seamProject == null) {
- return NO_PROPOSALS;
- }
+ String proposalPrefix = "";
+ String proposalSufix = "";
+ String documentContent = null;
+ IDocument document = viewer.getDocument();
+ if (!checkStartPositionInEL(viewer, offset)) {
+ // Work only with attribute value for JSP/HTML
+ if((part instanceof XMLTextEditor) || (!isAttributeValue(viewer, offset))) {
+ return NO_PROPOSALS;
+ }
+ prefix = ""; // Clear prefix because it's not the part of EL
+ if(isCharSharp(viewer, offset-1)) {
+ proposalPrefix = "{"; //$NON-NLS-1$
+ } else {
+ proposalPrefix = "#{"; //$NON-NLS-1$
+ }
+
+ if(document != null) {
+ documentContent = document.get(0,offset) + proposalPrefix + document.get(offset, document.getLength() - offset);
+ }
+
+ proposalSufix = "}"; //$NON-NLS-1$
+ } else {
+ if(viewer.getDocument() != null) {
+ documentContent = document.get();
+ }
+ }
- String prefix= SeamELCompletionEngine.getPrefix(viewer, offset);
- prefix = (prefix == null ? "" : prefix); //$NON-NLS-1$
+ List<ElVarSearcher.Var> vars = ElVarSearcher.findAllVars(viewer, offset);
+ List<String> suggestions = fEngine.getCompletions(seamProject, file, documentContent, prefix, offset + proposalPrefix.length() - prefix.length(), false, vars);
+ List<String> uniqueSuggestions = fEngine.makeUnique(suggestions);
- String proposalPrefix = "";
- String proposalSufix = "";
- String documentContent = null;
- IDocument document = viewer.getDocument();
- if (!checkStartPositionInEL(viewer, offset,true)) {
- // Work only with attribute value for JSP/HTML
- if((part instanceof XMLTextEditor) || (!isAttributeValue(viewer, offset))) {
- return NO_PROPOSALS;
- }
- prefix = ""; // Clear prefix because it's not the part of EL
- if(isCharSharp(viewer, offset-1)) {
- proposalPrefix = "{"; //$NON-NLS-1$
- } else {
- proposalPrefix = "#{"; //$NON-NLS-1$
- }
-
- if(document != null) {
- documentContent = document.get(0,offset) + proposalPrefix + document.get(offset, document.getLength() - offset);
- }
-
- proposalSufix = "}"; //$NON-NLS-1$
- } else {
- if(viewer.getDocument() != null) {
- documentContent = document.get();
- }
- }
+ List<ICompletionProposal> result= new ArrayList<ICompletionProposal>();
+ for (String string : uniqueSuggestions) {
+ if (string.length() >= 0) {
+ string = proposalPrefix + string + proposalSufix;
+ if (string.startsWith("['") && string.endsWith("']") && prefix != null && prefix.endsWith(".")) {
+ String newPrefix = prefix.substring(0, prefix.length() - 1);
+ result.add(new Proposal(string, prefix, newPrefix, offset, offset - 1 + string.length() - proposalSufix.length()));
+ } else {
+ result.add(new Proposal(string, prefix, offset, offset + string.length() - proposalSufix.length()));
+ }
+ }
+ }
- List<ElVarSearcher.Var> vars = ElVarSearcher.findAllVars(viewer, offset);
- List<String> suggestions = fEngine.getCompletions(seamProject, file, documentContent, prefix, offset + proposalPrefix.length() - prefix.length(), false, vars);
- List<String> uniqueSuggestions = fEngine.makeUnique(suggestions);
+ if (result == null || result.size() == 0) {
+ return NO_PROPOSALS;
+ }
+ ICompletionProposal[] resultArray = result.toArray(new ICompletionProposal[result.size()]);
+ Arrays.sort(resultArray, new Comparator<ICompletionProposal>() {
+ public int compare(ICompletionProposal arg0,
+ ICompletionProposal arg1) {
+ String str0 = (arg0 == null ? "" : arg0.getDisplayString()); //$NON-NLS-1$
+ String str1 = (arg1 == null ? "" : arg1.getDisplayString()); //$NON-NLS-1$
+ return str0.compareTo(str1);
+ }});
+ return resultArray;
+ } catch (BadLocationException x) {
+ SeamGuiPlugin.getPluginLog().logError(x);
+ return NO_PROPOSALS;
+ } catch (StringIndexOutOfBoundsException e) {
+ SeamGuiPlugin.getPluginLog().logError(e);
+ return NO_PROPOSALS;
+ }
+ }
- List<ICompletionProposal> result= new ArrayList<ICompletionProposal>();
- for (String string : uniqueSuggestions) {
-
- if (string.length() >= 0) {
- //added by estherbin
- //fix http://jira.jboss.com/jira/browse/JBIDE-2277
- string = proposalPrefix + string + proposalSufix;
- String elDisplaySuffix ="";
- String elDisplayPrefix ="";
- if(!checkStartPositionInEL(viewer, offset,false) && !string.endsWith(".")){
- elDisplaySuffix="}";
- elDisplayPrefix="#{";
- }
- if (string.startsWith("['") && string.endsWith("']") && prefix != null && prefix.endsWith(".")) {
- String newPrefix = prefix.substring(0, prefix.length() - 1);
- result.add(new Proposal(string, prefix, newPrefix, offset, (offset - 1 + string.length() - proposalSufix.length()),elDisplayPrefix,elDisplaySuffix));
- } else {
- result.add(new Proposal(string, prefix, offset, offset + string.length() - proposalSufix.length(),elDisplayPrefix,elDisplaySuffix));
- }
- }
- }
+ private boolean isAttributeValue(ITextViewer viewer, int offset) {
+ IndexedRegion treeNode = ContentAssistUtils.getNodeAt(viewer, offset);
- if (result == null || result.size() == 0) {
- return NO_PROPOSALS;
- }
- ICompletionProposal[] resultArray = result.toArray(new ICompletionProposal[result.size()]);
- Arrays.sort(resultArray, new Comparator<ICompletionProposal>() {
- public int compare(ICompletionProposal arg0,
- ICompletionProposal arg1) {
- String str0 = (arg0 == null ? "" : arg0.getDisplayString()); //$NON-NLS-1$
- String str1 = (arg1 == null ? "" : arg1.getDisplayString()); //$NON-NLS-1$
- return str0.compareTo(str1);
- }});
- return resultArray;
- } catch (BadLocationException x) {
- SeamGuiPlugin.getPluginLog().logError(x);
- return NO_PROPOSALS;
- } catch (StringIndexOutOfBoundsException e) {
- SeamGuiPlugin.getPluginLog().logError(e);
- return NO_PROPOSALS;
- }
- }
+ if(treeNode instanceof Node) {
+ Node node = (Node) treeNode;
+ while ((node != null) && (node.getNodeType() == Node.TEXT_NODE) && (node.getParentNode() != null)) {
+ node = node.getParentNode();
+ }
+ if(node instanceof IDOMNode) {
+ IDOMNode xmlnode = (IDOMNode) node;
+ ITextRegion completionRegion = getCompletionRegion(offset, node);
+ if (DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE != completionRegion.getType())
+ return false;
+ ITextRegion nextRegion = getCompletionRegion(offset + 1, node);
+ return DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE == nextRegion.getType();
+ }
+ }
+ return false;
+ }
- private boolean isAttributeValue(ITextViewer viewer, int offset) {
- IndexedRegion treeNode = ContentAssistUtils.getNodeAt(viewer, offset);
+ /*
+ * @see org.eclipse.jface.text.contentassist.IContentAssistProcessor#computeContextInformation(org.eclipse.jface.text.ITextViewer, int)
+ */
+ public IContextInformation[] computeContextInformation(ITextViewer viewer, int offset) {
+ // no context informations for Seam EL completions
+ return NO_CONTEXTS;
+ }
+
+ private char[] autoActivChars;
- if(treeNode instanceof Node) {
- Node node = (Node) treeNode;
- while ((node != null) && (node.getNodeType() == Node.TEXT_NODE) && (node.getParentNode() != null)) {
- node = node.getParentNode();
- }
- if(node instanceof IDOMNode) {
- IDOMNode xmlnode = (IDOMNode) node;
- ITextRegion completionRegion = getCompletionRegion(offset, node);
- if (DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE != completionRegion.getType())
- return false;
- ITextRegion nextRegion = getCompletionRegion(offset + 1, node);
- return DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE == nextRegion.getType();
- }
- }
- return false;
- }
+ /*
+ * @see org.eclipse.jface.text.contentassist.IContentAssistProcessor#getCompletionProposalAutoActivationCharacters()
+ */
+ public char[] getCompletionProposalAutoActivationCharacters() {
+ if(autoActivChars==null) {
+ IPreferenceStore store= EditorsUI.getPreferenceStore();
+ String superDefaultChars = store.getDefaultString(PreferenceConstants.CODEASSIST_AUTOACTIVATION_TRIGGERS_JAVA);
+ StringBuffer redhatDefaultChars = new StringBuffer(superDefaultChars);
+ if(superDefaultChars.indexOf("{")<0) { //$NON-NLS-1$
+ redhatDefaultChars.append('{');
+ }
+ if(superDefaultChars.indexOf(".")<0) { //$NON-NLS-1$
+ redhatDefaultChars.append('.');
+ }
+ autoActivChars = new char[redhatDefaultChars.length()];
+ redhatDefaultChars.getChars(0, redhatDefaultChars.length(), autoActivChars, 0);
+ store.setDefault(PreferenceConstants.CODEASSIST_AUTOACTIVATION_TRIGGERS_JAVA, redhatDefaultChars.toString());
+ store.setValue(PreferenceConstants.CODEASSIST_AUTOACTIVATION_TRIGGERS_JAVA, redhatDefaultChars.toString());
+ }
+ return autoActivChars;
+ }
- /*
- * @see org.eclipse.jface.text.contentassist.IContentAssistProcessor#computeContextInformation(org.eclipse.jface.text.ITextViewer, int)
- */
- public IContextInformation[] computeContextInformation(ITextViewer viewer, int offset) {
- // no context informations for Seam EL completions
- return NO_CONTEXTS;
- }
-
- private char[] autoActivChars;
+ /*
+ * @see org.eclipse.jface.text.contentassist.IContentAssistProcessor#getContextInformationAutoActivationCharacters()
+ */
+ public char[] getContextInformationAutoActivationCharacters() {
+ return null;
+ }
+
+ /*
+ * @see org.eclipse.jface.text.contentassist.IContentAssistProcessor#getContextInformationValidator()
+ */
+ public IContextInformationValidator getContextInformationValidator() {
+ return null;
+ }
- /*
- * @see org.eclipse.jface.text.contentassist.IContentAssistProcessor#getCompletionProposalAutoActivationCharacters()
- */
- public char[] getCompletionProposalAutoActivationCharacters() {
- if(autoActivChars==null) {
- IPreferenceStore store= EditorsUI.getPreferenceStore();
- String superDefaultChars = store.getDefaultString(PreferenceConstants.CODEASSIST_AUTOACTIVATION_TRIGGERS_JAVA);
- StringBuffer redhatDefaultChars = new StringBuffer(superDefaultChars);
- if(superDefaultChars.indexOf("{")<0) { //$NON-NLS-1$
- redhatDefaultChars.append('{');
- }
- if(superDefaultChars.indexOf(".")<0) { //$NON-NLS-1$
- redhatDefaultChars.append('.');
- }
- autoActivChars = new char[redhatDefaultChars.length()];
- redhatDefaultChars.getChars(0, redhatDefaultChars.length(), autoActivChars, 0);
- store.setDefault(PreferenceConstants.CODEASSIST_AUTOACTIVATION_TRIGGERS_JAVA, redhatDefaultChars.toString());
- store.setValue(PreferenceConstants.CODEASSIST_AUTOACTIVATION_TRIGGERS_JAVA, redhatDefaultChars.toString());
- }
- return autoActivChars;
- }
+ /*
+ * @see org.eclipse.jface.text.contentassist.ICompletionProposalComputer#getErrorMessage()
+ */
+ public String getErrorMessage() {
+ return null; // no custom error message
+ }
- /*
- * @see org.eclipse.jface.text.contentassist.IContentAssistProcessor#getContextInformationAutoActivationCharacters()
- */
- public char[] getContextInformationAutoActivationCharacters() {
- return null;
- }
-
- /*
- * @see org.eclipse.jface.text.contentassist.IContentAssistProcessor#getContextInformationValidator()
- */
- public IContextInformationValidator getContextInformationValidator() {
- return null;
- }
+ /*
+ * Returns active text editor
+ * @return
+ */
+ private ITextEditor getActiveEditor() {
+ IWorkbenchWindow window= PlatformUI.getWorkbench().getActiveWorkbenchWindow();
+ if (window != null) {
+ IWorkbenchPage page= window.getActivePage();
+ if (page != null) {
+ IEditorPart editor= page.getActiveEditor();
+ if (editor instanceof IEditorWrapper)
+ editor = ((IEditorWrapper) editor).getEditor();
+
+ if (editor instanceof ITextEditor)
+ return (ITextEditor) editor;
+ else
+ return (ITextEditor)editor.getAdapter(ITextEditor.class);
+ }
+ }
+ return null;
+ }
- /*
- * @see org.eclipse.jface.text.contentassist.ICompletionProposalComputer#getErrorMessage()
- */
- public String getErrorMessage() {
- return null; // no custom error message
- }
+ private boolean isCharSharp(ITextViewer viewer, int offset) throws BadLocationException {
+ IDocument doc= viewer.getDocument();
+ if (doc == null || offset > doc.getLength() || offset < 0) {
+ return false;
+ }
- /*
- * Returns active text editor
- * @return
- */
- private ITextEditor getActiveEditor() {
- IWorkbenchWindow window= PlatformUI.getWorkbench().getActiveWorkbenchWindow();
- if (window != null) {
- IWorkbenchPage page= window.getActivePage();
- if (page != null) {
- IEditorPart editor= page.getActiveEditor();
- if (editor instanceof IEditorWrapper)
- editor = ((IEditorWrapper) editor).getEditor();
-
- if (editor instanceof ITextEditor)
- return (ITextEditor) editor;
- else
- return (ITextEditor)editor.getAdapter(ITextEditor.class);
- }
- }
- return null;
- }
+ return '#' == doc.getChar(offset);
+ }
- private boolean isCharSharp(ITextViewer viewer, int offset) throws BadLocationException {
- IDocument doc= viewer.getDocument();
- if (doc == null || offset > doc.getLength() || offset < 0) {
- return false;
- }
+ /*
+ * Checks if the EL start starting characters are present
+ * @param viewer
+ * @param offset
+ * @return
+ * @throws BadLocationException
+ */
+ private boolean checkStartPositionInEL(ITextViewer viewer, int offset) throws BadLocationException {
+
+ // JBIDE-1676: Do not even try to get IStructuredDocument in case of not-a-structured document
+ // This will prevent class cast exceptions while using the editors other than StructuredEditor
+ // (CompilationUnitEditor, for example).
+ IStructuredDocumentRegion sdRegion =
+ (viewer.getDocument() instanceof IStructuredDocument ?
+ ContentAssistUtils.getStructuredDocumentRegion(viewer, offset) :
+ null);
+ ITextRegion region = (sdRegion == null ? null : sdRegion.getRegionAtCharacterOffset(offset));
+
+ int startIndex = (region == null ? 0 : sdRegion.getStartOffset() + region.getStart());
+
+ IDocument doc= viewer.getDocument();
+ if (doc == null || offset > doc.getLength())
+ return false;
- return '#' == doc.getChar(offset);
- }
+ while (--offset >= startIndex) {
+ if ('}' == doc.getChar(offset))
+ return false;
- /*
- * Checks if the EL start starting characters are present
- * @param viewer
- * @param offset
- * @return
- * @throws BadLocationException
- */
- private boolean checkStartPositionInEL(ITextViewer viewer, int offset,boolean isCheckBackslashes) throws BadLocationException {
-
- // JBIDE-1676: Do not even try to get IStructuredDocument in case of not-a-structured document
- // This will prevent class cast exceptions while using the editors other than StructuredEditor
- // (CompilationUnitEditor, for example).
- IStructuredDocumentRegion sdRegion =
- (viewer.getDocument() instanceof IStructuredDocument ?
- ContentAssistUtils.getStructuredDocumentRegion(viewer, offset) :
- null);
- ITextRegion region = (sdRegion == null ? null : sdRegion.getRegionAtCharacterOffset(offset));
-
- int startIndex = (region == null ? 0 : sdRegion.getStartOffset() + region.getStart());
-
- IDocument doc= viewer.getDocument();
- if (doc == null || offset > doc.getLength())
- return false;
+ if ('"' == doc.getChar(offset) || '\'' == doc.getChar(offset)) {
+ int backslashCount = 0;
+ while (doc.getChar(offset - 1 - backslashCount) == '\\') {
+ backslashCount++;
+ }
+ if (backslashCount%2 == 0)
+ return false;
+ }
- while (--offset >= startIndex) {
- if ('}' == doc.getChar(offset))
- return false;
-
- if (isCheckBackslashes) {
- if ('"' == doc.getChar(offset) || '\'' == doc.getChar(offset)) {
- int backslashCount = 0;
- while (doc.getChar(offset - 1 - backslashCount) == '\\') {
- backslashCount++;
- }
- // Added by estherbin
- // JBIDE-2227
- if (backslashCount > 0 && (backslashCount % 2 == 0)) {
- return false;
- } else {
- return true;
- }
- }
- }
-
- if ('{' == doc.getChar(offset) &&
- (offset - 1) >= 0 &&
- ('#' == doc.getChar(offset - 1) ||
- '$' == doc.getChar(offset - 1))) {
- return true;
- }
-
- }
- return false;
- }
+ if ('{' == doc.getChar(offset) &&
+ (offset - 1) >= 0 &&
+ ('#' == doc.getChar(offset - 1) ||
+ '$' == doc.getChar(offset - 1))) {
+ return true;
+ }
+ }
+ return false;
+ }
}
\ No newline at end of file
17 years, 10 months
- 1
- 0
JBoss Tools SVN: r8822 - in trunk/ws/tests/org.jboss.tools.ws.core.test: projects/JBossWSTestProject and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dennyxu
Date: 2008-06-18 07:01:20 -0400 (Wed, 18 Jun 2008)
New Revision: 8822
Added:
trunk/ws/tests/org.jboss.tools.ws.core.test/projects/JBossWSTestProject/hello_world.wsdl
Removed:
trunk/ws/tests/org.jboss.tools.ws.core.test/projects/JBossWSTestProject/HelloWorld.wsdl
Modified:
trunk/ws/tests/org.jboss.tools.ws.core.test/META-INF/MANIFEST.MF
trunk/ws/tests/org.jboss.tools.ws.core.test/src/org/jboss/tools/ws/core/test/command/AbstractJBossWSCommandTest.java
Log:
JBIDE-2323: add unit test for commands
Modified: trunk/ws/tests/org.jboss.tools.ws.core.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.core.test/META-INF/MANIFEST.MF 2008-06-18 08:03:53 UTC (rev 8821)
+++ trunk/ws/tests/org.jboss.tools.ws.core.test/META-INF/MANIFEST.MF 2008-06-18 11:01:20 UTC (rev 8822)
@@ -14,5 +14,8 @@
org.eclipse.wst.common.frameworks,
org.eclipse.ui.ide,
org.jboss.tools.common.test,
- org.jboss.tools.ws.creation.core
+ org.jboss.tools.ws.creation.core,
+ org.eclipse.wst.command.env.ui,
+ org.eclipse.wst.ws,
+ org.jboss.tools.ws.creation.ui
Eclipse-LazyStart: true
Deleted: trunk/ws/tests/org.jboss.tools.ws.core.test/projects/JBossWSTestProject/HelloWorld.wsdl
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.core.test/projects/JBossWSTestProject/HelloWorld.wsdl 2008-06-18 08:03:53 UTC (rev 8821)
+++ trunk/ws/tests/org.jboss.tools.ws.core.test/projects/JBossWSTestProject/HelloWorld.wsdl 2008-06-18 11:01:20 UTC (rev 8822)
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions name="HelloWorld"
- targetNamespace="http://www.example.org/HelloWorld/"
- xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
- xmlns:tns="http://www.example.org/HelloWorld/"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
- <wsdl:types/>
- <wsdl:message name="sayHelloRequest">
- <wsdl:part name="sayHelloRequest" type="xsd:string"></wsdl:part>
- </wsdl:message>
- <wsdl:message name="sayHelloResponse">
- <wsdl:part name="sayHelloResponse" type="xsd:string"></wsdl:part>
- </wsdl:message>
- <wsdl:portType name="IHelloWorld">
- <wsdl:operation name="sayHello">
- <wsdl:input message="tns:sayHelloRequest"></wsdl:input>
- <wsdl:output message="tns:sayHelloResponse"></wsdl:output>
- </wsdl:operation>
- </wsdl:portType>
- <wsdl:binding name="HelloWorld" type="tns:IHelloWorld">
- <soap:binding style="rpc"
- transport="http://schemas.xmlsoap.org/soap/http" />
- <wsdl:operation name="sayHello">
- <soap:operation
- soapAction="http://www.example.org/HelloWorld/sayHello" />
- <wsdl:input>
- <soap:body use="literal"
- namespace="http://www.example.org/HelloWorld/" />
- </wsdl:input>
- <wsdl:output>
- <soap:body use="literal"
- namespace="http://www.example.org/HelloWorld/" />
- </wsdl:output>
- </wsdl:operation>
- </wsdl:binding>
- <wsdl:service name="HelloWorldService">
- <wsdl:port name="HelloWorldPort" binding="tns:HelloWorld">
- <soap:address location="http://localhost:8080/HelloWorld" />
- </wsdl:port>
- </wsdl:service>
-</wsdl:definitions>
Added: trunk/ws/tests/org.jboss.tools.ws.core.test/projects/JBossWSTestProject/hello_world.wsdl
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.core.test/projects/JBossWSTestProject/hello_world.wsdl (rev 0)
+++ trunk/ws/tests/org.jboss.tools.ws.core.test/projects/JBossWSTestProject/hello_world.wsdl 2008-06-18 11:01:20 UTC (rev 8822)
@@ -0,0 +1,181 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<wsdl:definitions name="HelloWorld" targetNamespace="http://apache.org/hello_world_soap_http"
+ xmlns="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+ xmlns:tns="http://apache.org/hello_world_soap_http"
+ xmlns:x1="http://apache.org/hello_world_soap_http/types"
+ xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+ <wsdl:types>
+ <schema targetNamespace="http://apache.org/hello_world_soap_http/types"
+ xmlns="http://www.w3.org/2001/XMLSchema"
+ xmlns:tns="http://apache.org/hello_world_soap_http/types"
+ elementFormDefault="qualified">
+ <simpleType name="MyStringType">
+ <restriction base="string">
+ <maxLength value="30" />
+ </restriction>
+ </simpleType>
+
+ <element name="sayHi">
+ <complexType/>
+ </element>
+ <element name="sayHiResponse">
+ <complexType>
+ <sequence>
+ <element name="responseType" type="string"/>
+ </sequence>
+ </complexType>
+ </element>
+ <element name="greetMe">
+ <complexType>
+ <sequence>
+ <element name="requestType" type="tns:MyStringType"/>
+ </sequence>
+ </complexType>
+ </element>
+ <element name="greetMeResponse">
+ <complexType>
+ <sequence>
+ <element name="responseType" type="string"/>
+ </sequence>
+ </complexType>
+ </element>
+ <element name="greetMeOneWay">
+ <complexType>
+ <sequence>
+ <element name="requestType" type="string"/>
+ </sequence>
+ </complexType>
+ </element>
+ <element name="pingMe">
+ <complexType/>
+ </element>
+ <element name="pingMeResponse">
+ <complexType/>
+ </element>
+ <element name="faultDetail">
+ <complexType>
+ <sequence>
+ <element name="minor" type="short"/>
+ <element name="major" type="short"/>
+ </sequence>
+ </complexType>
+ </element>
+ </schema>
+ </wsdl:types>
+ <wsdl:message name="sayHiRequest">
+ <wsdl:part element="x1:sayHi" name="in"/>
+ </wsdl:message>
+ <wsdl:message name="sayHiResponse">
+ <wsdl:part element="x1:sayHiResponse" name="out"/>
+ </wsdl:message>
+ <wsdl:message name="greetMeRequest">
+ <wsdl:part element="x1:greetMe" name="in"/>
+ </wsdl:message>
+ <wsdl:message name="greetMeResponse">
+ <wsdl:part element="x1:greetMeResponse" name="out"/>
+ </wsdl:message>
+ <wsdl:message name="greetMeOneWayRequest">
+ <wsdl:part element="x1:greetMeOneWay" name="in"/>
+ </wsdl:message>
+ <wsdl:message name="pingMeRequest">
+ <wsdl:part name="in" element="x1:pingMe"/>
+ </wsdl:message>
+ <wsdl:message name="pingMeResponse">
+ <wsdl:part name="out" element="x1:pingMeResponse"/>
+ </wsdl:message>
+ <wsdl:message name="pingMeFault">
+ <wsdl:part name="faultDetail" element="x1:faultDetail"/>
+ </wsdl:message>
+
+ <wsdl:portType name="Greeter">
+ <wsdl:operation name="sayHi">
+ <wsdl:input message="tns:sayHiRequest" name="sayHiRequest"/>
+ <wsdl:output message="tns:sayHiResponse" name="sayHiResponse"/>
+ </wsdl:operation>
+
+ <wsdl:operation name="greetMe">
+ <wsdl:input message="tns:greetMeRequest" name="greetMeRequest"/>
+ <wsdl:output message="tns:greetMeResponse" name="greetMeResponse"/>
+ </wsdl:operation>
+
+ <wsdl:operation name="greetMeOneWay">
+ <wsdl:input message="tns:greetMeOneWayRequest" name="greetMeOneWayRequest"/>
+ </wsdl:operation>
+
+ <wsdl:operation name="pingMe">
+ <wsdl:input name="pingMeRequest" message="tns:pingMeRequest"/>
+ <wsdl:output name="pingMeResponse" message="tns:pingMeResponse"/>
+ <wsdl:fault name="pingMeFault" message="tns:pingMeFault"/>
+ </wsdl:operation>
+ </wsdl:portType>
+ <wsdl:binding name="Greeter_SOAPBinding" type="tns:Greeter">
+ <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+
+ <wsdl:operation name="sayHi">
+ <soap:operation soapAction="" style="document"/>
+ <wsdl:input name="sayHiRequest">
+ <soap:body use="literal"/>
+ </wsdl:input>
+ <wsdl:output name="sayHiResponse">
+ <soap:body use="literal"/>
+ </wsdl:output>
+ </wsdl:operation>
+
+ <wsdl:operation name="greetMe">
+ <soap:operation soapAction="" style="document"/>
+ <wsdl:input name="greetMeRequest">
+ <soap:body use="literal"/>
+ </wsdl:input>
+ <wsdl:output name="greetMeResponse">
+ <soap:body use="literal"/>
+ </wsdl:output>
+ </wsdl:operation>
+
+ <wsdl:operation name="greetMeOneWay">
+ <soap:operation soapAction="" style="document"/>
+ <wsdl:input name="greetMeOneWayRequest">
+ <soap:body use="literal"/>
+ </wsdl:input>
+ </wsdl:operation>
+
+ <wsdl:operation name="pingMe">
+ <soap:operation style="document"/>
+ <wsdl:input>
+ <soap:body use="literal"/>
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="literal"/>
+ </wsdl:output>
+ <wsdl:fault name="pingMeFault">
+ <soap:fault name="pingMeFault" use="literal"/>
+ </wsdl:fault>
+ </wsdl:operation>
+
+ </wsdl:binding>
+ <wsdl:service name="SOAPService">
+ <wsdl:port binding="tns:Greeter_SOAPBinding" name="SoapPort">
+ <soap:address location="http://localhost:9000/SoapContext/SoapPort"/>
+ </wsdl:port>
+ </wsdl:service>
+</wsdl:definitions>
+
Property changes on: trunk/ws/tests/org.jboss.tools.ws.core.test/projects/JBossWSTestProject/hello_world.wsdl
___________________________________________________________________
Name: svn:executable
+ *
Modified: trunk/ws/tests/org.jboss.tools.ws.core.test/src/org/jboss/tools/ws/core/test/command/AbstractJBossWSCommandTest.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.core.test/src/org/jboss/tools/ws/core/test/command/AbstractJBossWSCommandTest.java 2008-06-18 08:03:53 UTC (rev 8821)
+++ trunk/ws/tests/org.jboss.tools.ws.core.test/src/org/jboss/tools/ws/core/test/command/AbstractJBossWSCommandTest.java 2008-06-18 11:01:20 UTC (rev 8822)
@@ -16,6 +16,7 @@
import junit.framework.TestCase;
+import org.eclipse.core.commands.ExecutionException;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IMarker;
import org.eclipse.core.resources.IProject;
@@ -23,13 +24,19 @@
import org.eclipse.core.resources.IWorkspace;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IStatus;
import org.eclipse.ui.IWorkbench;
import org.eclipse.ui.PlatformUI;
+import org.eclipse.wst.command.internal.env.ui.widgets.DynamicWizard;
import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
import org.eclipse.wst.common.project.facet.core.IFacetedProject;
import org.eclipse.wst.common.project.facet.core.IProjectFacet;
import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
+import org.eclipse.wst.ws.internal.common.WSDLUtility;
+import org.eclipse.wst.ws.internal.wsrt.IWebService;
+import org.eclipse.wst.ws.internal.wsrt.WebServiceInfo;
+import org.eclipse.wst.ws.internal.wsrt.WebServiceScenario;
import org.jboss.tools.common.test.util.TestProjectProvider;
import org.jboss.tools.test.util.JUnitUtils;
import org.jboss.tools.test.util.xpl.EditorTestHelper;
@@ -37,16 +44,19 @@
import org.jboss.tools.ws.core.classpath.JbossWSRuntimeManager;
import org.jboss.tools.ws.core.facet.delegate.IJBossWSFacetDataModelProperties;
import org.jboss.tools.ws.core.facet.delegate.JBossWSFacetInstallDataModelProvider;
+import org.jboss.tools.ws.creation.core.commands.InitialCommand;
+import org.jboss.tools.ws.creation.core.commands.WSDL2JavaCommand;
import org.jboss.tools.ws.creation.core.data.ServiceModel;
+import org.jboss.tools.ws.creation.ui.wsrt.JBossWebService;
-abstract public class AbstractJBossWSCommandTest extends TestCase {
+public class AbstractJBossWSCommandTest extends TestCase {
protected static final IWorkspace ws = ResourcesPlugin.getWorkspace();
protected static final IWorkbench wb = PlatformUI.getWorkbench();
protected static final String JBOSSWS_HOME = "jbosstools.test.jbossws.eap.home";
- protected static final String JBOSSWS_HOME_DEFAULT = "F:/jbdevstudio-ga/jboss-eap/seam";
+ protected static final String JBOSSWS_HOME_DEFAULT = "/home/fugang/jboss-all/jboss-4.2.2.GA";
protected final Set<IResource> resourcesToCleanup = new HashSet<IResource>();
@@ -56,10 +66,9 @@
protected static final IProjectFacetVersion jbosswsFacetVersion;
private static final IProjectFacet jbosswsFacet;
private static final String RuntimeName;
- private static final String RuntimeLocation;
private static final boolean isDeployed;
- static String wsdlFileName = "HelloWorld.wsdl";
+ static String wsdlFileName = "hello_world.wsdl";
static String BUNDLE = "org.jboss.tools.ws.core.test";
IProject project;
@@ -71,7 +80,6 @@
jbosswsFacet = ProjectFacetsManager.getProjectFacet("jbossws.core");
jbosswsFacetVersion = jbosswsFacet.getVersion("1.0");
RuntimeName = "testjbosswsruntime";
- RuntimeLocation = "";
isDeployed = false;
@@ -121,20 +129,47 @@
super.tearDown();
}
- public void testInitialCommand() throws CoreException{
+ public void testCommands() throws CoreException, ExecutionException{
IFacetedProject fproject = createJBossWSProject("JBossWSTestProject", false);
IFile wsdlFile = fproject.getProject().getFile(wsdlFileName);
+
+ assertTrue(wsdlFile.exists());
+
ServiceModel model = new ServiceModel();
- model.setWsdlURI(wsdlFile.getFullPath().toOSString());
+ model.setWebProjectName(fproject.getProject().getName());
+ model.setWsdlURI(wsdlFile.getLocation().toOSString());
+
+ WebServiceInfo info = new WebServiceInfo();
+ info.setWsdlURL(wsdlFile.getFullPath().toOSString());
+ IWebService ws = new JBossWebService(info);
+ //test initial command
+ /*InitialCommand cmdInitial = new InitialCommand(model, ws, WebServiceScenario.TOPDOWN);
+ IStatus status = cmdInitial.execute(null, null);
+ assertTrue(status.getMessage(), status.isOK());
+
+ assertTrue(model.getServiceNames().contains("SOAPService"));
+ assertEquals(wsdlFile.getFullPath().toOSString(), model.getWsdlURI());
+ assertTrue(model.getPortTypes().contains("Greeter"));
+ assertEquals("org.apache.hello_world_soap_http", model.getCustomPackage());
+
+ //test wsdl2Javacommand
+
+ WSDL2JavaCommand cmdW2j = new WSDL2JavaCommand(model);
+ status = cmdW2j.execute(null, null);
+ assertTrue("failed to execute WSDL2JavaCommand,namely failed to generate web service code", status.isOK());*/
+
+
+
+
}
protected IFacetedProject createJBossWSProject(String baseProjectName, boolean isServerSupplied) throws CoreException {
IProject project = createProject("JBossWSTestProject");
final IFacetedProject fproj = ProjectFacetsManager.create(project);
- installDependentFacets(fproj);
+ //installDependentFacets(fproj);
fproj.installProjectFacet(jbosswsFacetVersion, createJBossWSDataModel(isServerSupplied), null);
assertNotNull(project);
@@ -148,20 +183,10 @@
protected void installDependentFacets(final IFacetedProject fproj) throws CoreException {
fproj.installProjectFacet(javaVersion, null, null);
fproj.installProjectFacet(dynamicWebVersion, null, null);
- fproj.installProjectFacet(jbosswsFacetVersion, null, null);
+ //fproj.installProjectFacet(jbosswsFacetVersion, null, null);
}
-
-
-
-
-
- abstract protected IProject getProject();
- abstract void setUpSeamProjects();
-
- abstract void assertProjectsAreCreated();
-
protected IDataModel createJBossWSDataModel( boolean isServerSupplied) {
@@ -171,7 +196,7 @@
}else{
config.setBooleanProperty(IJBossWSFacetDataModelProperties.JBOSS_WS_DEPLOY, isDeployed);
config.setStringProperty(IJBossWSFacetDataModelProperties.JBOSS_WS_RUNTIME_ID, RuntimeName);
- config.setStringProperty(IJBossWSFacetDataModelProperties.JBOSS_WS_RUNTIME_HOME, RuntimeLocation);
+ config.setStringProperty(IJBossWSFacetDataModelProperties.JBOSS_WS_RUNTIME_HOME, getJBossWSHomeFolder().toString());
}
return config;
}
17 years, 10 months
- 1
- 0
JBoss Tools SVN: r8821 - in trunk/ws/tests/org.jboss.tools.ws.core.test: META-INF and 9 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dennyxu
Date: 2008-06-18 04:03:53 -0400 (Wed, 18 Jun 2008)
New Revision: 8821
Added:
trunk/ws/tests/org.jboss.tools.ws.core.test/projects/
trunk/ws/tests/org.jboss.tools.ws.core.test/projects/JBossWSTestProject/
trunk/ws/tests/org.jboss.tools.ws.core.test/projects/JBossWSTestProject/.classpath
trunk/ws/tests/org.jboss.tools.ws.core.test/projects/JBossWSTestProject/.project
trunk/ws/tests/org.jboss.tools.ws.core.test/projects/JBossWSTestProject/.settings/
trunk/ws/tests/org.jboss.tools.ws.core.test/projects/JBossWSTestProject/.settings/org.eclipse.jdt.core.prefs
trunk/ws/tests/org.jboss.tools.ws.core.test/projects/JBossWSTestProject/.settings/org.eclipse.jst.common.project.facet.core.prefs
trunk/ws/tests/org.jboss.tools.ws.core.test/projects/JBossWSTestProject/.settings/org.eclipse.wst.common.component
trunk/ws/tests/org.jboss.tools.ws.core.test/projects/JBossWSTestProject/.settings/org.eclipse.wst.common.project.facet.core.xml
trunk/ws/tests/org.jboss.tools.ws.core.test/projects/JBossWSTestProject/HelloWorld.wsdl
trunk/ws/tests/org.jboss.tools.ws.core.test/projects/JBossWSTestProject/WebContent/
trunk/ws/tests/org.jboss.tools.ws.core.test/projects/JBossWSTestProject/WebContent/META-INF/
trunk/ws/tests/org.jboss.tools.ws.core.test/projects/JBossWSTestProject/WebContent/META-INF/MANIFEST.MF
trunk/ws/tests/org.jboss.tools.ws.core.test/projects/JBossWSTestProject/WebContent/WEB-INF/
trunk/ws/tests/org.jboss.tools.ws.core.test/projects/JBossWSTestProject/WebContent/WEB-INF/lib/
trunk/ws/tests/org.jboss.tools.ws.core.test/projects/JBossWSTestProject/WebContent/WEB-INF/web.xml
trunk/ws/tests/org.jboss.tools.ws.core.test/projects/JBossWSTestProject/build/
trunk/ws/tests/org.jboss.tools.ws.core.test/projects/JBossWSTestProject/build/classes/
trunk/ws/tests/org.jboss.tools.ws.core.test/projects/JBossWSTestProject/src/
trunk/ws/tests/org.jboss.tools.ws.core.test/src/org/jboss/tools/ws/core/test/command/
trunk/ws/tests/org.jboss.tools.ws.core.test/src/org/jboss/tools/ws/core/test/command/AbstractJBossWSCommandTest.java
Modified:
trunk/ws/tests/org.jboss.tools.ws.core.test/META-INF/MANIFEST.MF
Log:
JBIDE-2323: add unit test for commands
Modified: trunk/ws/tests/org.jboss.tools.ws.core.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.core.test/META-INF/MANIFEST.MF 2008-06-17 23:23:07 UTC (rev 8820)
+++ trunk/ws/tests/org.jboss.tools.ws.core.test/META-INF/MANIFEST.MF 2008-06-18 08:03:53 UTC (rev 8821)
@@ -8,5 +8,11 @@
org.eclipse.core.runtime,
org.junit,
org.jboss.tools.tests,
- org.jboss.tools.ws.core
+ org.jboss.tools.ws.core,
+ org.eclipse.core.resources,
+ org.eclipse.wst.common.project.facet.core,
+ org.eclipse.wst.common.frameworks,
+ org.eclipse.ui.ide,
+ org.jboss.tools.common.test,
+ org.jboss.tools.ws.creation.core
Eclipse-LazyStart: true
Added: trunk/ws/tests/org.jboss.tools.ws.core.test/projects/JBossWSTestProject/.classpath
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.core.test/projects/JBossWSTestProject/.classpath (rev 0)
+++ trunk/ws/tests/org.jboss.tools.ws.core.test/projects/JBossWSTestProject/.classpath 2008-06-18 08:03:53 UTC (rev 8821)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.5.0_15"/>
+ <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
+ <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
+ <classpathentry kind="output" path="build/classes"/>
+</classpath>
Added: trunk/ws/tests/org.jboss.tools.ws.core.test/projects/JBossWSTestProject/.project
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.core.test/projects/JBossWSTestProject/.project (rev 0)
+++ trunk/ws/tests/org.jboss.tools.ws.core.test/projects/JBossWSTestProject/.project 2008-06-18 08:03:53 UTC (rev 8821)
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>JBossWSTestProject</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.wst.common.project.facet.core.builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.wst.validation.validationbuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
+ <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+ </natures>
+</projectDescription>
Added: trunk/ws/tests/org.jboss.tools.ws.core.test/projects/JBossWSTestProject/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.core.test/projects/JBossWSTestProject/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ trunk/ws/tests/org.jboss.tools.ws.core.test/projects/JBossWSTestProject/.settings/org.eclipse.jdt.core.prefs 2008-06-18 08:03:53 UTC (rev 8821)
@@ -0,0 +1,7 @@
+#Wed Jun 18 13:25:53 CST 2008
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
Added: trunk/ws/tests/org.jboss.tools.ws.core.test/projects/JBossWSTestProject/.settings/org.eclipse.jst.common.project.facet.core.prefs
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.core.test/projects/JBossWSTestProject/.settings/org.eclipse.jst.common.project.facet.core.prefs (rev 0)
+++ trunk/ws/tests/org.jboss.tools.ws.core.test/projects/JBossWSTestProject/.settings/org.eclipse.jst.common.project.facet.core.prefs 2008-06-18 08:03:53 UTC (rev 8821)
@@ -0,0 +1,3 @@
+#Wed Jun 18 13:25:53 CST 2008
+classpath.helper/org.eclipse.jdt.launching.JRE_CONTAINER\:\:org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType\:\:jdk1.5.0_15/owners=jst.java\:5.0
+eclipse.preferences.version=1
Added: trunk/ws/tests/org.jboss.tools.ws.core.test/projects/JBossWSTestProject/.settings/org.eclipse.wst.common.component
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.core.test/projects/JBossWSTestProject/.settings/org.eclipse.wst.common.component (rev 0)
+++ trunk/ws/tests/org.jboss.tools.ws.core.test/projects/JBossWSTestProject/.settings/org.eclipse.wst.common.component 2008-06-18 08:03:53 UTC (rev 8821)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project-modules id="moduleCoreId" project-version="1.5.0">
+<wb-module deploy-name="JBossWSTestProject">
+<wb-resource deploy-path="/" source-path="/WebContent"/>
+<wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/>
+<property name="context-root" value="JBossWSTestProject"/>
+<property name="java-output-path" value="build/classes"/>
+</wb-module>
+</project-modules>
Added: trunk/ws/tests/org.jboss.tools.ws.core.test/projects/JBossWSTestProject/.settings/org.eclipse.wst.common.project.facet.core.xml
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.core.test/projects/JBossWSTestProject/.settings/org.eclipse.wst.common.project.facet.core.xml (rev 0)
+++ trunk/ws/tests/org.jboss.tools.ws.core.test/projects/JBossWSTestProject/.settings/org.eclipse.wst.common.project.facet.core.xml 2008-06-18 08:03:53 UTC (rev 8821)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+ <fixed facet="jst.web"/>
+ <fixed facet="jst.java"/>
+ <installed facet="jst.java" version="5.0"/>
+ <installed facet="jst.web" version="2.4"/>
+</faceted-project>
Added: trunk/ws/tests/org.jboss.tools.ws.core.test/projects/JBossWSTestProject/HelloWorld.wsdl
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.core.test/projects/JBossWSTestProject/HelloWorld.wsdl (rev 0)
+++ trunk/ws/tests/org.jboss.tools.ws.core.test/projects/JBossWSTestProject/HelloWorld.wsdl 2008-06-18 08:03:53 UTC (rev 8821)
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<wsdl:definitions name="HelloWorld"
+ targetNamespace="http://www.example.org/HelloWorld/"
+ xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:tns="http://www.example.org/HelloWorld/"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
+ <wsdl:types/>
+ <wsdl:message name="sayHelloRequest">
+ <wsdl:part name="sayHelloRequest" type="xsd:string"></wsdl:part>
+ </wsdl:message>
+ <wsdl:message name="sayHelloResponse">
+ <wsdl:part name="sayHelloResponse" type="xsd:string"></wsdl:part>
+ </wsdl:message>
+ <wsdl:portType name="IHelloWorld">
+ <wsdl:operation name="sayHello">
+ <wsdl:input message="tns:sayHelloRequest"></wsdl:input>
+ <wsdl:output message="tns:sayHelloResponse"></wsdl:output>
+ </wsdl:operation>
+ </wsdl:portType>
+ <wsdl:binding name="HelloWorld" type="tns:IHelloWorld">
+ <soap:binding style="rpc"
+ transport="http://schemas.xmlsoap.org/soap/http" />
+ <wsdl:operation name="sayHello">
+ <soap:operation
+ soapAction="http://www.example.org/HelloWorld/sayHello" />
+ <wsdl:input>
+ <soap:body use="literal"
+ namespace="http://www.example.org/HelloWorld/" />
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="literal"
+ namespace="http://www.example.org/HelloWorld/" />
+ </wsdl:output>
+ </wsdl:operation>
+ </wsdl:binding>
+ <wsdl:service name="HelloWorldService">
+ <wsdl:port name="HelloWorldPort" binding="tns:HelloWorld">
+ <soap:address location="http://localhost:8080/HelloWorld" />
+ </wsdl:port>
+ </wsdl:service>
+</wsdl:definitions>
Added: trunk/ws/tests/org.jboss.tools.ws.core.test/projects/JBossWSTestProject/WebContent/META-INF/MANIFEST.MF
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.core.test/projects/JBossWSTestProject/WebContent/META-INF/MANIFEST.MF (rev 0)
+++ trunk/ws/tests/org.jboss.tools.ws.core.test/projects/JBossWSTestProject/WebContent/META-INF/MANIFEST.MF 2008-06-18 08:03:53 UTC (rev 8821)
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Class-Path:
+
Added: trunk/ws/tests/org.jboss.tools.ws.core.test/projects/JBossWSTestProject/WebContent/WEB-INF/web.xml
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.core.test/projects/JBossWSTestProject/WebContent/WEB-INF/web.xml (rev 0)
+++ trunk/ws/tests/org.jboss.tools.ws.core.test/projects/JBossWSTestProject/WebContent/WEB-INF/web.xml 2008-06-18 08:03:53 UTC (rev 8821)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app id="WebApp_ID" version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
+ <display-name>
+ JBossWSTestProject</display-name>
+ <welcome-file-list>
+ <welcome-file>index.html</welcome-file>
+ <welcome-file>index.htm</welcome-file>
+ <welcome-file>index.jsp</welcome-file>
+ <welcome-file>default.html</welcome-file>
+ <welcome-file>default.htm</welcome-file>
+ <welcome-file>default.jsp</welcome-file>
+ </welcome-file-list>
+</web-app>
Added: trunk/ws/tests/org.jboss.tools.ws.core.test/src/org/jboss/tools/ws/core/test/command/AbstractJBossWSCommandTest.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.core.test/src/org/jboss/tools/ws/core/test/command/AbstractJBossWSCommandTest.java (rev 0)
+++ trunk/ws/tests/org.jboss.tools.ws.core.test/src/org/jboss/tools/ws/core/test/command/AbstractJBossWSCommandTest.java 2008-06-18 08:03:53 UTC (rev 8821)
@@ -0,0 +1,200 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.ws.core.test.command;
+
+import java.io.File;
+import java.util.HashSet;
+import java.util.Set;
+
+import junit.framework.TestCase;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IMarker;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IWorkspace;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
+import org.eclipse.wst.common.project.facet.core.IFacetedProject;
+import org.eclipse.wst.common.project.facet.core.IProjectFacet;
+import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
+import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
+import org.jboss.tools.common.test.util.TestProjectProvider;
+import org.jboss.tools.test.util.JUnitUtils;
+import org.jboss.tools.test.util.xpl.EditorTestHelper;
+import org.jboss.tools.ws.core.classpath.JbossWSRuntime;
+import org.jboss.tools.ws.core.classpath.JbossWSRuntimeManager;
+import org.jboss.tools.ws.core.facet.delegate.IJBossWSFacetDataModelProperties;
+import org.jboss.tools.ws.core.facet.delegate.JBossWSFacetInstallDataModelProvider;
+import org.jboss.tools.ws.creation.core.data.ServiceModel;
+
+abstract public class AbstractJBossWSCommandTest extends TestCase {
+ protected static final IWorkspace ws = ResourcesPlugin.getWorkspace();
+ protected static final IWorkbench wb = PlatformUI.getWorkbench();
+
+
+
+ protected static final String JBOSSWS_HOME = "jbosstools.test.jbossws.eap.home";
+ protected static final String JBOSSWS_HOME_DEFAULT = "F:/jbdevstudio-ga/jboss-eap/seam";
+
+
+ protected final Set<IResource> resourcesToCleanup = new HashSet<IResource>();
+
+ protected static final IProjectFacetVersion dynamicWebVersion;
+ protected static final IProjectFacetVersion javaVersion;
+ protected static final IProjectFacetVersion jbosswsFacetVersion;
+ private static final IProjectFacet jbosswsFacet;
+ private static final String RuntimeName;
+ private static final String RuntimeLocation;
+ private static final boolean isDeployed;
+
+ static String wsdlFileName = "HelloWorld.wsdl";
+ static String BUNDLE = "org.jboss.tools.ws.core.test";
+
+ IProject project;
+ TestProjectProvider provider;
+
+ static {
+ javaVersion = ProjectFacetsManager.getProjectFacet("jst.java").getVersion("5.0");
+ dynamicWebVersion = ProjectFacetsManager.getProjectFacet("jst.web").getVersion("2.5");
+ jbosswsFacet = ProjectFacetsManager.getProjectFacet("jbossws.core");
+ jbosswsFacetVersion = jbosswsFacet.getVersion("1.0");
+ RuntimeName = "testjbosswsruntime";
+ RuntimeLocation = "";
+ isDeployed = false;
+
+
+ }
+
+ public AbstractJBossWSCommandTest() {
+ }
+
+ protected void setUp() throws Exception {
+ super.setUp();
+ JbossWSRuntimeManager.getInstance().addRuntime(RuntimeName, getJBossWSHomeFolder().toString(), "", true);
+ try { EditorTestHelper.joinBackgroundActivities(); }
+ catch (Exception e) { JUnitUtils.fail(e.getMessage(), e); }
+ EditorTestHelper.runEventQueue(3000);
+ }
+
+ private IProject createProject(String prjName) throws CoreException {
+ provider = new TestProjectProvider(BUNDLE,"/projects/"+prjName , prjName, true);
+ IProject prj = provider.getProject();
+ EditorTestHelper.joinBackgroundActivities();
+ return prj;
+ }
+
+
+
+ protected void tearDown() throws Exception {
+ // Wait until all jobs is finished to avoid delete project problems
+ EditorTestHelper.joinBackgroundActivities();
+ EditorTestHelper.runEventQueue(3000);
+ Exception last = null;
+ for (IResource r : this.resourcesToCleanup) {
+ try {
+ System.out.println("Deleting " + r);
+ r.delete(true, null);
+ } catch(Exception e) {
+ System.out.println("Error deleting " + r);
+ e.printStackTrace();
+ last = e;
+ }
+ }
+
+ if(last!=null) throw last;
+
+ resourcesToCleanup.clear();
+ JbossWSRuntime runtime = JbossWSRuntimeManager.getInstance().findRuntimeByName(RuntimeName);
+ JbossWSRuntimeManager.getInstance().removeRuntime(runtime);
+ super.tearDown();
+ }
+
+ public void testInitialCommand() throws CoreException{
+ IFacetedProject fproject = createJBossWSProject("JBossWSTestProject", false);
+ IFile wsdlFile = fproject.getProject().getFile(wsdlFileName);
+ ServiceModel model = new ServiceModel();
+ model.setWsdlURI(wsdlFile.getFullPath().toOSString());
+
+
+ }
+
+ protected IFacetedProject createJBossWSProject(String baseProjectName, boolean isServerSupplied) throws CoreException {
+ IProject project = createProject("JBossWSTestProject");
+ final IFacetedProject fproj = ProjectFacetsManager.create(project);
+
+ installDependentFacets(fproj);
+ fproj.installProjectFacet(jbosswsFacetVersion, createJBossWSDataModel(isServerSupplied), null);
+
+ assertNotNull(project);
+ assertTrue(project.exists());
+ this.addResourceToCleanup(project);
+
+
+ return fproj;
+ }
+
+ protected void installDependentFacets(final IFacetedProject fproj) throws CoreException {
+ fproj.installProjectFacet(javaVersion, null, null);
+ fproj.installProjectFacet(dynamicWebVersion, null, null);
+ fproj.installProjectFacet(jbosswsFacetVersion, null, null);
+ }
+
+
+
+
+
+
+ abstract protected IProject getProject();
+
+ abstract void setUpSeamProjects();
+
+ abstract void assertProjectsAreCreated();
+
+
+
+ protected IDataModel createJBossWSDataModel( boolean isServerSupplied) {
+ IDataModel config = (IDataModel) new JBossWSFacetInstallDataModelProvider().create();
+ if(isServerSupplied){
+ config.setBooleanProperty(IJBossWSFacetDataModelProperties.JBOSS_WS_RUNTIME_IS_SERVER_SUPPLIED, true);
+ }else{
+ config.setBooleanProperty(IJBossWSFacetDataModelProperties.JBOSS_WS_DEPLOY, isDeployed);
+ config.setStringProperty(IJBossWSFacetDataModelProperties.JBOSS_WS_RUNTIME_ID, RuntimeName);
+ config.setStringProperty(IJBossWSFacetDataModelProperties.JBOSS_WS_RUNTIME_HOME, RuntimeLocation);
+ }
+ return config;
+ }
+
+
+
+ protected final void addResourceToCleanup(final IResource resource) {
+ this.resourcesToCleanup.add(resource);
+ }
+
+
+
+
+ protected File getJBossWSHomeFolder() {
+ return new File(System.getProperty(JBOSSWS_HOME, JBOSSWS_HOME_DEFAULT));
+ }
+
+
+
+ protected String getPackagePath(String packageName) {
+ return (packageName == null ? "" : packageName.replace('.', '/'));
+ }
+
+
+
+}
Property changes on: trunk/ws/tests/org.jboss.tools.ws.core.test/src/org/jboss/tools/ws/core/test/command/AbstractJBossWSCommandTest.java
___________________________________________________________________
Name: svn:executable
+ *
17 years, 10 months
- 1
- 0
JBoss Tools SVN: r8820 - in trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools: jsf and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2008-06-17 19:23:07 -0400 (Tue, 17 Jun 2008)
New Revision: 8820
Added:
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/jsf/
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/jsf/test/
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/jsf/test/ManagedBean1.java
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/jsf/test/ManagedBean2.java
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/jsf/test/ManagedBean3.java
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/jsf/test/ManagedBean4.java
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/jsf/test/ManagedBean5.java
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/jsf/test/ManagedBean6.java
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/jsf/test/ManagedBean7.java
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/jsf/test/ManagedBean8.java
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/jsf/test/RefBean1.java
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/jsf/test/RefBean2.java
Removed:
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/test/
Log:
fix 'Cannot find java source'
Copied: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/jsf/test/ManagedBean1.java (from rev 8818, trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/test/ManagedBean1.java)
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/jsf/test/ManagedBean1.java (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/jsf/test/ManagedBean1.java 2008-06-17 23:23:07 UTC (rev 8820)
@@ -0,0 +1,60 @@
+/**
+ *
+ */
+package org.jboss.tools.jsf.test;
+
+/**
+ * @author eskimo
+ *
+ */
+public class ManagedBean1 {
+
+ public ManagedBean1() {
+ }
+
+ private String property1;
+ private String property2;
+ private String property3;
+ private String property4;
+ private RefBean1 property5;
+
+ public String getProperty1() {
+ return property1;
+ }
+
+ public void setProperty1(String property1) {
+ this.property1 = property1;
+ }
+
+ public String getProperty2() {
+ return property2;
+ }
+
+ public void setProperty2(String property2) {
+ this.property2 = property2;
+ }
+
+ public String getProperty3() {
+ return property3;
+ }
+
+ public void setProperty3(String property3) {
+ this.property3 = property3;
+ }
+
+ public String getProperty4() {
+ return property4;
+ }
+
+ public void setProperty4(String property4) {
+ this.property4 = property4;
+ }
+
+ public RefBean1 getProperty5() {
+ return property5;
+ }
+
+ public void setProperty5(RefBean1 property5) {
+ this.property5 = property5;
+ }
+}
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/jsf/test/ManagedBean1.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/jsf/test/ManagedBean2.java (from rev 8818, trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/test/ManagedBean2.java)
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/jsf/test/ManagedBean2.java (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/jsf/test/ManagedBean2.java 2008-06-17 23:23:07 UTC (rev 8820)
@@ -0,0 +1,13 @@
+/**
+ *
+ */
+package org.jboss.tools.jsf.test;
+
+/**
+ * @author eskimo
+ *
+ */
+public class ManagedBean2 {
+ public ManagedBean2() {
+ }
+}
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/jsf/test/ManagedBean2.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/jsf/test/ManagedBean3.java (from rev 8818, trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/test/ManagedBean3.java)
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/jsf/test/ManagedBean3.java (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/jsf/test/ManagedBean3.java 2008-06-17 23:23:07 UTC (rev 8820)
@@ -0,0 +1,13 @@
+/**
+ *
+ */
+package org.jboss.tools.jsf.test;
+
+/**
+ * @author eskimo
+ *
+ */
+public class ManagedBean3 {
+ public ManagedBean3() {
+ }
+}
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/jsf/test/ManagedBean3.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/jsf/test/ManagedBean4.java (from rev 8818, trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/test/ManagedBean4.java)
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/jsf/test/ManagedBean4.java (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/jsf/test/ManagedBean4.java 2008-06-17 23:23:07 UTC (rev 8820)
@@ -0,0 +1,13 @@
+/**
+ *
+ */
+package org.jboss.tools.jsf.test;
+
+/**
+ * @author eskimo
+ *
+ */
+public class ManagedBean4 {
+ public ManagedBean4() {
+ }
+}
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/jsf/test/ManagedBean4.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/jsf/test/ManagedBean5.java (from rev 8818, trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/test/ManagedBean5.java)
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/jsf/test/ManagedBean5.java (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/jsf/test/ManagedBean5.java 2008-06-17 23:23:07 UTC (rev 8820)
@@ -0,0 +1,13 @@
+/**
+ *
+ */
+package org.jboss.tools.jsf.test;
+
+/**
+ * @author eskimo
+ *
+ */
+public class ManagedBean5 {
+ public ManagedBean5() {
+ }
+}
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/jsf/test/ManagedBean5.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/jsf/test/ManagedBean6.java (from rev 8818, trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/test/ManagedBean6.java)
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/jsf/test/ManagedBean6.java (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/jsf/test/ManagedBean6.java 2008-06-17 23:23:07 UTC (rev 8820)
@@ -0,0 +1,13 @@
+/**
+ *
+ */
+package org.jboss.tools.jsf.test;
+
+/**
+ * @author eskimo
+ *
+ */
+public class ManagedBean6 {
+ public ManagedBean6() {
+ }
+}
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/jsf/test/ManagedBean6.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/jsf/test/ManagedBean7.java (from rev 8818, trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/test/ManagedBean7.java)
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/jsf/test/ManagedBean7.java (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/jsf/test/ManagedBean7.java 2008-06-17 23:23:07 UTC (rev 8820)
@@ -0,0 +1,13 @@
+/**
+ *
+ */
+package org.jboss.tools.jsf.test;
+
+/**
+ * @author eskimo
+ *
+ */
+public class ManagedBean7 {
+ public ManagedBean7() {
+ }
+}
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/jsf/test/ManagedBean7.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/jsf/test/ManagedBean8.java (from rev 8818, trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/test/ManagedBean8.java)
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/jsf/test/ManagedBean8.java (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/jsf/test/ManagedBean8.java 2008-06-17 23:23:07 UTC (rev 8820)
@@ -0,0 +1,13 @@
+/**
+ *
+ */
+package org.jboss.tools.jsf.test;
+
+/**
+ * @author eskimo
+ *
+ */
+public class ManagedBean8 {
+ public ManagedBean8() {
+ }
+}
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/jsf/test/ManagedBean8.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/jsf/test/RefBean1.java (from rev 8818, trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/test/RefBean1.java)
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/jsf/test/RefBean1.java (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/jsf/test/RefBean1.java 2008-06-17 23:23:07 UTC (rev 8820)
@@ -0,0 +1,49 @@
+package org.jboss.tools.jsf.test;
+
+public class RefBean1 {
+ private String property1;
+ private String property2;
+ private String property3;
+ private String property4;
+ private RefBean1 property5;
+
+ public String getProperty1() {
+ return property1;
+ }
+
+ public void setProperty1(String property1) {
+ this.property1 = property1;
+ }
+
+ public String getProperty2() {
+ return property2;
+ }
+
+ public void setProperty2(String property2) {
+ this.property2 = property2;
+ }
+
+ public String getProperty3() {
+ return property3;
+ }
+
+ public void setProperty3(String property3) {
+ this.property3 = property3;
+ }
+
+ public String getProperty4() {
+ return property4;
+ }
+
+ public void setProperty4(String property4) {
+ this.property4 = property4;
+ }
+
+ public RefBean1 getProperty5() {
+ return property5;
+ }
+
+ public void setProperty5(RefBean1 property5) {
+ this.property5 = property5;
+ }
+}
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/jsf/test/RefBean1.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/jsf/test/RefBean2.java (from rev 8818, trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/test/RefBean2.java)
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/jsf/test/RefBean2.java (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/jsf/test/RefBean2.java 2008-06-17 23:23:07 UTC (rev 8820)
@@ -0,0 +1,49 @@
+package org.jboss.tools.jsf.test;
+
+public class RefBean2 {
+ private String property6;
+ private String property7;
+ private String property8;
+ private String property9;
+ private RefBean2 property10;
+
+ public String getProperty6() {
+ return property6;
+ }
+
+ public void setProperty6(String property1) {
+ this.property6 = property1;
+ }
+
+ public String getProperty7() {
+ return property7;
+ }
+
+ public void setProperty7(String property2) {
+ this.property7 = property2;
+ }
+
+ public String getProperty8() {
+ return property8;
+ }
+
+ public void setProperty8(String property3) {
+ this.property8 = property3;
+ }
+
+ public String getProperty9() {
+ return property9;
+ }
+
+ public void setProperty9(String property4) {
+ this.property9 = property4;
+ }
+
+ public RefBean2 getProperty10() {
+ return property10;
+ }
+
+ public void setProperty10(RefBean2 property5) {
+ this.property10 = property5;
+ }
+}
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/jsf/test/RefBean2.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
17 years, 10 months
- 1
- 0
JBoss Tools SVN: r8819 - trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2008-06-17 18:20:24 -0400 (Tue, 17 Jun 2008)
New Revision: 8819
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamProject.java
Log:
fix null pointer error during enabling seam for projects without installed wtp jsf facet
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamProject.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamProject.java 2008-06-17 19:42:29 UTC (rev 8818)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamProject.java 2008-06-17 22:20:24 UTC (rev 8819)
@@ -113,7 +113,9 @@
*/
public void configure() throws CoreException {
addToBuildSpec(SeamCoreBuilder.BUILDER_ID);
- DesignTimeApplicationManager.getInstance(project).setVariableResolverProvider(VariableResolver.ID);
+ DesignTimeApplicationManager dtAppManager = DesignTimeApplicationManager.getInstance(project);
+ if(dtAppManager!=null)
+ DesignTimeApplicationManager.getInstance(project).setVariableResolverProvider(VariableResolver.ID);
}
/**
17 years, 10 months
- 1
- 0
JBoss Tools SVN: r8818 - trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/packages.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2008-06-17 15:42:29 -0400 (Tue, 17 Jun 2008)
New Revision: 8818
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/packages/ArchivePublishWizard.java
Log:
JBIDE-485
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/packages/ArchivePublishWizard.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/packages/ArchivePublishWizard.java 2008-06-17 16:31:10 UTC (rev 8817)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/packages/ArchivePublishWizard.java 2008-06-17 19:42:29 UTC (rev 8818)
@@ -3,18 +3,14 @@
import java.util.ArrayList;
import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.jface.viewers.ArrayContentProvider;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.ISelectionChangedListener;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.ListViewer;
import org.eclipse.jface.viewers.SelectionChangedEvent;
import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.viewers.TableViewer;
import org.eclipse.jface.wizard.Wizard;
import org.eclipse.jface.wizard.WizardPage;
import org.eclipse.swt.SWT;
@@ -27,14 +23,13 @@
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
+import org.eclipse.wst.server.core.IServerType;
+import org.eclipse.wst.server.ui.internal.ImageResource;
import org.jboss.ide.eclipse.archives.core.build.SaveArchivesJob;
-import org.jboss.ide.eclipse.archives.core.model.ArchivesModel;
-import org.jboss.ide.eclipse.archives.core.model.ArchivesModelException;
import org.jboss.ide.eclipse.archives.core.model.IArchive;
import org.jboss.ide.eclipse.as.core.modules.ArchivesBuildListener;
import org.jboss.ide.eclipse.as.core.server.IDeployableServer;
import org.jboss.ide.eclipse.as.core.util.ServerConverter;
-import org.jboss.ide.eclipse.as.ui.JBossServerUIPlugin;
public class ArchivePublishWizard extends Wizard {
@@ -70,7 +65,7 @@
public class ArchivePublishWizardPage extends WizardPage {
protected IArchive pack;
- protected ListViewer viewer;
+ protected TableViewer viewer;
protected Button autoDeploy, alwaysPublish;
protected String viewerResult = "";
protected String deployResult = Boolean.toString(false);
@@ -108,7 +103,7 @@
IDeployableServer[] depServers = ServerConverter.getAllDeployableServers();
String[] serverList = servers.split(",");
- final ArrayList selected = new ArrayList();
+ final ArrayList<IDeployableServer> selected = new ArrayList<IDeployableServer>();
for(int i = 0; i < serverList.length; i++ ) {
for( int j = 0; j < depServers.length; j++ ) {
if( serverList[i].equals(depServers[j].getServer().getId()))
@@ -120,18 +115,18 @@
}
protected void fillComposite(Composite mainComposite) {
- viewer = new ListViewer(mainComposite);
+ viewer = new TableViewer(mainComposite);
FormData viewerData = new FormData();
viewerData.left = new FormAttachment(15,0);
viewerData.right = new FormAttachment(85,0);
viewerData.top = new FormAttachment(0,10);
viewerData.bottom = new FormAttachment(80,0);
- viewer.getList().setLayoutData(viewerData);
+ viewer.getTable().setLayoutData(viewerData);
this.alwaysPublish = new Button(mainComposite, SWT.CHECK);
FormData always = new FormData();
always.left = new FormAttachment(15,0);
- always.top = new FormAttachment(viewer.getList(), 5);
+ always.top = new FormAttachment(viewer.getTable(), 5);
alwaysPublish.setLayoutData(always);
alwaysPublish.setText("Always publish to these servers");
@@ -208,6 +203,10 @@
protected class ArchivePublishLabelProvider extends LabelProvider {
public Image getImage(Object element) {
+ if( element instanceof IDeployableServer ) {
+ IServerType type = ((IDeployableServer)element).getServer().getServerType();
+ return ImageResource.getImage(type.getId());
+ }
return null;
}
public String getText(Object element) {
17 years, 10 months
- 1
- 0
JBoss Tools SVN: r8817 - trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor.
by jbosstools-commits＠lists.jboss.org
Author: mareshkau
Date: 2008-06-17 12:31:10 -0400 (Tue, 17 Jun 2008)
New Revision: 8817
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java
Log:
code adjustment
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 2008-06-17 15:55:56 UTC (rev 8816)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java 2008-06-17 16:31:10 UTC (rev 8817)
@@ -450,7 +450,6 @@
VpeEventBean eventBean = getChangeEvents().getFirst();
if (monitor.isCanceled()) {
getChangeEvents().clear();
- sourceSelectionChanged();
return Status.CANCEL_STATUS;
}
try {
@@ -465,7 +464,6 @@
}
getChangeEvents().remove(eventBean);
}
- sourceSelectionChanged();
monitor.done();
return Status.OK_STATUS;
17 years, 10 months
- 1
- 0
JBoss Tools SVN: r8816 - in trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject: JavaSource and 5 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2008-06-17 11:55:56 -0400 (Tue, 17 Jun 2008)
New Revision: 8816
Added:
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/test/
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/test/ManagedBean1.java
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/test/ManagedBean2.java
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/test/ManagedBean3.java
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/test/ManagedBean4.java
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/test/ManagedBean5.java
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/test/ManagedBean6.java
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/test/ManagedBean7.java
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/test/ManagedBean8.java
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/test/RefBean1.java
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/test/RefBean2.java
Removed:
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/WebContent/WEB-INF/.faces-config.xml.jsfdia
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/WebContent/WEB-INF/classes/
Log:
fix test errors: .class files were deleted and JavaSource folder restored
Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/test/ManagedBean1.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/test/ManagedBean1.java (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/test/ManagedBean1.java 2008-06-17 15:55:56 UTC (rev 8816)
@@ -0,0 +1,60 @@
+/**
+ *
+ */
+package org.jboss.tools.jsf.test;
+
+/**
+ * @author eskimo
+ *
+ */
+public class ManagedBean1 {
+
+ public ManagedBean1() {
+ }
+
+ private String property1;
+ private String property2;
+ private String property3;
+ private String property4;
+ private RefBean1 property5;
+
+ public String getProperty1() {
+ return property1;
+ }
+
+ public void setProperty1(String property1) {
+ this.property1 = property1;
+ }
+
+ public String getProperty2() {
+ return property2;
+ }
+
+ public void setProperty2(String property2) {
+ this.property2 = property2;
+ }
+
+ public String getProperty3() {
+ return property3;
+ }
+
+ public void setProperty3(String property3) {
+ this.property3 = property3;
+ }
+
+ public String getProperty4() {
+ return property4;
+ }
+
+ public void setProperty4(String property4) {
+ this.property4 = property4;
+ }
+
+ public RefBean1 getProperty5() {
+ return property5;
+ }
+
+ public void setProperty5(RefBean1 property5) {
+ this.property5 = property5;
+ }
+}
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/test/ManagedBean1.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/test/ManagedBean2.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/test/ManagedBean2.java (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/test/ManagedBean2.java 2008-06-17 15:55:56 UTC (rev 8816)
@@ -0,0 +1,13 @@
+/**
+ *
+ */
+package org.jboss.tools.jsf.test;
+
+/**
+ * @author eskimo
+ *
+ */
+public class ManagedBean2 {
+ public ManagedBean2() {
+ }
+}
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/test/ManagedBean2.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/test/ManagedBean3.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/test/ManagedBean3.java (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/test/ManagedBean3.java 2008-06-17 15:55:56 UTC (rev 8816)
@@ -0,0 +1,13 @@
+/**
+ *
+ */
+package org.jboss.tools.jsf.test;
+
+/**
+ * @author eskimo
+ *
+ */
+public class ManagedBean3 {
+ public ManagedBean3() {
+ }
+}
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/test/ManagedBean3.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/test/ManagedBean4.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/test/ManagedBean4.java (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/test/ManagedBean4.java 2008-06-17 15:55:56 UTC (rev 8816)
@@ -0,0 +1,13 @@
+/**
+ *
+ */
+package org.jboss.tools.jsf.test;
+
+/**
+ * @author eskimo
+ *
+ */
+public class ManagedBean4 {
+ public ManagedBean4() {
+ }
+}
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/test/ManagedBean4.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/test/ManagedBean5.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/test/ManagedBean5.java (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/test/ManagedBean5.java 2008-06-17 15:55:56 UTC (rev 8816)
@@ -0,0 +1,13 @@
+/**
+ *
+ */
+package org.jboss.tools.jsf.test;
+
+/**
+ * @author eskimo
+ *
+ */
+public class ManagedBean5 {
+ public ManagedBean5() {
+ }
+}
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/test/ManagedBean5.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/test/ManagedBean6.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/test/ManagedBean6.java (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/test/ManagedBean6.java 2008-06-17 15:55:56 UTC (rev 8816)
@@ -0,0 +1,13 @@
+/**
+ *
+ */
+package org.jboss.tools.jsf.test;
+
+/**
+ * @author eskimo
+ *
+ */
+public class ManagedBean6 {
+ public ManagedBean6() {
+ }
+}
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/test/ManagedBean6.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/test/ManagedBean7.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/test/ManagedBean7.java (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/test/ManagedBean7.java 2008-06-17 15:55:56 UTC (rev 8816)
@@ -0,0 +1,13 @@
+/**
+ *
+ */
+package org.jboss.tools.jsf.test;
+
+/**
+ * @author eskimo
+ *
+ */
+public class ManagedBean7 {
+ public ManagedBean7() {
+ }
+}
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/test/ManagedBean7.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/test/ManagedBean8.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/test/ManagedBean8.java (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/test/ManagedBean8.java 2008-06-17 15:55:56 UTC (rev 8816)
@@ -0,0 +1,13 @@
+/**
+ *
+ */
+package org.jboss.tools.jsf.test;
+
+/**
+ * @author eskimo
+ *
+ */
+public class ManagedBean8 {
+ public ManagedBean8() {
+ }
+}
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/test/ManagedBean8.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/test/RefBean1.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/test/RefBean1.java (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/test/RefBean1.java 2008-06-17 15:55:56 UTC (rev 8816)
@@ -0,0 +1,49 @@
+package org.jboss.tools.jsf.test;
+
+public class RefBean1 {
+ private String property1;
+ private String property2;
+ private String property3;
+ private String property4;
+ private RefBean1 property5;
+
+ public String getProperty1() {
+ return property1;
+ }
+
+ public void setProperty1(String property1) {
+ this.property1 = property1;
+ }
+
+ public String getProperty2() {
+ return property2;
+ }
+
+ public void setProperty2(String property2) {
+ this.property2 = property2;
+ }
+
+ public String getProperty3() {
+ return property3;
+ }
+
+ public void setProperty3(String property3) {
+ this.property3 = property3;
+ }
+
+ public String getProperty4() {
+ return property4;
+ }
+
+ public void setProperty4(String property4) {
+ this.property4 = property4;
+ }
+
+ public RefBean1 getProperty5() {
+ return property5;
+ }
+
+ public void setProperty5(RefBean1 property5) {
+ this.property5 = property5;
+ }
+}
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/test/RefBean1.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/test/RefBean2.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/test/RefBean2.java (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/test/RefBean2.java 2008-06-17 15:55:56 UTC (rev 8816)
@@ -0,0 +1,49 @@
+package org.jboss.tools.jsf.test;
+
+public class RefBean2 {
+ private String property6;
+ private String property7;
+ private String property8;
+ private String property9;
+ private RefBean2 property10;
+
+ public String getProperty6() {
+ return property6;
+ }
+
+ public void setProperty6(String property1) {
+ this.property6 = property1;
+ }
+
+ public String getProperty7() {
+ return property7;
+ }
+
+ public void setProperty7(String property2) {
+ this.property7 = property2;
+ }
+
+ public String getProperty8() {
+ return property8;
+ }
+
+ public void setProperty8(String property3) {
+ this.property8 = property3;
+ }
+
+ public String getProperty9() {
+ return property9;
+ }
+
+ public void setProperty9(String property4) {
+ this.property9 = property4;
+ }
+
+ public RefBean2 getProperty10() {
+ return property10;
+ }
+
+ public void setProperty10(RefBean2 property5) {
+ this.property10 = property5;
+ }
+}
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/JavaSource/org/jboss/tools/test/RefBean2.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Deleted: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/WebContent/WEB-INF/.faces-config.xml.jsfdia
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/WebContent/WEB-INF/.faces-config.xml.jsfdia 2008-06-17 15:42:49 UTC (rev 8815)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSFPromptingProviderTestProject/WebContent/WEB-INF/.faces-config.xml.jsfdia 2008-06-17 15:55:56 UTC (rev 8816)
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<PROCESS model-entity="JSFProcess"/>
17 years, 10 months
- 1
- 0
JBoss Tools SVN: r8815 - trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor.
by jbosstools-commits＠lists.jboss.org
Author: mareshkau
Date: 2008-06-17 11:42:49 -0400 (Tue, 17 Jun 2008)
New Revision: 8815
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java
Log:
code adjustment
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 2008-06-17 15:30:49 UTC (rev 8814)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java 2008-06-17 15:42:49 UTC (rev 8815)
@@ -450,6 +450,7 @@
VpeEventBean eventBean = getChangeEvents().getFirst();
if (monitor.isCanceled()) {
getChangeEvents().clear();
+ sourceSelectionChanged();
return Status.CANCEL_STATUS;
}
try {
@@ -464,6 +465,7 @@
}
getChangeEvents().remove(eventBean);
}
+ sourceSelectionChanged();
monitor.done();
return Status.OK_STATUS;
17 years, 10 months
- 1
- 0