projects/dwt-addons: dwtx/jface/text/contentassist/CompletionProposalPopup.d comparison

comparison dwtx/jface/text/contentassist/CompletionProposalPopup.d @ 162:1a5b8f8129df

...

author	Frank Benoit <benoit@tionex.de>
date	Mon, 08 Sep 2008 00:51:37 +0200
parents	7926b636c282
children	c3583c6ec027

comparison

equal deleted inserted replaced

-:f8d52b926852
+:1a5b8f8129df
 if (!Helper.okToUse(fProposalShell))
 return;
 int accelerator= SWTKeySupport.convertEventToUnmodifiedAccelerator(e);
 KeySequence sequence= KeySequence.getInstance(SWTKeySupport.convertAcceleratorToKeyStroke(accelerator));
-if (sequence.equals(fCommandSequence))
+if (sequence==/++/fCommandSequence)
 if (fContentAssistant.isPrefixCompletionEnabled())
 incrementalComplete();
 else
 showProposals(false);
 createMessageText();
 }
 GridData data= new GridData(GridData.FILL_BOTH);
-Point size= fContentAssistant.restoreCompletionProposalPopupSize();
+Point size= fContentAssistant.restoreCompletionProposalPopupSize_package();
 if (size !is null) {
 fProposalTable.setLayoutData(data);
 fProposalShell.setSize(size);
 } else {
 int height= fProposalTable.getItemHeight() * 10;
 // use golden ratio as default aspect ratio
-final double aspectRatio= (1 + Math.sqrt(5)) / 2;
+double aspectRatio= (1 + Math.sqrt(5.0f)) / 2;
 int width= cast(int) (height * aspectRatio);
 Rectangle trim= fProposalTable.computeTrim(0, 0, width, height);
 data.heightHint= trim.height;
 data.widthHint= trim.width;
 fProposalTable.setLayoutData(data);
 private void createMessageText() {
 if (fMessageText is null) {
 fMessageText= new Label(fProposalShell, DWT.RIGHT);
 GridData textData= new GridData(DWT.FILL, DWT.BOTTOM, true, false);
 fMessageText.setLayoutData(textData);
-fMessageText.setText(fContentAssistant.getStatusMessage() + " "); //$NON-NLS-1$
+fMessageText.setText(fContentAssistant.getStatusMessage() ~ " "); //$NON-NLS-1$
 if (fMessageTextFont is null) {
 Font font= fMessageText.getFont();
 Display display= fProposalShell.getDisplay();
 FontData[] fontDatas= font.getFontData();
 for (int i= 0; i < fontDatas.length; i++)
 item.setText(displayString);
 if (fIsColoredLabelsSupportEnabled)
 TableOwnerDrawSupport.storeStyleRanges(item, 0, styleRanges);
 item.setImage(current.getImage());
-item.setData(current);
+item.setData(cast(Object)current);
 } else {
 // this should not happen, but does on win32
 }
 }
 }
 fFilteredProposals= null;
 fComputedProposals= null;
-fContentAssistant.possibleCompletionsClosed();
+fContentAssistant.possibleCompletionsClosed_package();
 }
 /**
 *Returns whether this popup is active. It is active if the proposal selector is visible.
 *
 for (int i= 0; i < items.length; i++) {
 TableItem item= items[i];
 ICompletionProposal proposal= proposals[i];
 item.setText(proposal.getDisplayString());
 item.setImage(proposal.getImage());
-item.setData(proposal);
+item.setData(cast(Object)proposal);
 }
 fProposalTable.setRedraw(true);
 }
 Point currentLocation= fProposalShell.getLocation();
 *
 * @return the location of this popup
 */
 private Point getLocation() {
 int caret= fContentAssistSubjectControlAdapter.getCaretOffset();
-Rectangle location= fContentAssistant.getLayoutManager().computeBoundsBelowAbove(fProposalShell, fSize is null ? fProposalShell.getSize() : fSize, caret, this);
+Rectangle location= fContentAssistant.getLayoutManager().computeBoundsBelowAbove_package(fProposalShell, fSize is null ? fProposalShell.getSize() : fSize, caret, this);
 return Geometry.getLocation(location);
 }
 /**
 * Returns the size of this completion proposal popup.
 if (cast(ICompletionProposalExtension2)proposals[i] ) {
 ICompletionProposalExtension2 p= cast(ICompletionProposalExtension2) proposals[i];
 if (p.validate(document, offset, event))
-filtered.add(p);
+filtered.add(cast(Object)p);
 } else if (cast(ICompletionProposalExtension)proposals[i] ) {
 ICompletionProposalExtension p= cast(ICompletionProposalExtension) proposals[i];
 if (p.isValidFor(document, offset))
-filtered.add(p);
+filtered.add(cast(Object)p);
 } else {
 // restore original behavior
 fIsFilteredSubset= false;
 fInvocationOffset= offset;
 // 1: extract pre- and postfix from all remaining proposals
 IDocument document= fContentAssistSubjectControlAdapter.getDocument();
 // contains the common postfix in the case that there are any proposals matching our LHS
-StringBuffer rightCasePostfix= null;
+StringBuffer rightCasePostfix;
 List rightCase= new ArrayList();
 bool isWrongCaseMatch= false;
 // the prefix of all case insensitive matches. This differs from the document
 // contents and will be replaced.
 CharSequence wrongCasePrefix= null;
 int wrongCasePrefixStart= 0;
 // contains the common postfix of all case-insensitive matches
-StringBuffer wrongCasePostfix= null;
+StringBuffer wrongCasePostfix;
 List wrongCase= new ArrayList();
 for (int i= 0; i < fFilteredProposals.length; i++) {
 ICompletionProposal proposal= fFilteredProposals[i];
 return false;
 int start= (cast(ICompletionProposalExtension3)proposal).getPrefixCompletionStart(fContentAssistSubjectControlAdapter.getDocument(), fFilterOffset);
 CharSequence insertion= (cast(ICompletionProposalExtension3)proposal).getPrefixCompletionText(fContentAssistSubjectControlAdapter.getDocument(), fFilterOffset);
 if (insertion is null)
-insertion= proposal.getDisplayString();
+insertion= new StringCharSequence(proposal.getDisplayString());
 try {
 int prefixLength= fFilterOffset - start;
 int relativeCompletionOffset= Math.min(insertion.length(), prefixLength);
 String prefix= document.get(start, prefixLength);
 if (!isWrongCaseMatch && insertion.toString().startsWith(prefix)) {
 isWrongCaseMatch= false;
-rightCase.add(proposal);
+rightCase.add(cast(Object)proposal);
 CharSequence newPostfix= insertion.subSequence(relativeCompletionOffset, insertion.length());
 if (rightCasePostfix is null)
 rightCasePostfix= new StringBuffer(newPostfix.toString());
 else
 truncatePostfix(rightCasePostfix, newPostfix);
 CharSequence newPostfix= insertion.subSequence(relativeCompletionOffset, insertion.length());
 if (wrongCasePostfix is null)
 wrongCasePostfix= new StringBuffer(newPostfix.toString());
 else
 truncatePostfix(wrongCasePostfix, newPostfix);
-wrongCase.add(proposal);
+wrongCase.add(cast(Object)proposal);
 } else {
 return false;
 }
 } else
 return false;
 CharSequence prefix;
 if (isWrongCaseMatch)
 prefix= wrongCasePrefix;
 else
-prefix= "";  //$NON-NLS-1$
+prefix= new StringCharSequence("");  //$NON-NLS-1$
 CharSequence postfix;
 if (isWrongCaseMatch)
-postfix= wrongCasePostfix;
+postfix= new StringCharSequence(wrongCasePostfix.toString);
 else
-postfix= rightCasePostfix;
+postfix= new StringCharSequence(rightCasePostfix.toString);
 if (prefix is null || postfix is null)
 return false;
 try {
 int to= Math.min(document.getLength(), fFilterOffset + postfix.length());
 StringBuffer inDocument= new StringBuffer(document.get(fFilterOffset, to - fFilterOffset));
 truncatePostfix(inDocument, postfix);
 // 5: replace and reveal
-document.replace(fFilterOffset - prefix.length(), prefix.length() + inDocument.length(), prefix.toString() + postfix.toString());
+document.replace(fFilterOffset - prefix.length(), prefix.length() + inDocument.length(), prefix.toString() ~ postfix.toString());
 fContentAssistSubjectControlAdapter.setSelectedRange(fFilterOffset + postfix.length(), 0);
 fContentAssistSubjectControlAdapter.revealRange(fFilterOffset + postfix.length(), 0);
 fFilterOffset+= postfix.length();
 fLastCompletionOffset= fFilterOffset;
 int min= Math.min(oneOffset, twoOffset);
 int oneEnd= oneOffset + oneSequence.length();
 int twoEnd= twoOffset + twoSequence.length();
-String one= document.get(oneOffset, min - oneOffset) + oneSequence + document.get(oneEnd, Math.min(fFilterOffset, fFilterOffset - oneEnd));
+String one= document.get(oneOffset, min - oneOffset) ~ oneSequence.toString ~ document.get(oneEnd, Math.min(fFilterOffset, fFilterOffset - oneEnd));
-String two= document.get(twoOffset, min - twoOffset) + twoSequence + document.get(twoEnd, Math.min(fFilterOffset, fFilterOffset - twoEnd));
+String two= document.get(twoOffset, min - twoOffset) ~ twoSequence.toString ~ document.get(twoEnd, Math.min(fFilterOffset, fFilterOffset - twoEnd));
 return one.equals(two);
 }
 /**
 */
 private void truncatePostfix(StringBuffer buffer, CharSequence sequence) {
 // find common prefix
 int min= Math.min(buffer.length(), sequence.length());
 for (int c= 0; c < min; c++) {
-if (sequence.charAt(c) !is buffer.charAt(c)) {
+if (sequence.charAt(c) !is buffer.slice()[c]) {
-buffer.delete_(c, buffer.length());
+buffer.truncate(c);
 return;
 }
 }
 // all equal up to minimum
-buffer.delete_(min, buffer.length());
+buffer.truncate(min);
 }
 /**
 * Sets the message for the repetition affordance text at the bottom of the proposal. Only has
 * an effect if {@link ContentAssistant#isRepeatedInvocationMode()} returns <code>true</code>.
 * @since 3.2
 */
 void setMessage(String message) {
 Assert.isNotNull(message);
 if (isActive() && fMessageText !is null)
-fMessageText.setText(message + " "); //$NON-NLS-1$
+fMessageText.setText(message ~ " "); //$NON-NLS-1$
 }
 /**
 * Sets the text to be displayed if no proposals are available. Only has an effect if
 * {@link ContentAssistant#isShowEmptyList()} returns <code>true</code>.

Mercurial > projects > dwt-addons

comparison dwtx/jface/text/contentassist/CompletionProposalPopup.d @ 162:1a5b8f8129df