diff --git a/editor.lib2/apichanges.xml b/editor.lib2/apichanges.xml
--- a/editor.lib2/apichanges.xml
+++ b/editor.lib2/apichanges.xml
@@ -104,6 +104,19 @@
     <!-- ACTUAL CHANGES BEGIN HERE: -->
 
     <changes>
+        <change id="added-line-column-based-dialog-bindings">
+            <summary>Adding line/column based dialog bindings</summary>
+            <version major="1" minor="24"/>
+            <date day="26" month="3" year="2010"/>
+            <author login="vstejskal"/>
+            <compatibility binary="compatible" source="compatible" semantic="compatible" addition="yes"/>
+            <description>
+                Added <code>DialogBinding.bindComponentToDocument(FileObject fileObject, int line, int column, int length, JTextComponent component)</code>
+                and <code>DialogBinding.bindComponentToDocument(Document fileObject, int line, int column, int length, JTextComponent component)</code>.
+            </description>
+            <issue number="181523"/>
+        </change>
+
         <change id="added-toggleNonPrintableCharacters">
             <summary>EditorActionNames.toggleNonPrintableCharacters added.</summary>
             <version major="1" minor="20"/>
diff --git a/editor.lib2/nbproject/project.properties b/editor.lib2/nbproject/project.properties
--- a/editor.lib2/nbproject/project.properties
+++ b/editor.lib2/nbproject/project.properties
@@ -40,7 +40,7 @@
 is.autoload=true
 javac.source=1.6
 javac.compilerargs=-Xlint:unchecked
-spec.version.base=1.23
+spec.version.base=1.24
 
 javadoc.arch=${basedir}/arch.xml
 javadoc.apichanges=${basedir}/apichanges.xml
diff --git a/editor.lib2/src/org/netbeans/api/editor/DialogBinding.java b/editor.lib2/src/org/netbeans/api/editor/DialogBinding.java
--- a/editor.lib2/src/org/netbeans/api/editor/DialogBinding.java
+++ b/editor.lib2/src/org/netbeans/api/editor/DialogBinding.java
@@ -46,34 +46,100 @@
  */
 public final class DialogBinding {
 
+    // -----------------------------------------------------------------------
+    // Public implementation
+    // -----------------------------------------------------------------------
+
     /**
      * Bind given component and given file together.
+     *
      * @param fileObject to bind
      * @param offset position at which content of the component will be virtually placed
      * @param length how many characters replace from the original file
      * @param component component to bind
      */
-    public static void bindComponentToFile(final FileObject fileObject, int offset, int length, final JTextComponent component) {
+    public static void bindComponentToFile(FileObject fileObject, int offset, int length, JTextComponent component) {
         Parameters.notNull("fileObject", fileObject); //NOI18N
         Parameters.notNull("component", component); //NOI18N
-        if (!fileObject.isValid() || !fileObject.isData())
+        if (!fileObject.isValid() || !fileObject.isData()) {
             return;
+        }
+        if (offset < 0 || offset > fileObject.getSize()) {
+            throw new IllegalArgumentException("Invalid offset=" + offset + "; file.size=" + fileObject.getSize()); //NOI18N
+        }
+        if (length < 0 || offset + length > fileObject.getSize()) {
+            throw new IllegalArgumentException("Invalid lenght=" + length + "; offset=" + offset + ", file.size=" + fileObject.getSize()); //NOI18N
+        }
         bind(component, null, fileObject, offset, -1, -1, length, fileObject.getMIMEType());
     }
 
     /**
      * Bind given component and given document together.
+     *
      * @param document to bind
      * @param offset position at which content of the component will be virtually placed
      * @param length how many characters replace from the original document
      * @param component component to bind
      */
-    public static void bindComponentToDocument(final Document document, int offset, int length, final JTextComponent component) {
+    public static void bindComponentToDocument(Document document, int offset, int length, JTextComponent component) {
         Parameters.notNull("document", document); //NOI18N
         Parameters.notNull("component", component); //NOI18N
+        if (offset < 0 || offset > document.getLength()) {
+            throw new IllegalArgumentException("Invalid offset=" + offset + "; file.size=" + document.getLength()); //NOI18N
+        }
+        if (length < 0 || offset + length > document.getLength()) {
+            throw new IllegalArgumentException("Invalid lenght=" + length + "; offset=" + offset + ", file.size=" + document.getLength()); //NOI18N
+        }
         bind(component, document, null, offset, -1, -1, length, (String)document.getProperty("mimeType")); //NOI18N
     }
 
+    /**
+     * Bind given component and given file together.
+     * 
+     * @param fileObject to bind
+     * @param line an index (zero based) of the line where to place the component's content
+     * @param column position (number of characters) at the line where to place the content
+     * @param length how many characters replace from the original file
+     * @param component component to bind
+     *
+     * @since 1.24
+     */
+    public static void bindComponentToFile(FileObject fileObject, int line, int column, int length, JTextComponent component) {
+        Parameters.notNull("fileObject", fileObject); //NOI18N
+        Parameters.notNull("component", component); //NOI18N
+        if (!fileObject.isValid() || !fileObject.isData()) {
+            return;
+        }
+        if (line < 0 || column < 0) {
+            throw new IllegalArgumentException("Invalid line=" + line + " or column=" + column); //NOI18N
+        }
+        bind(component, null, fileObject, -1, line, column, length, fileObject.getMIMEType());
+    }
+
+    /**
+     * Bind given component and given document together.
+     *
+     * @param document to bind
+     * @param line an index (zero based) of the line where to place the component's content
+     * @param column position (number of characters) at the line where to place the content
+     * @param length how many characters replace from the original document
+     * @param component component to bind
+     *
+     * @since 1.24
+     */
+    public static void bindComponentToDocument(Document document, int line, int column, int length, JTextComponent component) {
+        Parameters.notNull("document", document); //NOI18N
+        Parameters.notNull("component", component); //NOI18N
+        if (line < 0 || column < 0) {
+            throw new IllegalArgumentException("Invalid line=" + line + " or column=" + column); //NOI18N
+        }
+        bind(component, document, null, -1, line, column, length, (String)document.getProperty("mimeType")); //NOI18N
+    }
+
+    // -----------------------------------------------------------------------
+    // Private implementation
+    // -----------------------------------------------------------------------
+
     // -J-Dorg.netbeans.api.editor.DialogBinding.level=FINE
     private static final Logger LOG = Logger.getLogger(DialogBinding.class.getName());