X-Git-Url: http://git.phpeclipse.com diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/template/contentassist/VariablePosition.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/template/contentassist/VariablePosition.java index 5edace0..730d911 100644 --- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/template/contentassist/VariablePosition.java +++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/template/contentassist/VariablePosition.java @@ -10,34 +10,38 @@ *******************************************************************************/ package net.sourceforge.phpdt.internal.ui.text.template.contentassist; -import org.eclipse.jface.text.Assert; +//incastrix +//import org.eclipse.jface.text.Assert; +import org.eclipse.core.runtime.Assert; import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.contentassist.ICompletionProposal; import org.eclipse.jface.text.link.LinkedPositionGroup; import org.eclipse.jface.text.link.ProposalPosition; - /** * */ public class VariablePosition extends ProposalPosition { private MultiVariableGuess fGuess; + private MultiVariable fVariable; - public VariablePosition(IDocument document, int offset, int length, MultiVariableGuess guess, MultiVariable variable) { - this(document, offset, length, LinkedPositionGroup.NO_STOP, guess, variable); + public VariablePosition(IDocument document, int offset, int length, + MultiVariableGuess guess, MultiVariable variable) { + this(document, offset, length, LinkedPositionGroup.NO_STOP, guess, + variable); } - - public VariablePosition(IDocument document, int offset, int length, int sequence, MultiVariableGuess guess, MultiVariable variable) { + + public VariablePosition(IDocument document, int offset, int length, + int sequence, MultiVariableGuess guess, MultiVariable variable) { super(document, offset, length, sequence, null); Assert.isNotNull(guess); Assert.isNotNull(variable); - fVariable= variable; - fGuess= guess; + fVariable = variable; + fGuess = guess; } - - + /* * @see org.eclipse.jface.text.link.ProposalPosition#equals(java.lang.Object) */ @@ -47,14 +51,14 @@ public class VariablePosition extends ProposalPosition { } return false; } - + /* * @see org.eclipse.jface.text.link.ProposalPosition#hashCode() */ public int hashCode() { return super.hashCode() | fGuess.hashCode(); } - + /* * @see org.eclipse.jface.text.link.ProposalPosition#getChoices() */ @@ -68,5 +72,5 @@ public class VariablePosition extends ProposalPosition { public MultiVariable getVariable() { return fVariable; } - + }