1.1 --- a/visualweb.designer.jsf/src/org/netbeans/modules/visualweb/designer/jsf/JsfForm.java Thu May 28 10:28:19 2009 +0200
1.2 +++ b/visualweb.designer.jsf/src/org/netbeans/modules/visualweb/designer/jsf/JsfForm.java Tue Jun 02 14:19:30 2009 +0400
1.3 @@ -112,6 +112,8 @@
1.4 import org.openide.loaders.DataObject;
1.5 import org.openide.loaders.DataObjectNotFoundException;
1.6 import org.openide.text.Line;
1.7 +import org.openide.text.Line.ShowOpenType;
1.8 +import org.openide.text.Line.ShowVisibilityType;
1.9 import org.openide.util.Exceptions;
1.10 import org.openide.util.WeakListeners;
1.11 import org.openide.util.WeakSet;
1.12 @@ -2813,7 +2815,7 @@
1.13 // -1: convert line numbers to be zero-based
1.14 Line line = ls.getCurrent(lineno-1);
1.15 // TODO - pass in a column too?
1.16 - line.show(Line.SHOW_GOTO, column);
1.17 + line.show(ShowOpenType.OPEN, ShowVisibilityType.FOCUS, column);
1.18 }
1.19 }
1.20 }
2.1 --- a/visualweb.designer.jsf/src/org/netbeans/modules/visualweb/designer/jsf/ui/ErrorPanelImpl.java Thu May 28 10:28:19 2009 +0200
2.2 +++ b/visualweb.designer.jsf/src/org/netbeans/modules/visualweb/designer/jsf/ui/ErrorPanelImpl.java Tue Jun 02 14:19:30 2009 +0400
2.3 @@ -89,6 +89,8 @@
2.4 import org.openide.loaders.DataObject;
2.5 import org.openide.loaders.DataObjectNotFoundException;
2.6 import org.openide.text.Line;
2.7 +import org.openide.text.Line.ShowOpenType;
2.8 +import org.openide.text.Line.ShowVisibilityType;
2.9 import org.openide.util.NbBundle;
2.10
2.11 import org.w3c.tidy.Tidy;
2.12 @@ -256,7 +258,7 @@
2.13 if (ls != null) {
2.14 // -1: convert line numbers to be zero-based
2.15 Line line = ls.getCurrent(selected.getLine() - 1);
2.16 - line.show(Line.SHOW_GOTO);
2.17 + line.show(ShowOpenType.OPEN, ShowVisibilityType.FOCUS);
2.18 }
2.19 }
2.20 }
3.1 --- a/visualweb.errorhandler/src/org/netbeans/modules/visualweb/errorhandler/ClientSocketConnectionThread.java Thu May 28 10:28:19 2009 +0200
3.2 +++ b/visualweb.errorhandler/src/org/netbeans/modules/visualweb/errorhandler/ClientSocketConnectionThread.java Tue Jun 02 14:19:30 2009 +0400
3.3 @@ -46,14 +46,10 @@
3.4 import java.beans.PropertyChangeEvent;
3.5 import java.beans.PropertyChangeListener;
3.6 import java.io.BufferedReader;
3.7 -import java.io.File;
3.8 import java.io.IOException;
3.9 import java.io.InputStreamReader;
3.10 import java.io.PrintWriter;
3.11 -import java.net.ServerSocket;
3.12 import java.net.Socket;
3.13 -import java.util.Date;
3.14 -import javax.swing.JTextArea;
3.15 import javax.swing.SwingUtilities;
3.16 import org.openide.ErrorManager;
3.17 import org.openide.cookies.EditorCookie;
3.18 @@ -63,6 +59,8 @@
3.19 import org.openide.text.Annotatable;
3.20 import org.openide.text.Annotation;
3.21 import org.openide.text.Line;
3.22 +import org.openide.text.Line.ShowOpenType;
3.23 +import org.openide.text.Line.ShowVisibilityType;
3.24 import org.openide.windows.WindowManager;
3.25
3.26 /*
3.27 @@ -234,7 +232,7 @@
3.28 SwingUtilities.invokeLater(new Runnable(){
3.29 public void run(){
3.30 attachAsNeeded(line);
3.31 - line.show(Line.SHOW_GOTO);
3.32 + line.show(ShowOpenType.OPEN, ShowVisibilityType.FOCUS);
3.33 WindowManager.getDefault().getMainWindow().toFront();
3.34 }
3.35 });
4.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/Util.java Thu May 28 10:28:19 2009 +0200
4.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/Util.java Tue Jun 02 14:19:30 2009 +0400
4.3 @@ -71,7 +71,6 @@
4.4 import org.netbeans.modules.visualweb.xhtml.F_Verbatim;
4.5 import java.beans.PropertyDescriptor;
4.6 import java.io.File;
4.7 -import java.io.InputStream;
4.8 import java.io.InputStreamReader;
4.9 import java.io.IOException;
4.10 import java.io.StringWriter;
4.11 @@ -95,7 +94,8 @@
4.12 import org.openide.loaders.DataObject;
4.13 import org.openide.loaders.DataObjectNotFoundException;
4.14 import org.openide.text.Line;
4.15 -import org.netbeans.modules.visualweb.extension.openide.util.Trace;
4.16 +import org.openide.text.Line.ShowOpenType;
4.17 +import org.openide.text.Line.ShowVisibilityType;
4.18 import org.openide.util.NbBundle;
4.19 import org.openide.windows.IOProvider;
4.20 import org.openide.windows.InputOutput;
4.21 @@ -1443,7 +1443,7 @@
4.22 // -1: convert line numbers to be zero-based
4.23 Line line = ls.getCurrent(lineno-1);
4.24 // TODO - pass in a column too?
4.25 - line.show(Line.SHOW_GOTO, column);
4.26 + line.show(ShowOpenType.OPEN, ShowVisibilityType.FOCUS, column);
4.27 }
4.28 }
4.29 }
5.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/models/FacesModel.java Thu May 28 10:28:19 2009 +0200
5.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/models/FacesModel.java Tue Jun 02 14:19:30 2009 +0400
5.3 @@ -69,6 +69,8 @@
5.4 import org.openide.loaders.DataObjectNotFoundException;
5.5 import org.openide.loaders.OperationEvent;
5.6 import org.openide.loaders.OperationListener;
5.7 +import org.openide.text.Line.ShowOpenType;
5.8 +import org.openide.text.Line.ShowVisibilityType;
5.9 import org.openide.util.Lookup;
5.10 import org.openide.util.NbBundle;
5.11 import org.netbeans.modules.visualweb.extension.openide.util.Trace;
5.12 @@ -1429,7 +1431,7 @@
5.13 Line.Set ls = lc.getLineSet();
5.14 if (ls != null) {
5.15 Line line = ls.getCurrent(lineNo);
5.16 - line.show(Line.SHOW_GOTO, col);
5.17 + line.show(ShowOpenType.OPEN, ShowVisibilityType.FOCUS, col);
5.18 }
5.19 }
5.20