[autocomplete] 17/143: Fix for auto-closing parens in parameter assistance. Javadoc fixes.
Benjamin Mesing
ben at alioth.debian.org
Sat Oct 19 12:53:10 UTC 2013
This is an automated email from the git hooks/post-receive script.
ben pushed a commit to branch master
in repository autocomplete.
commit f01bdc4bf2c9897cb2289e1411c829788cdc247e
Author: bobbylight <robert at fifesoft.com>
Date: Sun Feb 22 20:25:23 2009 +0000
Fix for auto-closing parens in parameter assistance. Javadoc fixes.
---
build.xml | 8 ++++----
src/org/fife/ui/autocomplete/AutoCompletion.java | 12 ++++++------
.../fife/ui/autocomplete/DefaultCompletionProvider.java | 2 +-
src/org/fife/ui/autocomplete/FunctionCompletion.java | 4 ++--
src/org/fife/ui/autocomplete/MarkupTagCompletion.java | 2 +-
.../ParameterizedCompletionDescriptionToolTip.java | 5 +++--
6 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/build.xml b/build.xml
index 211d6b9..017d12e 100644
--- a/build.xml
+++ b/build.xml
@@ -11,8 +11,8 @@
3. make-javadoc: Creates the javadoc for RSyntaxTextArea.
Author: Robert Futrell
- Version: 0.1
- Date: 12dec2008
+ Version: 0.2
+ Date: 22feb2009
-->
@@ -23,7 +23,7 @@
<!-- Set global properties for this build. -->
- <property name="version" value="0.1"/>
+ <property name="version" value="0.2"/>
<property name="source-dir" location="src"/>
<property name="class-dir" location="ant-classes"/>
<property name="dist-dir" location="dist"/>
@@ -83,7 +83,7 @@
<!-- Builds the javadoc. -->
<target name="make-javadoc" depends="compile">
<javadoc destdir="${doc-dir}" author="true" version="true"
- breakiterator="yes">
+ breakiterator="yes" classpath="../RSyntaxTextArea/dist/rsyntaxtextarea.jar">
<packageset dir="${source-dir}" defaultexcludes="yes">
<include name="org/**"/>
</packageset>
diff --git a/src/org/fife/ui/autocomplete/AutoCompletion.java b/src/org/fife/ui/autocomplete/AutoCompletion.java
index cc2802c..8d10c42 100644
--- a/src/org/fife/ui/autocomplete/AutoCompletion.java
+++ b/src/org/fife/ui/autocomplete/AutoCompletion.java
@@ -767,7 +767,7 @@ try {
/**
- * Sets the keystroke that should be used to trigger the autocomplete
+ * Sets the keystroke that should be used to trigger the auto-complete
* popup window.
*
* @param ks The keystroke.
@@ -791,7 +791,7 @@ try {
/**
- * Uninstalls this autocompletion from its text component. If it is not
+ * Uninstalls this auto-completion from its text component. If it is not
* installed on any text component, nothing happens.
*
* @see #install(JTextComponent)
@@ -829,7 +829,7 @@ try {
/**
* Replaces the "trigger key" action with the one that was there
- * before autocompletion was installed.
+ * before auto-completion was installed.
*
* @see #installTriggerKey(KeyStroke)
*/
@@ -857,8 +857,8 @@ try {
/**
- * The <code>Action</code> that displays the popup window if autocompletion
- * is enabled.
+ * The <code>Action</code> that displays the popup window if
+ * auto-completion is enabled.
*
* @author Robert Futrell
* @version 1.0
@@ -879,7 +879,7 @@ try {
/**
* Listens for events in the parent window of the text component with
- * autocompletion enabled.
+ * auto-completion enabled.
*
* @author Robert Futrell
* @version 1.0
diff --git a/src/org/fife/ui/autocomplete/DefaultCompletionProvider.java b/src/org/fife/ui/autocomplete/DefaultCompletionProvider.java
index 62dc1e5..d701689 100644
--- a/src/org/fife/ui/autocomplete/DefaultCompletionProvider.java
+++ b/src/org/fife/ui/autocomplete/DefaultCompletionProvider.java
@@ -84,7 +84,7 @@ public class DefaultCompletionProvider extends AbstractCompletionProvider {
*
* @param words The words to offer as completion suggestions. If this is
* <code>null</code>, no completions will be known.
- * @see WordCompletion
+ * @see BasicCompletion
*/
public DefaultCompletionProvider(String[] words) {
init();
diff --git a/src/org/fife/ui/autocomplete/FunctionCompletion.java b/src/org/fife/ui/autocomplete/FunctionCompletion.java
index 25cfd71..ec0f376 100644
--- a/src/org/fife/ui/autocomplete/FunctionCompletion.java
+++ b/src/org/fife/ui/autocomplete/FunctionCompletion.java
@@ -153,7 +153,7 @@ public class FunctionCompletion extends VariableCompletion
/**
- * Returns the specified {@link Parameter}.
+ * Returns the specified {@link ParameterizedCompletion.Parameter}.
*
* @param index The index of the parameter to retrieve.
* @return The parameter.
@@ -224,7 +224,7 @@ public class FunctionCompletion extends VariableCompletion
* Sets the parameters to this function.
*
* @param params The parameters. This should be a list of
- * {@link Parameter}s.
+ * {@link ParameterizedCompletion.Parameter}s.
* @see #getParam(int)
* @see #getParamCount()
*/
diff --git a/src/org/fife/ui/autocomplete/MarkupTagCompletion.java b/src/org/fife/ui/autocomplete/MarkupTagCompletion.java
index 0cdffca..6d1d87b 100644
--- a/src/org/fife/ui/autocomplete/MarkupTagCompletion.java
+++ b/src/org/fife/ui/autocomplete/MarkupTagCompletion.java
@@ -96,7 +96,7 @@ public class MarkupTagCompletion extends AbstractCompletion {
/**
- * Returns the specified {@link Parameter}.
+ * Returns the specified {@link ParameterizedCompletion.Parameter}.
*
* @param index The index of the attribute to retrieve.
* @return The attribute.
diff --git a/src/org/fife/ui/autocomplete/ParameterizedCompletionDescriptionToolTip.java b/src/org/fife/ui/autocomplete/ParameterizedCompletionDescriptionToolTip.java
index ed32d6a..575381b 100644
--- a/src/org/fife/ui/autocomplete/ParameterizedCompletionDescriptionToolTip.java
+++ b/src/org/fife/ui/autocomplete/ParameterizedCompletionDescriptionToolTip.java
@@ -604,11 +604,12 @@ class ParameterizedCompletionDescriptionToolTip {
for (int i=0; i<paramHighlights.size(); i++) {
Highlight h = (Highlight)paramHighlights.get(i);
if (offs>=h.getStartOffset() && offs<=h.getEndOffset()) {
- int len = h.getEndOffset() - h.getStartOffset();
+ int start = h.getStartOffset() + 1;
+ int len = h.getEndOffset() - start;
JTextComponent tc = ac.getTextComponent();
Document doc = tc.getDocument();
try {
- return doc.getText(h.getStartOffset(), len);
+ return doc.getText(start, len);
} catch (BadLocationException ble) {
UIManager.getLookAndFeel().provideErrorFeedback(tc);
ble.printStackTrace();
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/autocomplete.git
More information about the pkg-java-commits
mailing list