? core/windows/src/org/netbeans/core/windows/view/ui/toolbars/diff.txt ? core/windows/test/unit/src/org/netbeans/core/windows/TopComponentCreationTest.java ? installer/packages/ubuntu/javahelp-2.0.04 ? installer/packages/ubuntu/javahelp_2.0.04-1.dsc ? installer/packages/ubuntu/javahelp_2.0.04-1.tar.gz ? installer/packages/ubuntu/javahelp_2.0.04-1_all.deb ? installer/packages/ubuntu/javahelp_2.0.04-1_i386.changes ? installer/packages/ubuntu/netbeans-5.5/debian/copyright ? installer/packages/ubuntu/netbeans-5.5/debian/lists Index: ant/debugger/nbproject/project.xml =================================================================== RCS file: /cvs/ant/debugger/nbproject/project.xml,v retrieving revision 1.11 diff -u -6 -r1.11 project.xml --- ant/debugger/nbproject/project.xml 3 Nov 2006 15:27:37 -0000 1.11 +++ ant/debugger/nbproject/project.xml 23 May 2007 14:39:15 -0000 @@ -121,13 +121,13 @@ org.openide.text - 6.2 + 6.16 org.openide.io Index: ant/freeform/nbproject/project.xml =================================================================== RCS file: /cvs/ant/freeform/nbproject/project.xml,v retrieving revision 1.28 diff -u -6 -r1.28 project.xml --- ant/freeform/nbproject/project.xml 27 Mar 2007 00:01:18 -0000 1.28 +++ ant/freeform/nbproject/project.xml 23 May 2007 14:39:15 -0000 @@ -139,13 +139,13 @@ org.openide.text - 6.2 + 6.16 org.openide.util Index: ant/nbproject/project.xml =================================================================== RCS file: /cvs/ant/nbproject/project.xml,v retrieving revision 1.40 diff -u -6 -r1.40 project.xml --- ant/nbproject/project.xml 4 Apr 2007 23:19:33 -0000 1.40 +++ ant/nbproject/project.xml 23 May 2007 14:39:16 -0000 @@ -167,13 +167,13 @@ org.openide.text - 6.14 + 6.16 org.openide.util Index: apisupport/beanbrowser/nbproject/project.xml =================================================================== RCS file: /cvs/apisupport/beanbrowser/nbproject/project.xml,v retrieving revision 1.2 diff -u -6 -r1.2 project.xml --- apisupport/beanbrowser/nbproject/project.xml 21 Feb 2006 14:08:37 -0000 1.2 +++ apisupport/beanbrowser/nbproject/project.xml 23 May 2007 14:39:17 -0000 @@ -47,13 +47,13 @@ org.openide.text - 6.9 + 6.16 org.openide.util Index: apisupport/project/nbproject/project.xml =================================================================== RCS file: /cvs/apisupport/project/nbproject/project.xml,v retrieving revision 1.53 diff -u -6 -r1.53 project.xml --- apisupport/project/nbproject/project.xml 10 May 2007 07:54:56 -0000 1.53 +++ apisupport/project/nbproject/project.xml 23 May 2007 14:39:19 -0000 @@ -227,13 +227,13 @@ org.openide.text - 6.8 + 6.16 org.openide.util Index: apisupport/refactoring/nbproject/project.xml =================================================================== RCS file: /cvs/apisupport/refactoring/nbproject/project.xml,v retrieving revision 1.8 diff -u -6 -r1.8 project.xml --- apisupport/refactoring/nbproject/project.xml 17 Apr 2007 08:13:35 -0000 1.8 +++ apisupport/refactoring/nbproject/project.xml 23 May 2007 14:39:20 -0000 @@ -126,13 +126,13 @@ org.openide.text - 6.5 + 6.16 org.openide.util Index: apisupport/refactoring/test/qa-functional/data/testRename/nbproject/project.xml =================================================================== RCS file: /cvs/apisupport/refactoring/test/qa-functional/data/testRename/nbproject/project.xml,v retrieving revision 1.1 diff -u -6 -r1.1 project.xml --- apisupport/refactoring/test/qa-functional/data/testRename/nbproject/project.xml 8 Dec 2005 13:50:28 -0000 1.1 +++ apisupport/refactoring/test/qa-functional/data/testRename/nbproject/project.xml 23 May 2007 14:39:21 -0000 @@ -32,13 +32,13 @@ org.openide.text - 6.9 + 6.16 org.openide.util Index: beans/nbproject/project.xml =================================================================== RCS file: /cvs/beans/nbproject/project.xml,v retrieving revision 1.16 diff -u -6 -r1.16 project.xml --- beans/nbproject/project.xml 9 Nov 2006 16:53:56 -0000 1.16 +++ beans/nbproject/project.xml 23 May 2007 14:39:23 -0000 @@ -122,13 +122,13 @@ org.openide.text - 6.2 + 6.16 org.openide.actions Index: contrib/CamelCase/nbproject/project.xml =================================================================== RCS file: /cvs/contrib/CamelCase/nbproject/project.xml,v retrieving revision 1.1 diff -u -6 -r1.1 project.xml --- contrib/CamelCase/nbproject/project.xml 27 Mar 2006 21:31:46 -0000 1.1 +++ contrib/CamelCase/nbproject/project.xml 23 May 2007 14:39:26 -0000 @@ -24,13 +24,13 @@ org.openide.text - 6.9 + 6.16 org.openide.util Index: contrib/CodeTemplateTools/nbproject/project.xml =================================================================== RCS file: /cvs/contrib/CodeTemplateTools/nbproject/project.xml,v retrieving revision 1.10 diff -u -6 -r1.10 project.xml --- contrib/CodeTemplateTools/nbproject/project.xml 13 Apr 2007 17:02:18 -0000 1.10 +++ contrib/CodeTemplateTools/nbproject/project.xml 23 May 2007 14:39:27 -0000 @@ -98,13 +98,13 @@ org.openide.text - 6.8.1 + 6.16 org.openide.util Index: contrib/CopyFQN/nbproject/project.xml =================================================================== RCS file: /cvs/contrib/CopyFQN/nbproject/project.xml,v retrieving revision 1.2 diff -u -6 -r1.2 project.xml --- contrib/CopyFQN/nbproject/project.xml 28 Oct 2006 23:54:22 -0000 1.2 +++ contrib/CopyFQN/nbproject/project.xml 23 May 2007 14:39:28 -0000 @@ -64,13 +64,13 @@ org.openide.text - 6.9.1 + 6.16 org.openide.util Index: contrib/IncrementalSearch/nbproject/project.xml =================================================================== RCS file: /cvs/contrib/IncrementalSearch/nbproject/project.xml,v retrieving revision 1.3 diff -u -6 -r1.3 project.xml --- contrib/IncrementalSearch/nbproject/project.xml 2 Feb 2007 22:28:37 -0000 1.3 +++ contrib/IncrementalSearch/nbproject/project.xml 23 May 2007 14:39:28 -0000 @@ -50,13 +50,13 @@ org.openide.text - 6.9.11 + 6.16 org.openide.util Index: contrib/JavaNavigation/nbproject/project.xml =================================================================== RCS file: /cvs/contrib/JavaNavigation/nbproject/project.xml,v retrieving revision 1.1 diff -u -6 -r1.1 project.xml --- contrib/JavaNavigation/nbproject/project.xml 22 Dec 2006 17:21:30 -0000 1.1 +++ contrib/JavaNavigation/nbproject/project.xml 23 May 2007 14:39:28 -0000 @@ -64,13 +64,13 @@ org.openide.text - 6.12 + 6.16 org.openide.util Index: contrib/JavaTools/JavaFileStructure/nbproject/project.xml =================================================================== RCS file: /cvs/contrib/JavaTools/JavaFileStructure/nbproject/project.xml,v retrieving revision 1.3 diff -u -6 -r1.3 project.xml --- contrib/JavaTools/JavaFileStructure/nbproject/project.xml 29 Jun 2006 20:12:31 -0000 1.3 +++ contrib/JavaTools/JavaFileStructure/nbproject/project.xml 23 May 2007 14:39:28 -0000 @@ -138,13 +138,13 @@ org.openide.text - 6.6.1 + 6.16 org.openide.util Index: contrib/JavaTools/JavaTypeHierarchy/nbproject/project.xml =================================================================== RCS file: /cvs/contrib/JavaTools/JavaTypeHierarchy/nbproject/project.xml,v retrieving revision 1.3 diff -u -6 -r1.3 project.xml --- contrib/JavaTools/JavaTypeHierarchy/nbproject/project.xml 29 Jun 2006 20:12:33 -0000 1.3 +++ contrib/JavaTools/JavaTypeHierarchy/nbproject/project.xml 23 May 2007 14:39:29 -0000 @@ -138,13 +138,13 @@ org.openide.text - 6.6.1 + 6.16 org.openide.util Index: contrib/LineTools/nbproject/project.xml =================================================================== RCS file: /cvs/contrib/LineTools/nbproject/project.xml,v retrieving revision 1.4 diff -u -6 -r1.4 project.xml --- contrib/LineTools/nbproject/project.xml 29 Jan 2007 04:01:28 -0000 1.4 +++ contrib/LineTools/nbproject/project.xml 23 May 2007 14:39:29 -0000 @@ -55,13 +55,13 @@ org.openide.text - 6.8.1 + 6.16 org.openide.util Index: contrib/LocalHistory/nbproject/project.xml =================================================================== RCS file: /cvs/contrib/LocalHistory/nbproject/project.xml,v retrieving revision 1.6 diff -u -6 -r1.6 project.xml --- contrib/LocalHistory/nbproject/project.xml 19 Nov 2006 14:31:28 -0000 1.6 +++ contrib/LocalHistory/nbproject/project.xml 23 May 2007 14:39:29 -0000 @@ -100,13 +100,13 @@ org.openide.text - 6.9.1 + 6.16 org.openide.util Index: contrib/RectangularEditTools/nbproject/project.xml =================================================================== RCS file: /cvs/contrib/RectangularEditTools/nbproject/project.xml,v retrieving revision 1.1 diff -u -6 -r1.1 project.xml --- contrib/RectangularEditTools/nbproject/project.xml 10 Nov 2006 05:33:49 -0000 1.1 +++ contrib/RectangularEditTools/nbproject/project.xml 23 May 2007 14:39:30 -0000 @@ -32,13 +32,13 @@ org.openide.text - 6.9.11 + 6.16 org.openide.util Index: contrib/RegExpHighlighter/nbproject/project.xml =================================================================== RCS file: /cvs/contrib/RegExpHighlighter/nbproject/project.xml,v retrieving revision 1.3 diff -u -6 -r1.3 project.xml --- contrib/RegExpHighlighter/nbproject/project.xml 15 Apr 2007 22:38:10 -0000 1.3 +++ contrib/RegExpHighlighter/nbproject/project.xml 23 May 2007 14:39:30 -0000 @@ -60,13 +60,13 @@ org.openide.text - 6.9 + 6.16 org.openide.util Index: contrib/SFSBrowser/nbproject/project.xml =================================================================== RCS file: /cvs/contrib/SFSBrowser/nbproject/project.xml,v retrieving revision 1.2 diff -u -6 -r1.2 project.xml --- contrib/SFSBrowser/nbproject/project.xml 23 Feb 2007 15:53:14 -0000 1.2 +++ contrib/SFSBrowser/nbproject/project.xml 23 May 2007 14:39:30 -0000 @@ -65,13 +65,13 @@ org.openide.text - 6.9.22 + 6.16 org.openide.util Index: contrib/WhichElement/nbproject/project.xml =================================================================== RCS file: /cvs/contrib/WhichElement/nbproject/project.xml,v retrieving revision 1.1 diff -u -6 -r1.1 project.xml --- contrib/WhichElement/nbproject/project.xml 31 Oct 2006 02:43:45 -0000 1.1 +++ contrib/WhichElement/nbproject/project.xml 23 May 2007 14:39:30 -0000 @@ -64,13 +64,13 @@ org.openide.text - 6.12 + 6.16 org.openide.util Index: contrib/WhiteSpaceTools/nbproject/project.xml =================================================================== RCS file: /cvs/contrib/WhiteSpaceTools/nbproject/project.xml,v retrieving revision 1.1 diff -u -6 -r1.1 project.xml --- contrib/WhiteSpaceTools/nbproject/project.xml 5 May 2006 14:26:49 -0000 1.1 +++ contrib/WhiteSpaceTools/nbproject/project.xml 23 May 2007 14:39:30 -0000 @@ -50,13 +50,13 @@ org.openide.text - 6.9 + 6.16 org.openide.util Index: contrib/archiver/nbproject/project.xml =================================================================== RCS file: /cvs/contrib/archiver/nbproject/project.xml,v retrieving revision 1.5 diff -u -6 -r1.5 project.xml --- contrib/archiver/nbproject/project.xml 29 Jun 2006 20:12:42 -0000 1.5 +++ contrib/archiver/nbproject/project.xml 23 May 2007 14:39:30 -0000 @@ -88,13 +88,13 @@ org.openide.text - 6.2 + 6.16 org.openide.util Index: contrib/autoclose/nbproject/project.xml =================================================================== RCS file: /cvs/contrib/autoclose/nbproject/project.xml,v retrieving revision 1.5 diff -u -6 -r1.5 project.xml --- contrib/autoclose/nbproject/project.xml 29 Jun 2006 20:12:58 -0000 1.5 +++ contrib/autoclose/nbproject/project.xml 23 May 2007 14:39:31 -0000 @@ -71,13 +71,13 @@ org.openide.text - 6.9 + 6.16 org.openide.util Index: contrib/docbook/nbproject/project.xml =================================================================== RCS file: /cvs/contrib/docbook/nbproject/project.xml,v retrieving revision 1.15 diff -u -6 -r1.15 project.xml --- contrib/docbook/nbproject/project.xml 25 Oct 2006 22:33:23 -0000 1.15 +++ contrib/docbook/nbproject/project.xml 23 May 2007 14:39:32 -0000 @@ -141,13 +141,13 @@ org.openide.text - 6.2 + 6.16 org.openide.util Index: contrib/doclet_completion/nbproject/project.xml =================================================================== RCS file: /cvs/contrib/doclet_completion/nbproject/project.xml,v retrieving revision 1.4 diff -u -6 -r1.4 project.xml --- contrib/doclet_completion/nbproject/project.xml 29 Jun 2006 20:13:14 -0000 1.4 +++ contrib/doclet_completion/nbproject/project.xml 23 May 2007 14:39:33 -0000 @@ -128,13 +128,13 @@ org.openide.text - 6.2 + 6.16 org.openide.util Index: contrib/editorhints/apisupport/nbproject/project.xml =================================================================== RCS file: /cvs/contrib/editorhints/apisupport/nbproject/project.xml,v retrieving revision 1.2 diff -u -6 -r1.2 project.xml --- contrib/editorhints/apisupport/nbproject/project.xml 29 Jun 2006 20:13:20 -0000 1.2 +++ contrib/editorhints/apisupport/nbproject/project.xml 23 May 2007 14:39:33 -0000 @@ -123,13 +123,13 @@ org.openide.text - 6.6 + 6.16 org.openide.util Index: contrib/editorhints/i18n/nbproject/project.xml =================================================================== RCS file: /cvs/contrib/editorhints/i18n/nbproject/project.xml,v retrieving revision 1.3 diff -u -6 -r1.3 project.xml --- contrib/editorhints/i18n/nbproject/project.xml 29 Jun 2006 20:13:26 -0000 1.3 +++ contrib/editorhints/i18n/nbproject/project.xml 23 May 2007 14:39:34 -0000 @@ -90,13 +90,13 @@ org.openide.text - 6.6 + 6.16 org.openide.util Index: contrib/editorhints/java/nbproject/project.xml =================================================================== RCS file: /cvs/contrib/editorhints/java/nbproject/project.xml,v retrieving revision 1.12 diff -u -6 -r1.12 project.xml --- contrib/editorhints/java/nbproject/project.xml 27 Mar 2007 19:34:33 -0000 1.12 +++ contrib/editorhints/java/nbproject/project.xml 23 May 2007 14:39:34 -0000 @@ -140,13 +140,13 @@ org.openide.text - 6.2 + 6.16 org.openide.util Index: contrib/editorhints/spisupport/nbproject/project.xml =================================================================== RCS file: /cvs/contrib/editorhints/spisupport/nbproject/project.xml,v retrieving revision 1.1 diff -u -6 -r1.1 project.xml --- contrib/editorhints/spisupport/nbproject/project.xml 20 Aug 2006 09:50:52 -0000 1.1 +++ contrib/editorhints/spisupport/nbproject/project.xml 23 May 2007 14:39:34 -0000 @@ -111,13 +111,13 @@ org.openide.text - 6.12 + 6.16 org.openide.util Index: contrib/editorhints/xml/nbproject/project.xml =================================================================== RCS file: /cvs/contrib/editorhints/xml/nbproject/project.xml,v retrieving revision 1.3 diff -u -6 -r1.3 project.xml --- contrib/editorhints/xml/nbproject/project.xml 29 Jun 2006 20:13:34 -0000 1.3 +++ contrib/editorhints/xml/nbproject/project.xml 23 May 2007 14:39:34 -0000 @@ -63,13 +63,13 @@ org.openide.text - 6.6 + 6.16 org.openide.util Index: contrib/erd/nbproject/project.xml =================================================================== RCS file: /cvs/contrib/erd/nbproject/project.xml,v retrieving revision 1.3 diff -u -6 -r1.3 project.xml --- contrib/erd/nbproject/project.xml 21 Feb 2007 12:17:59 -0000 1.3 +++ contrib/erd/nbproject/project.xml 23 May 2007 14:39:34 -0000 @@ -195,13 +195,13 @@ org.openide.text - 6.9.21 + 6.16 org.openide.util Index: contrib/genericnavigator/nbproject/project.xml =================================================================== RCS file: /cvs/contrib/genericnavigator/nbproject/project.xml,v retrieving revision 1.2 diff -u -6 -r1.2 project.xml --- contrib/genericnavigator/nbproject/project.xml 21 Mar 2007 14:54:54 -0000 1.2 +++ contrib/genericnavigator/nbproject/project.xml 23 May 2007 14:39:35 -0000 @@ -91,13 +91,13 @@ org.openide.text - 6.9.1 + 6.16 org.openide.util Index: contrib/importcruncher/nbproject/project.xml =================================================================== RCS file: /cvs/contrib/importcruncher/nbproject/project.xml,v retrieving revision 1.6 diff -u -6 -r1.6 project.xml --- contrib/importcruncher/nbproject/project.xml 11 Oct 2006 14:31:44 -0000 1.6 +++ contrib/importcruncher/nbproject/project.xml 23 May 2007 14:39:36 -0000 @@ -169,13 +169,13 @@ org.openide.text - 6.6 + 6.16 org.openide.util Index: contrib/insertunicode/nbproject/project.xml =================================================================== RCS file: /cvs/contrib/insertunicode/nbproject/project.xml,v retrieving revision 1.9 diff -u -6 -r1.9 project.xml --- contrib/insertunicode/nbproject/project.xml 11 Oct 2006 14:31:47 -0000 1.9 +++ contrib/insertunicode/nbproject/project.xml 23 May 2007 14:39:36 -0000 @@ -48,13 +48,13 @@ org.openide.text - 6.2 + 6.16 org.openide.util Index: contrib/jalopy/nbproject/project.xml =================================================================== RCS file: /cvs/contrib/jalopy/nbproject/project.xml,v retrieving revision 1.11 diff -u -6 -r1.11 project.xml --- contrib/jalopy/nbproject/project.xml 29 Jun 2006 20:14:00 -0000 1.11 +++ contrib/jalopy/nbproject/project.xml 23 May 2007 14:39:37 -0000 @@ -65,13 +65,13 @@ org.openide.text - 6.2 + 6.16 org.openide.util Index: contrib/javaUsagesNavigator/nbproject/project.xml =================================================================== RCS file: /cvs/contrib/javaUsagesNavigator/nbproject/project.xml,v retrieving revision 1.1.1.1 diff -u -6 -r1.1.1.1 project.xml --- contrib/javaUsagesNavigator/nbproject/project.xml 13 Sep 2005 20:45:12 -0000 1.1.1.1 +++ contrib/javaUsagesNavigator/nbproject/project.xml 23 May 2007 14:39:37 -0000 @@ -137,13 +137,13 @@ org.openide.text - 6.6 + 6.16 org.openide.util Index: contrib/javanavigators/nbproject/project.xml =================================================================== RCS file: /cvs/contrib/javanavigators/nbproject/project.xml,v retrieving revision 1.3 diff -u -6 -r1.3 project.xml --- contrib/javanavigators/nbproject/project.xml 9 May 2007 04:20:32 -0000 1.3 +++ contrib/javanavigators/nbproject/project.xml 23 May 2007 14:39:37 -0000 @@ -80,13 +80,13 @@ org.openide.text - 6.12 + 6.16 org.openide.util Index: contrib/manifesteditor/nbproject/project.xml =================================================================== RCS file: /cvs/contrib/manifesteditor/nbproject/project.xml,v retrieving revision 1.3 diff -u -6 -r1.3 project.xml --- contrib/manifesteditor/nbproject/project.xml 12 Oct 2006 08:19:18 -0000 1.3 +++ contrib/manifesteditor/nbproject/project.xml 23 May 2007 14:39:37 -0000 @@ -99,13 +99,13 @@ org.openide.text - 6.12 + 6.16 org.openide.util Index: contrib/povray/povray/nbproject/project.xml =================================================================== RCS file: /cvs/contrib/povray/povray/nbproject/project.xml,v retrieving revision 1.5 diff -u -6 -r1.5 project.xml --- contrib/povray/povray/nbproject/project.xml 29 Jun 2006 20:14:35 -0000 1.5 +++ contrib/povray/povray/nbproject/project.xml 23 May 2007 14:39:39 -0000 @@ -57,13 +57,13 @@ org.openide.text - 6.2 + 6.16 org.openide.actions Index: contrib/refactorings/nbproject/project.xml =================================================================== RCS file: /cvs/contrib/refactorings/nbproject/project.xml,v retrieving revision 1.2 diff -u -6 -r1.2 project.xml --- contrib/refactorings/nbproject/project.xml 16 May 2007 04:22:32 -0000 1.2 +++ contrib/refactorings/nbproject/project.xml 23 May 2007 14:39:40 -0000 @@ -80,13 +80,13 @@ org.openide.text - 6.15 + 6.16 org.openide.util Index: contrib/searchandreplace/nbproject/project.xml =================================================================== RCS file: /cvs/contrib/searchandreplace/nbproject/project.xml,v retrieving revision 1.1 diff -u -6 -r1.1 project.xml --- contrib/searchandreplace/nbproject/project.xml 27 Feb 2006 21:32:44 -0000 1.1 +++ contrib/searchandreplace/nbproject/project.xml 23 May 2007 14:39:44 -0000 @@ -83,13 +83,13 @@ org.openide.text - 6.10 + 6.16 org.openide.util Index: contrib/toolsintegration/nbproject/project.xml =================================================================== RCS file: /cvs/contrib/toolsintegration/nbproject/project.xml,v retrieving revision 1.1 diff -u -6 -r1.1 project.xml --- contrib/toolsintegration/nbproject/project.xml 10 May 2006 13:41:28 -0000 1.1 +++ contrib/toolsintegration/nbproject/project.xml 23 May 2007 14:39:47 -0000 @@ -73,13 +73,13 @@ org.openide.text -6.9 +6.16 org.openide.util Index: core/multiview/nbproject/project.xml =================================================================== RCS file: /cvs/core/multiview/nbproject/project.xml,v retrieving revision 1.9 diff -u -6 -r1.9 project.xml --- core/multiview/nbproject/project.xml 30 Aug 2006 13:20:18 -0000 1.9 +++ core/multiview/nbproject/project.xml 23 May 2007 14:39:58 -0000 @@ -65,13 +65,13 @@ org.openide.text - 6.2 + 6.16 unit Index: core/nbproject/project.xml =================================================================== RCS file: /cvs/core/nbproject/project.xml,v retrieving revision 1.26 diff -u -6 -r1.26 project.xml --- core/nbproject/project.xml 27 Apr 2007 10:29:47 -0000 1.26 +++ core/nbproject/project.xml 23 May 2007 14:40:00 -0000 @@ -113,13 +113,13 @@ org.openide.text - 6.2 + 6.16 org.openide.util Index: core/options/keymap/nbproject/project.xml =================================================================== RCS file: /cvs/core/options/keymap/nbproject/project.xml,v retrieving revision 1.2 diff -u -6 -r1.2 project.xml --- core/options/keymap/nbproject/project.xml 3 Apr 2007 15:33:27 -0000 1.2 +++ core/options/keymap/nbproject/project.xml 23 May 2007 14:40:00 -0000 @@ -80,13 +80,15 @@ org.openide.text - + + 6.16 + org.openide.util Index: core/palette/nbproject/project.xml =================================================================== RCS file: /cvs/core/palette/nbproject/project.xml,v retrieving revision 1.9 diff -u -6 -r1.9 project.xml --- core/palette/nbproject/project.xml 8 Mar 2007 12:01:49 -0000 1.9 +++ core/palette/nbproject/project.xml 23 May 2007 14:40:00 -0000 @@ -88,13 +88,13 @@ org.openide.text - 6.5 + 6.16 org.openide.util Index: core/tasklist/todo/nbproject/project.xml =================================================================== RCS file: /cvs/core/tasklist/todo/nbproject/project.xml,v retrieving revision 1.3 diff -u -6 -r1.3 project.xml --- core/tasklist/todo/nbproject/project.xml 2 May 2007 14:45:30 -0000 1.3 +++ core/tasklist/todo/nbproject/project.xml 23 May 2007 14:40:08 -0000 @@ -57,13 +57,13 @@ org.openide.text - 6.12 + 6.16 org.openide.util Index: core/tasklist/ui/nbproject/project.xml =================================================================== RCS file: /cvs/core/tasklist/ui/nbproject/project.xml,v retrieving revision 1.2 diff -u -6 -r1.2 project.xml --- core/tasklist/ui/nbproject/project.xml 18 Apr 2007 11:18:51 -0000 1.2 +++ core/tasklist/ui/nbproject/project.xml 23 May 2007 14:40:08 -0000 @@ -83,13 +83,13 @@ org.openide.text - 6.12 + 6.16 org.openide.util Index: cpplite/api/nbproject/project.xml =================================================================== RCS file: /cvs/cpplite/api/nbproject/project.xml,v retrieving revision 1.5 diff -u -6 -r1.5 project.xml --- cpplite/api/nbproject/project.xml 30 Jun 2006 13:47:19 -0000 1.5 +++ cpplite/api/nbproject/project.xml 23 May 2007 14:40:12 -0000 @@ -47,13 +47,13 @@ org.openide.text - 6.7 + 6.16 org.openide.util Index: cpplite/editor/nbproject/project.xml =================================================================== RCS file: /cvs/cpplite/editor/nbproject/project.xml,v retrieving revision 1.6 diff -u -6 -r1.6 project.xml --- cpplite/editor/nbproject/project.xml 30 Jun 2006 13:47:21 -0000 1.6 +++ cpplite/editor/nbproject/project.xml 23 May 2007 14:40:13 -0000 @@ -152,13 +152,13 @@ org.openide.text - 6.6 + 6.16 org.openide.util Index: cpplite/loaders/nbproject/project.xml =================================================================== RCS file: /cvs/cpplite/loaders/nbproject/project.xml,v retrieving revision 1.3 diff -u -6 -r1.3 project.xml --- cpplite/loaders/nbproject/project.xml 30 Jun 2006 13:47:29 -0000 1.3 +++ cpplite/loaders/nbproject/project.xml 23 May 2007 14:40:14 -0000 @@ -112,13 +112,13 @@ org.openide.text - 6.6 + 6.16 org.openide.util Index: cpplite/platform/nbproject/project.xml =================================================================== RCS file: /cvs/cpplite/platform/nbproject/project.xml,v retrieving revision 1.5 diff -u -6 -r1.5 project.xml --- cpplite/platform/nbproject/project.xml 10 Dec 2005 12:28:08 -0000 1.5 +++ cpplite/platform/nbproject/project.xml 23 May 2007 14:40:15 -0000 @@ -107,13 +107,13 @@ org.openide.text - 6.8 + 6.16 org.openide.util Index: cpplite/project/nbproject/project.xml =================================================================== RCS file: /cvs/cpplite/project/nbproject/project.xml,v retrieving revision 1.9 diff -u -6 -r1.9 project.xml --- cpplite/project/nbproject/project.xml 30 Jun 2006 13:47:38 -0000 1.9 +++ cpplite/project/nbproject/project.xml 23 May 2007 14:40:15 -0000 @@ -152,13 +152,13 @@ org.openide.text - 6.7 + 6.16 org.openide.util Index: db/core/nbproject/project.xml =================================================================== RCS file: /cvs/db/core/nbproject/project.xml,v retrieving revision 1.6 diff -u -6 -r1.6 project.xml --- db/core/nbproject/project.xml 7 Nov 2006 23:43:44 -0000 1.6 +++ db/core/nbproject/project.xml 23 May 2007 14:40:16 -0000 @@ -97,13 +97,13 @@ org.openide.text - 6.2 + 6.16 org.openide.util Index: db/sqleditor/nbproject/project.xml =================================================================== RCS file: /cvs/db/sqleditor/nbproject/project.xml,v retrieving revision 1.5 diff -u -6 -r1.5 project.xml --- db/sqleditor/nbproject/project.xml 9 Nov 2006 16:53:57 -0000 1.5 +++ db/sqleditor/nbproject/project.xml 23 May 2007 14:40:18 -0000 @@ -128,21 +128,21 @@ org.openide.options - 6.2 + 6.7 org.openide.text - 6.2 + 6.16 org.openide.util Index: db/visualsqleditor/nbproject/project.xml =================================================================== RCS file: /cvs/db/visualsqleditor/nbproject/project.xml,v retrieving revision 1.8 diff -u -6 -r1.8 project.xml --- db/visualsqleditor/nbproject/project.xml 24 Apr 2007 06:12:48 -0000 1.8 +++ db/visualsqleditor/nbproject/project.xml 23 May 2007 14:40:20 -0000 @@ -48,13 +48,13 @@ org.openide.text - 6.13 + 6.16 org.openide.util Index: debuggercore/nbproject/project.xml =================================================================== RCS file: /cvs/debuggercore/nbproject/project.xml,v retrieving revision 1.12 diff -u -6 -r1.12 project.xml --- debuggercore/nbproject/project.xml 25 Aug 2006 12:31:35 -0000 1.12 +++ debuggercore/nbproject/project.xml 23 May 2007 14:40:21 -0000 @@ -73,13 +73,13 @@ org.openide.text - 6.2 + 6.16 org.openide.loaders Index: debuggerjpda/projects/nbproject/project.xml =================================================================== RCS file: /cvs/debuggerjpda/projects/nbproject/project.xml,v retrieving revision 1.2 diff -u -6 -r1.2 project.xml --- debuggerjpda/projects/nbproject/project.xml 24 Oct 2006 12:59:54 -0000 1.2 +++ debuggerjpda/projects/nbproject/project.xml 23 May 2007 14:40:25 -0000 @@ -148,13 +148,13 @@ org.openide.text - 6.11 + 6.16 org.openide.util Index: debuggerjpda/ui/nbproject/project.xml =================================================================== RCS file: /cvs/debuggerjpda/ui/nbproject/project.xml,v retrieving revision 1.17 diff -u -6 -r1.17 project.xml --- debuggerjpda/ui/nbproject/project.xml 9 Feb 2007 15:55:46 -0000 1.17 +++ debuggerjpda/ui/nbproject/project.xml 23 May 2007 14:40:26 -0000 @@ -95,13 +95,13 @@ org.openide.text - 6.2 + 6.16 org.openide.windows Index: diff/nbproject/project.xml =================================================================== RCS file: /cvs/diff/nbproject/project.xml,v retrieving revision 1.23 diff -u -6 -r1.23 project.xml --- diff/nbproject/project.xml 16 May 2007 13:36:56 -0000 1.23 +++ diff/nbproject/project.xml 23 May 2007 14:40:28 -0000 @@ -157,13 +157,13 @@ org.openide.text - 6.12 + 6.16 org.openide.util Index: editor/bookmarks/nbproject/project.xml =================================================================== RCS file: /cvs/editor/bookmarks/nbproject/project.xml,v retrieving revision 1.8 diff -u -6 -r1.8 project.xml --- editor/bookmarks/nbproject/project.xml 27 Mar 2007 19:51:08 -0000 1.8 +++ editor/bookmarks/nbproject/project.xml 23 May 2007 14:40:28 -0000 @@ -87,13 +87,13 @@ org.openide.text - 6.2 + 6.16 org.openide.util Index: editor/codetemplates/nbproject/project.xml =================================================================== RCS file: /cvs/editor/codetemplates/nbproject/project.xml,v retrieving revision 1.6 diff -u -6 -r1.6 project.xml --- editor/codetemplates/nbproject/project.xml 1 Nov 2006 14:00:25 -0000 1.6 +++ editor/codetemplates/nbproject/project.xml 23 May 2007 14:40:29 -0000 @@ -109,13 +109,13 @@ org.openide.text - 6.12 + 6.16 org.openide.util Index: editor/errorstripe/nbproject/project.xml =================================================================== RCS file: /cvs/editor/errorstripe/nbproject/project.xml,v retrieving revision 1.13 diff -u -6 -r1.13 project.xml --- editor/errorstripe/nbproject/project.xml 17 Apr 2007 03:02:17 -0000 1.13 +++ editor/errorstripe/nbproject/project.xml 23 May 2007 14:40:30 -0000 @@ -82,13 +82,13 @@ org.openide.text - 6.3 + 6.16 org.openide.util Index: editor/guards/nbproject/project.xml =================================================================== RCS file: /cvs/editor/guards/nbproject/project.xml,v retrieving revision 1.4 diff -u -6 -r1.4 project.xml --- editor/guards/nbproject/project.xml 27 Mar 2007 19:51:39 -0000 1.4 +++ editor/guards/nbproject/project.xml 23 May 2007 14:40:31 -0000 @@ -34,13 +34,13 @@ org.openide.text - 6.12 + 6.16 org.openide.util Index: editor/hints/nbproject/project.xml =================================================================== RCS file: /cvs/editor/hints/nbproject/project.xml,v retrieving revision 1.17 diff -u -6 -r1.17 project.xml --- editor/hints/nbproject/project.xml 23 Apr 2007 14:32:29 -0000 1.17 +++ editor/hints/nbproject/project.xml 23 May 2007 14:40:32 -0000 @@ -152,13 +152,13 @@ org.openide.text - 6.5 + 6.16 org.openide.util Index: editor/nbproject/project.xml =================================================================== RCS file: /cvs/editor/nbproject/project.xml,v retrieving revision 1.34 diff -u -6 -r1.34 project.xml --- editor/nbproject/project.xml 22 Feb 2007 10:27:21 -0000 1.34 +++ editor/nbproject/project.xml 23 May 2007 14:40:35 -0000 @@ -140,13 +140,13 @@ org.openide.text - 6.12 + 6.16 org.openide.util Index: editor/options/nbproject/project.xml =================================================================== RCS file: /cvs/editor/options/nbproject/project.xml,v retrieving revision 1.19 diff -u -6 -r1.19 project.xml --- editor/options/nbproject/project.xml 3 Apr 2007 15:33:34 -0000 1.19 +++ editor/options/nbproject/project.xml 23 May 2007 14:40:36 -0000 @@ -156,13 +156,13 @@ org.openide.text - 6.12 + 6.16 org.openide.util Index: editor/plain/nbproject/project.xml =================================================================== RCS file: /cvs/editor/plain/nbproject/project.xml,v retrieving revision 1.5 diff -u -6 -r1.5 project.xml --- editor/plain/nbproject/project.xml 30 Jun 2006 19:18:19 -0000 1.5 +++ editor/plain/nbproject/project.xml 23 May 2007 14:40:36 -0000 @@ -41,21 +41,21 @@ org.openide.options - 6.2 + 6.7 org.openide.text - 6.2 + 6.16 org.netbeans.modules.editor.lib Index: enterprise/bpel/core/nbproject/project.xml =================================================================== RCS file: /cvs/enterprise/bpel/core/nbproject/project.xml,v retrieving revision 1.11 diff -u -6 -r1.11 project.xml --- enterprise/bpel/core/nbproject/project.xml 26 Apr 2007 11:25:28 -0000 1.11 +++ enterprise/bpel/core/nbproject/project.xml 23 May 2007 14:40:45 -0000 @@ -245,13 +245,13 @@ org.openide.text - 6.8.1 + 6.16 org.openide.util Index: enterprise/bpel/debuggerui/nbproject/project.xml =================================================================== RCS file: /cvs/enterprise/bpel/debuggerui/nbproject/project.xml,v retrieving revision 1.5 diff -u -6 -r1.5 project.xml --- enterprise/bpel/debuggerui/nbproject/project.xml 22 May 2007 12:04:52 -0000 1.5 +++ enterprise/bpel/debuggerui/nbproject/project.xml 23 May 2007 14:40:47 -0000 @@ -197,13 +197,13 @@ org.openide.text - 6.9.22 + 6.16 org.openide.util Index: enterprise/bpel/editors/nbproject/project.xml =================================================================== RCS file: /cvs/enterprise/bpel/editors/nbproject/project.xml,v retrieving revision 1.14 diff -u -6 -r1.14 project.xml --- enterprise/bpel/editors/nbproject/project.xml 22 May 2007 12:05:08 -0000 1.14 +++ enterprise/bpel/editors/nbproject/project.xml 23 May 2007 14:40:49 -0000 @@ -304,13 +304,13 @@ org.openide.text - 6.2 + 6.16 org.openide.util Index: enterprise/bpel/editorsapi/nbproject/project.xml =================================================================== RCS file: /cvs/enterprise/bpel/editorsapi/nbproject/project.xml,v retrieving revision 1.1 diff -u -6 -r1.1 project.xml --- enterprise/bpel/editorsapi/nbproject/project.xml 18 Apr 2007 08:45:53 -0000 1.1 +++ enterprise/bpel/editorsapi/nbproject/project.xml 23 May 2007 14:40:53 -0000 @@ -100,13 +100,13 @@ org.openide.text - 6.2 + 6.16 org.openide.util Index: enterprise/bpel/project/nbproject/project.xml =================================================================== RCS file: /cvs/enterprise/bpel/project/nbproject/project.xml,v retrieving revision 1.10 diff -u -6 -r1.10 project.xml --- enterprise/bpel/project/nbproject/project.xml 22 May 2007 12:05:23 -0000 1.10 +++ enterprise/bpel/project/nbproject/project.xml 23 May 2007 14:40:55 -0000 @@ -299,13 +299,13 @@ org.openide.text - 6.9.1 + 6.16 org.openide.util Index: enterprise/bpel/refactoring/nbproject/project.xml =================================================================== RCS file: /cvs/enterprise/bpel/refactoring/nbproject/project.xml,v retrieving revision 1.8 diff -u -6 -r1.8 project.xml --- enterprise/bpel/refactoring/nbproject/project.xml 4 May 2007 11:18:05 -0000 1.8 +++ enterprise/bpel/refactoring/nbproject/project.xml 23 May 2007 14:40:56 -0000 @@ -139,13 +139,13 @@ org.openide.text - 6.13 + 6.16 org.openide.util Index: enterprise/bpel/xpath/nbproject/project.xml =================================================================== RCS file: /cvs/enterprise/bpel/xpath/nbproject/project.xml,v retrieving revision 1.7 diff -u -6 -r1.7 project.xml --- enterprise/bpel/xpath/nbproject/project.xml 22 May 2007 12:05:37 -0000 1.7 +++ enterprise/bpel/xpath/nbproject/project.xml 23 May 2007 14:41:00 -0000 @@ -215,13 +215,13 @@ org.openide.text - 6.9.21 + 6.16 org.openide.util Index: enterprise/compapp/casaeditor/nbproject/project.xml =================================================================== RCS file: /cvs/enterprise/compapp/casaeditor/nbproject/project.xml,v retrieving revision 1.5 diff -u -6 -r1.5 project.xml --- enterprise/compapp/casaeditor/nbproject/project.xml 18 Apr 2007 08:46:37 -0000 1.5 +++ enterprise/compapp/casaeditor/nbproject/project.xml 23 May 2007 14:41:02 -0000 @@ -262,13 +262,13 @@ org.openide.text - 6.9.21 + 6.16 org.openide.util Index: enterprise/compapp/projectjbi/nbproject/project.xml =================================================================== RCS file: /cvs/enterprise/compapp/projectjbi/nbproject/project.xml,v retrieving revision 1.2 diff -u -6 -r1.2 project.xml --- enterprise/compapp/projectjbi/nbproject/project.xml 3 May 2007 10:34:37 -0000 1.2 +++ enterprise/compapp/projectjbi/nbproject/project.xml 23 May 2007 14:41:07 -0000 @@ -358,13 +358,13 @@ org.openide.text - 6.8.1 + 6.16 org.openide.util Index: enterprise/dataintegrator/eDMEditor/nbproject/project.xml =================================================================== RCS file: /cvs/enterprise/dataintegrator/eDMEditor/nbproject/project.xml,v retrieving revision 1.4 diff -u -6 -r1.4 project.xml --- enterprise/dataintegrator/eDMEditor/nbproject/project.xml 16 May 2007 10:21:26 -0000 1.4 +++ enterprise/dataintegrator/eDMEditor/nbproject/project.xml 23 May 2007 14:41:10 -0000 @@ -168,13 +168,13 @@ org.openide.text - 6.9.24 + 6.16 org.openide.util Index: enterprise/dataintegrator/eTLEditor/nbproject/project.xml =================================================================== RCS file: /cvs/enterprise/dataintegrator/eTLEditor/nbproject/project.xml,v retrieving revision 1.1 diff -u -6 -r1.1 project.xml --- enterprise/dataintegrator/eTLEditor/nbproject/project.xml 1 May 2007 05:12:09 -0000 1.1 +++ enterprise/dataintegrator/eTLEditor/nbproject/project.xml 23 May 2007 14:41:12 -0000 @@ -178,13 +178,13 @@ org.openide.text - 6.9.11 + 6.16 org.openide.util Index: enterprise/iep/editor/nbproject/project.xml =================================================================== RCS file: /cvs/enterprise/iep/editor/nbproject/project.xml,v retrieving revision 1.4 diff -u -6 -r1.4 project.xml --- enterprise/iep/editor/nbproject/project.xml 18 Apr 2007 08:56:09 -0000 1.4 +++ enterprise/iep/editor/nbproject/project.xml 23 May 2007 14:41:17 -0000 @@ -100,13 +100,13 @@ org.openide.text - 6.9.22 + 6.16 org.openide.util Index: enterprise/openesbaddons/aspect/editor/nbproject/project.xml =================================================================== RCS file: /cvs/enterprise/openesbaddons/aspect/editor/nbproject/project.xml,v retrieving revision 1.1 diff -u -6 -r1.1 project.xml --- enterprise/openesbaddons/aspect/editor/nbproject/project.xml 1 May 2007 14:18:45 -0000 1.1 +++ enterprise/openesbaddons/aspect/editor/nbproject/project.xml 23 May 2007 14:41:19 -0000 @@ -95,13 +95,13 @@ org.openide.text - 6.9.24 + 6.16 org.openide.util Index: enterprise/openesbaddons/contrib-imola/cics-bc/netbeansplugin/cpy2wsdlWizard/nbproject/project.xml =================================================================== RCS file: /cvs/enterprise/openesbaddons/contrib-imola/cics-bc/netbeansplugin/cpy2wsdlWizard/nbproject/project.xml,v retrieving revision 1.2 diff -u -6 -r1.2 project.xml --- enterprise/openesbaddons/contrib-imola/cics-bc/netbeansplugin/cpy2wsdlWizard/nbproject/project.xml 11 Apr 2007 19:12:59 -0000 1.2 +++ enterprise/openesbaddons/contrib-imola/cics-bc/netbeansplugin/cpy2wsdlWizard/nbproject/project.xml 23 May 2007 14:41:21 -0000 @@ -57,13 +57,13 @@ org.openide.text - 6.9 + 6.16 org.openide.util Index: enterprise/openesbaddons/contrib-imola/corba-bc/netbeansplugin/idl2wsdlWizard/nbproject/project.xml =================================================================== RCS file: /cvs/enterprise/openesbaddons/contrib-imola/corba-bc/netbeansplugin/idl2wsdlWizard/nbproject/project.xml,v retrieving revision 1.2 diff -u -6 -r1.2 project.xml --- enterprise/openesbaddons/contrib-imola/corba-bc/netbeansplugin/idl2wsdlWizard/nbproject/project.xml 11 Apr 2007 19:14:07 -0000 1.2 +++ enterprise/openesbaddons/contrib-imola/corba-bc/netbeansplugin/idl2wsdlWizard/nbproject/project.xml 23 May 2007 14:41:22 -0000 @@ -57,13 +57,13 @@ org.openide.text - 6.9 + 6.16 org.openide.util Index: enterprise/openesbaddons/encoder_basic/nbproject/project.xml =================================================================== RCS file: /cvs/enterprise/openesbaddons/encoder_basic/nbproject/project.xml,v retrieving revision 1.1 diff -u -6 -r1.1 project.xml --- enterprise/openesbaddons/encoder_basic/nbproject/project.xml 27 Apr 2007 22:50:12 -0000 1.1 +++ enterprise/openesbaddons/encoder_basic/nbproject/project.xml 23 May 2007 14:41:24 -0000 @@ -100,13 +100,13 @@ org.openide.text - 6.9.22 + 6.16 org.openide.util Index: enterprise/openesbaddons/ldap/nbproject/project.xml =================================================================== RCS file: /cvs/enterprise/openesbaddons/ldap/nbproject/project.xml,v retrieving revision 1.5 diff -u -6 -r1.5 project.xml --- enterprise/openesbaddons/ldap/nbproject/project.xml 17 May 2007 05:20:10 -0000 1.5 +++ enterprise/openesbaddons/ldap/nbproject/project.xml 23 May 2007 14:41:25 -0000 @@ -127,13 +127,13 @@ org.openide.text - 6.15 + 6.16 org.openide.util Index: enterprise/openesbaddons/script/core/nbproject/project.xml =================================================================== RCS file: /cvs/enterprise/openesbaddons/script/core/nbproject/project.xml,v retrieving revision 1.1 diff -u -6 -r1.1 project.xml --- enterprise/openesbaddons/script/core/nbproject/project.xml 2 May 2007 09:46:40 -0000 1.1 +++ enterprise/openesbaddons/script/core/nbproject/project.xml 23 May 2007 14:41:26 -0000 @@ -177,13 +177,13 @@ org.openide.text - 6.9.22 + 6.16 org.openide.util Index: enterprise/script/core/nbproject/project.xml =================================================================== RCS file: /cvs/enterprise/script/core/nbproject/project.xml,v retrieving revision 1.5 diff -u -6 -r1.5 project.xml --- enterprise/script/core/nbproject/project.xml 26 Apr 2007 15:23:57 -0000 1.5 +++ enterprise/script/core/nbproject/project.xml 23 May 2007 14:41:29 -0000 @@ -176,13 +176,13 @@ org.openide.text - 6.9.22 + 6.16 org.openide.util Index: enterprise/sql/project/nbproject/project.xml =================================================================== RCS file: /cvs/enterprise/sql/project/nbproject/project.xml,v retrieving revision 1.9 diff -u -6 -r1.9 project.xml --- enterprise/sql/project/nbproject/project.xml 22 May 2007 09:38:47 -0000 1.9 +++ enterprise/sql/project/nbproject/project.xml 23 May 2007 14:41:33 -0000 @@ -235,13 +235,13 @@ org.openide.text - 6.9.21 + 6.16 org.openide.util Index: enterprise/xslt/core/nbproject/project.xml =================================================================== RCS file: /cvs/enterprise/xslt/core/nbproject/project.xml,v retrieving revision 1.9 diff -u -6 -r1.9 project.xml --- enterprise/xslt/core/nbproject/project.xml 26 Apr 2007 11:43:03 -0000 1.9 +++ enterprise/xslt/core/nbproject/project.xml 23 May 2007 14:41:42 -0000 @@ -227,13 +227,13 @@ org.openide.text - 6.9.22 + 6.16 org.openide.util Index: enterprise/xslt/mapper/nbproject/project.xml =================================================================== RCS file: /cvs/enterprise/xslt/mapper/nbproject/project.xml,v retrieving revision 1.5 diff -u -6 -r1.5 project.xml --- enterprise/xslt/mapper/nbproject/project.xml 18 Apr 2007 08:56:49 -0000 1.5 +++ enterprise/xslt/mapper/nbproject/project.xml 23 May 2007 14:41:43 -0000 @@ -152,13 +152,13 @@ org.openide.text - 6.9.22 + 6.16 org.openide.util Index: extbrowser/jdiclib/nbproject/project.xml =================================================================== RCS file: /cvs/extbrowser/jdiclib/nbproject/project.xml,v retrieving revision 1.6 diff -u -6 -r1.6 project.xml --- extbrowser/jdiclib/nbproject/project.xml 9 Nov 2006 16:53:58 -0000 1.6 +++ extbrowser/jdiclib/nbproject/project.xml 23 May 2007 14:41:45 -0000 @@ -89,13 +89,13 @@ 6.2 org.openide.text - 6.2 + 6.16 org.openide.actions 6.2 Index: form/nbproject/project.xml =================================================================== RCS file: /cvs/form/nbproject/project.xml,v retrieving revision 1.41 diff -u -6 -r1.41 project.xml --- form/nbproject/project.xml 10 Apr 2007 12:02:32 -0000 1.41 +++ form/nbproject/project.xml 23 May 2007 14:41:47 -0000 @@ -238,13 +238,13 @@ org.openide.text - 6.2 + 6.16 org.openide.util Index: form/swingapp/nbproject/project.xml =================================================================== RCS file: /cvs/form/swingapp/nbproject/project.xml,v retrieving revision 1.5 diff -u -6 -r1.5 project.xml --- form/swingapp/nbproject/project.xml 20 Apr 2007 14:58:47 -0000 1.5 +++ form/swingapp/nbproject/project.xml 23 May 2007 14:41:51 -0000 @@ -189,13 +189,13 @@ org.openide.text - 6.12 + 6.16 org.openide.util Index: graph/integration/nbproject/project.xml =================================================================== RCS file: /cvs/graph/integration/nbproject/project.xml,v retrieving revision 1.6 diff -u -6 -r1.6 project.xml --- graph/integration/nbproject/project.xml 13 Mar 2007 10:46:14 -0000 1.6 +++ graph/integration/nbproject/project.xml 23 May 2007 14:41:55 -0000 @@ -109,13 +109,13 @@ org.openide.text - 6.9.12 + 6.16 org.openide.util Index: html/editor/nbproject/project.xml =================================================================== RCS file: /cvs/html/editor/nbproject/project.xml,v retrieving revision 1.18 diff -u -6 -r1.18 project.xml --- html/editor/nbproject/project.xml 30 Apr 2007 00:21:40 -0000 1.18 +++ html/editor/nbproject/project.xml 23 May 2007 14:41:57 -0000 @@ -127,21 +127,21 @@ org.openide.options - 6.2 + 6.7 org.openide.text - 6.2 + 6.16 org.openide.util Index: html/nbproject/project.xml =================================================================== RCS file: /cvs/html/nbproject/project.xml,v retrieving revision 1.13 diff -u -6 -r1.13 project.xml --- html/nbproject/project.xml 16 Feb 2007 14:15:22 -0000 1.13 +++ html/nbproject/project.xml 23 May 2007 14:41:58 -0000 @@ -132,13 +132,13 @@ org.openide.text - 6.2 + 6.16 org.openide.util Index: i18n/form/nbproject/project.xml =================================================================== RCS file: /cvs/i18n/form/nbproject/project.xml,v retrieving revision 1.16 diff -u -6 -r1.16 project.xml --- i18n/form/nbproject/project.xml 8 Feb 2007 08:30:10 -0000 1.16 +++ i18n/form/nbproject/project.xml 23 May 2007 14:42:00 -0000 @@ -146,13 +146,13 @@ org.openide.text - 6.2 + 6.16 org.openide.util Index: i18n/nbproject/project.xml =================================================================== RCS file: /cvs/i18n/nbproject/project.xml,v retrieving revision 1.17 diff -u -6 -r1.17 project.xml --- i18n/nbproject/project.xml 9 Nov 2006 16:53:59 -0000 1.17 +++ i18n/nbproject/project.xml 23 May 2007 14:42:00 -0000 @@ -138,13 +138,13 @@ org.openide.text - 6.2 + 6.16 org.openide.util Index: ide/golden/deps.txt =================================================================== RCS file: /cvs/ide/golden/deps.txt,v retrieving revision 1.571 diff -u -6 -r1.571 deps.txt --- ide/golden/deps.txt 22 May 2007 00:20:16 -0000 1.571 +++ ide/golden/deps.txt 23 May 2007 14:42:10 -0000 @@ -3225,13 +3225,12 @@ MODULE org.openide.actions (platform) REQUIRES org.openide.awt (platform) REQUIRES org.openide.dialogs (platform) REQUIRES org.openide.explorer (platform) REQUIRES org.openide.modules.ModuleFormat1 REQUIRES org.openide.nodes (platform) - REQUIRES org.openide.options (platform) REQUIRES org.openide.text (platform) REQUIRES org.openide.util (platform) REQUIRES org.openide.windows (platform) MODULE org.openide.awt (platform) REQUIRES org.openide.modules.ModuleFormat1 REQUIRES org.openide.util (platform) @@ -3289,20 +3288,20 @@ REQUIRES org.openide.awt (platform) REQUIRES org.openide.dialogs (platform) REQUIRES org.openide.modules.ModuleFormat1 REQUIRES org.openide.util (platform) MODULE org.openide.options (platform) REQUIRES org.openide.modules.ModuleFormat1 + REQUIRES org.openide.text (platform) REQUIRES org.openide.util (platform) MODULE org.openide.text (platform) REQUIRES org.netbeans.modules.editor.mimelookup/1 (platform) REQUIRES org.openide.awt (platform) REQUIRES org.openide.dialogs (platform) REQUIRES org.openide.modules.ModuleFormat1 REQUIRES org.openide.nodes (platform) - REQUIRES org.openide.options (platform) REQUIRES org.openide.util (platform) REQUIRES org.openide.windows (platform) MODULE org.openide.util.enumerations (platform) REQUIRES org.openide.modules.ModuleFormat1 MODULE org.openide.windows (platform) REQUIRES org.openide.awt (platform) Index: ide/golden/files-layout.txt =================================================================== RCS file: /cvs/ide/golden/files-layout.txt,v retrieving revision 1.247 diff -u -6 -r1.247 files-layout.txt --- ide/golden/files-layout.txt 22 May 2007 00:20:18 -0000 1.247 +++ ide/golden/files-layout.txt 23 May 2007 14:42:13 -0000 @@ -875,12 +875,13 @@ platform7/config/ModuleAutoDeps/org-netbeans-core.xml platform7/config/ModuleAutoDeps/org-netbeans-modules-options-api.xml platform7/config/ModuleAutoDeps/org-netbeans-modules-queries.xml platform7/config/ModuleAutoDeps/org-openide-execution.xml platform7/config/ModuleAutoDeps/org-openide-explorer.xml platform7/config/ModuleAutoDeps/org-openide-modules.xml +platform7/config/ModuleAutoDeps/org-openide-text.xml platform7/config/Modules/org-jdesktop-layout.xml platform7/config/Modules/org-netbeans-api-progress.xml platform7/config/Modules/org-netbeans-api-visual.xml platform7/config/Modules/org-netbeans-core-execution.xml platform7/config/Modules/org-netbeans-core-multiview.xml platform7/config/Modules/org-netbeans-core-output2.xml Index: ide/launcher/upgrade/src/org/netbeans/upgrade/systemoptions/systemoptionsimport =================================================================== RCS file: /cvs/ide/launcher/upgrade/src/org/netbeans/upgrade/systemoptions/systemoptionsimport,v retrieving revision 1.12 diff -u -6 -r1.12 systemoptionsimport --- ide/launcher/upgrade/src/org/netbeans/upgrade/systemoptions/systemoptionsimport 30 Nov 2006 17:24:41 -0000 1.12 +++ ide/launcher/upgrade/src/org/netbeans/upgrade/systemoptions/systemoptionsimport 23 May 2007 14:42:13 -0000 @@ -5,6 +5,7 @@ Services/org-netbeans-modules-i18n-I18nOptions.settings Services/org-netbeans-modules-junit-JUnitSettings.settings Services/org-netbeans-modules-tasklist-docscan-Settings.settings Services/org-netbeans-modules-xml-core-settings-CoreSettings.settings Services/org-netbeans-modules-httpserver-HttpServerSettings.settings Services/formsettings.settings +Services/org-openide-text-PrintSettings.settings Index: identity/profileui/nbproject/project.xml =================================================================== RCS file: /cvs/identity/profileui/nbproject/project.xml,v retrieving revision 1.10 diff -u -6 -r1.10 project.xml --- identity/profileui/nbproject/project.xml 11 May 2007 15:04:45 -0000 1.10 +++ identity/profileui/nbproject/project.xml 23 May 2007 14:42:18 -0000 @@ -260,13 +260,13 @@ org.openide.text - 6.9.21 + 6.16 org.openide.util Index: image/nbproject/project.xml =================================================================== RCS file: /cvs/image/nbproject/project.xml,v retrieving revision 1.7 diff -u -6 -r1.7 project.xml --- image/nbproject/project.xml 15 Feb 2007 17:05:51 -0000 1.7 +++ image/nbproject/project.xml 23 May 2007 14:42:20 -0000 @@ -81,13 +81,13 @@ org.openide.text - 6.2 + 6.16 org.openide.actions Index: j2ee/ddloaders/nbproject/project.xml =================================================================== RCS file: /cvs/j2ee/ddloaders/nbproject/project.xml,v retrieving revision 1.31 diff -u -6 -r1.31 project.xml --- j2ee/ddloaders/nbproject/project.xml 4 May 2007 11:18:39 -0000 1.31 +++ j2ee/ddloaders/nbproject/project.xml 23 May 2007 14:42:33 -0000 @@ -225,13 +225,13 @@ org.openide.text - 6.2 + 6.16 org.openide.util Index: j2ee/ejbcore/nbproject/project.xml =================================================================== RCS file: /cvs/j2ee/ejbcore/nbproject/project.xml,v retrieving revision 1.23 diff -u -6 -r1.23 project.xml --- j2ee/ejbcore/nbproject/project.xml 4 May 2007 11:18:42 -0000 1.23 +++ j2ee/ejbcore/nbproject/project.xml 23 May 2007 14:42:37 -0000 @@ -347,13 +347,13 @@ org.openide.text - 6.2 + 6.16 org.openide.util Index: j2ee/ejbfreeform/nbproject/project.xml =================================================================== RCS file: /cvs/j2ee/ejbfreeform/nbproject/project.xml,v retrieving revision 1.25 diff -u -6 -r1.25 project.xml --- j2ee/ejbfreeform/nbproject/project.xml 4 May 2007 11:18:43 -0000 1.25 +++ j2ee/ejbfreeform/nbproject/project.xml 23 May 2007 14:42:40 -0000 @@ -190,13 +190,13 @@ org.openide.text - 6.2 + 6.16 org.openide.util Index: j2ee/ejbjarproject/nbproject/project.xml =================================================================== RCS file: /cvs/j2ee/ejbjarproject/nbproject/project.xml,v retrieving revision 1.40 diff -u -6 -r1.40 project.xml --- j2ee/ejbjarproject/nbproject/project.xml 10 May 2007 07:54:44 -0000 1.40 +++ j2ee/ejbjarproject/nbproject/project.xml 23 May 2007 14:42:42 -0000 @@ -356,13 +356,13 @@ org.openide.text - 6.2 + 6.16 org.openide.util Index: j2ee/persistence/nbproject/project.xml =================================================================== RCS file: /cvs/j2ee/persistence/nbproject/project.xml,v retrieving revision 1.26 diff -u -6 -r1.26 project.xml --- j2ee/persistence/nbproject/project.xml 14 May 2007 13:14:02 -0000 1.26 +++ j2ee/persistence/nbproject/project.xml 23 May 2007 14:42:45 -0000 @@ -252,13 +252,13 @@ org.openide.text - 6.2 + 6.16 org.openide.util Index: j2ee/persistence/refactoring/nbproject/project.xml =================================================================== RCS file: /cvs/j2ee/persistence/refactoring/nbproject/project.xml,v retrieving revision 1.2 diff -u -6 -r1.2 project.xml --- j2ee/persistence/refactoring/nbproject/project.xml 21 May 2007 11:38:19 -0000 1.2 +++ j2ee/persistence/refactoring/nbproject/project.xml 23 May 2007 14:42:45 -0000 @@ -135,13 +135,13 @@ org.openide.text - 6.15 + 6.16 org.openide.util Index: j2ee/persistence/verification/nbproject/project.xml =================================================================== RCS file: /cvs/j2ee/persistence/verification/nbproject/project.xml,v retrieving revision 1.7 diff -u -6 -r1.7 project.xml --- j2ee/persistence/verification/nbproject/project.xml 10 May 2007 15:24:37 -0000 1.7 +++ j2ee/persistence/verification/nbproject/project.xml 23 May 2007 14:42:47 -0000 @@ -128,13 +128,13 @@ org.openide.text - 6.15 + 6.16 org.openide.util Index: j2ee/refactoring/nbproject/project.xml =================================================================== RCS file: /cvs/j2ee/refactoring/nbproject/project.xml,v retrieving revision 1.19 diff -u -6 -r1.19 project.xml --- j2ee/refactoring/nbproject/project.xml 12 Oct 2006 14:53:48 -0000 1.19 +++ j2ee/refactoring/nbproject/project.xml 23 May 2007 14:42:51 -0000 @@ -230,13 +230,13 @@ org.openide.text - 6.2 + 6.16 org.openide.util Index: j2ee/utilities/nbproject/project.xml =================================================================== RCS file: /cvs/j2ee/utilities/nbproject/project.xml,v retrieving revision 1.64 diff -u -6 -r1.64 project.xml --- j2ee/utilities/nbproject/project.xml 23 Apr 2007 15:17:28 -0000 1.64 +++ j2ee/utilities/nbproject/project.xml 23 May 2007 14:43:05 -0000 @@ -223,13 +223,13 @@ org.openide.text - 6.2 + 6.16 org.openide.util Index: j2eeserver/nbproject/project.xml =================================================================== RCS file: /cvs/j2eeserver/nbproject/project.xml,v retrieving revision 1.19 diff -u -6 -r1.19 project.xml --- j2eeserver/nbproject/project.xml 29 Mar 2007 23:04:46 -0000 1.19 +++ j2eeserver/nbproject/project.xml 23 May 2007 14:43:08 -0000 @@ -190,13 +190,13 @@ org.openide.text - 6.2 + 6.16 org.openide.util Index: java/editor/nbproject/project.xml =================================================================== RCS file: /cvs/java/editor/nbproject/project.xml,v retrieving revision 1.29 diff -u -6 -r1.29 project.xml --- java/editor/nbproject/project.xml 18 May 2007 12:38:43 -0000 1.29 +++ java/editor/nbproject/project.xml 23 May 2007 14:43:11 -0000 @@ -275,13 +275,13 @@ org.openide.text - 6.2 + 6.16 org.openide.util Index: java/freeform/nbproject/project.xml =================================================================== RCS file: /cvs/java/freeform/nbproject/project.xml,v retrieving revision 1.22 diff -u -6 -r1.22 project.xml --- java/freeform/nbproject/project.xml 2 Apr 2007 11:19:49 -0000 1.22 +++ java/freeform/nbproject/project.xml 23 May 2007 14:43:18 -0000 @@ -156,13 +156,13 @@ org.openide.text - 6.2 + 6.16 org.openide.util Index: java/guards/nbproject/project.xml =================================================================== RCS file: /cvs/java/guards/nbproject/project.xml,v retrieving revision 1.2 diff -u -6 -r1.2 project.xml --- java/guards/nbproject/project.xml 24 Oct 2006 12:55:19 -0000 1.2 +++ java/guards/nbproject/project.xml 23 May 2007 14:43:19 -0000 @@ -34,13 +34,13 @@ org.openide.text - 6.12 + 6.16 org.openide.windows Index: java/hints/nbproject/project.xml =================================================================== RCS file: /cvs/java/hints/nbproject/project.xml,v retrieving revision 1.23 diff -u -6 -r1.23 project.xml --- java/hints/nbproject/project.xml 18 Apr 2007 11:53:13 -0000 1.23 +++ java/hints/nbproject/project.xml 23 May 2007 14:43:20 -0000 @@ -164,13 +164,13 @@ org.openide.text - 6.2 + 6.16 org.openide.util Index: java/javacore/nbproject/project.xml =================================================================== RCS file: /cvs/java/javacore/nbproject/project.xml,v retrieving revision 1.18 diff -u -6 -r1.18 project.xml --- java/javacore/nbproject/project.xml 25 Aug 2006 13:23:17 -0000 1.18 +++ java/javacore/nbproject/project.xml 23 May 2007 14:43:23 -0000 @@ -170,13 +170,13 @@ org.openide.text - 6.2 + 6.16 unit Index: java/navigation/nbproject/project.xml =================================================================== RCS file: /cvs/java/navigation/nbproject/project.xml,v retrieving revision 1.11 diff -u -6 -r1.11 project.xml --- java/navigation/nbproject/project.xml 15 Mar 2007 05:24:50 -0000 1.11 +++ java/navigation/nbproject/project.xml 23 May 2007 14:43:28 -0000 @@ -134,13 +134,13 @@ org.openide.text - 6.2 + 6.16 org.openide.util Index: java/nbproject/project.xml =================================================================== RCS file: /cvs/java/nbproject/project.xml,v retrieving revision 1.28 diff -u -6 -r1.28 project.xml --- java/nbproject/project.xml 11 May 2007 14:24:05 -0000 1.28 +++ java/nbproject/project.xml 23 May 2007 14:43:30 -0000 @@ -113,13 +113,13 @@ org.openide.text - 6.12 + 6.16 org.openide.actions Index: java/source/nbproject/project.xml =================================================================== RCS file: /cvs/java/source/nbproject/project.xml,v retrieving revision 1.16 diff -u -6 -r1.16 project.xml --- java/source/nbproject/project.xml 17 Apr 2007 14:26:12 -0000 1.16 +++ java/source/nbproject/project.xml 23 May 2007 14:43:32 -0000 @@ -234,13 +234,13 @@ org.openide.text - 6.2 + 6.16 org.openide.util Index: java/srcmodel/nbproject/project.xml =================================================================== RCS file: /cvs/java/srcmodel/nbproject/project.xml,v retrieving revision 1.9 diff -u -6 -r1.9 project.xml --- java/srcmodel/nbproject/project.xml 9 Nov 2006 16:54:04 -0000 1.9 +++ java/srcmodel/nbproject/project.xml 23 May 2007 14:43:37 -0000 @@ -97,13 +97,13 @@ org.openide.text - 6.2 + 6.16 org.openide.actions Index: javacvs/cvsmodule/nbproject/project.xml =================================================================== RCS file: /cvs/javacvs/cvsmodule/nbproject/project.xml,v retrieving revision 1.21 diff -u -6 -r1.21 project.xml --- javacvs/cvsmodule/nbproject/project.xml 29 Mar 2007 12:08:02 -0000 1.21 +++ javacvs/cvsmodule/nbproject/project.xml 23 May 2007 14:43:41 -0000 @@ -231,13 +231,13 @@ org.openide.text - 6.0 + 6.16 org.openide.util Index: javadoc/nbproject/project.xml =================================================================== RCS file: /cvs/javadoc/nbproject/project.xml,v retrieving revision 1.20 diff -u -6 -r1.20 project.xml --- javadoc/nbproject/project.xml 18 Apr 2007 11:53:11 -0000 1.20 +++ javadoc/nbproject/project.xml 23 May 2007 14:43:45 -0000 @@ -167,13 +167,13 @@ org.openide.text - 6.12 + 6.16 org.openide.util Index: javawebstart/nbproject/project.xml =================================================================== RCS file: /cvs/javawebstart/nbproject/project.xml,v retrieving revision 1.4 diff -u -6 -r1.4 project.xml --- javawebstart/nbproject/project.xml 19 Apr 2007 09:07:13 -0000 1.4 +++ javawebstart/nbproject/project.xml 23 May 2007 14:43:46 -0000 @@ -94,13 +94,13 @@ org.openide.text - 6.12 + 6.16 org.openide.util Index: jellytools/nbproject/project.xml =================================================================== RCS file: /cvs/jellytools/nbproject/project.xml,v retrieving revision 1.27 diff -u -6 -r1.27 project.xml --- jellytools/nbproject/project.xml 16 Jan 2007 12:58:14 -0000 1.27 +++ jellytools/nbproject/project.xml 23 May 2007 14:43:47 -0000 @@ -187,13 +187,13 @@ org.openide.text - 6.2 + 6.16 org.openide.util Index: jemmysupport/nbproject/project.xml =================================================================== RCS file: /cvs/jemmysupport/nbproject/project.xml,v retrieving revision 1.17 diff -u -6 -r1.17 project.xml --- jemmysupport/nbproject/project.xml 1 Nov 2006 11:38:15 -0000 1.17 +++ jemmysupport/nbproject/project.xml 23 May 2007 14:43:54 -0000 @@ -179,13 +179,13 @@ org.openide.text - 6.2 + 6.16 org.openide.util Index: junit/nbproject/project.xml =================================================================== RCS file: /cvs/junit/nbproject/project.xml,v retrieving revision 1.22 diff -u -6 -r1.22 project.xml --- junit/nbproject/project.xml 7 Jan 2007 22:35:58 -0000 1.22 +++ junit/nbproject/project.xml 23 May 2007 14:43:57 -0000 @@ -162,13 +162,13 @@ org.openide.text - 6.2 + 6.16 org.openide.util Index: languages/engine/nbproject/project.xml =================================================================== RCS file: /cvs/languages/engine/nbproject/project.xml,v retrieving revision 1.12 diff -u -6 -r1.12 project.xml --- languages/engine/nbproject/project.xml 16 May 2007 15:00:25 -0000 1.12 +++ languages/engine/nbproject/project.xml 23 May 2007 14:44:02 -0000 @@ -163,13 +163,13 @@ org.openide.text - 6.7 + 6.16 org.openide.util Index: languages/html/nbproject/project.xml =================================================================== RCS file: /cvs/languages/html/nbproject/project.xml,v retrieving revision 1.16 diff -u -6 -r1.16 project.xml --- languages/html/nbproject/project.xml 8 Apr 2007 08:47:00 -0000 1.16 +++ languages/html/nbproject/project.xml 23 May 2007 14:44:04 -0000 @@ -61,13 +61,13 @@ org.openide.text - 6.12 + 6.16 Index: languages/scala/core/nbproject/project.xml =================================================================== RCS file: /cvs/languages/scala/core/nbproject/project.xml,v retrieving revision 1.2 diff -u -6 -r1.2 project.xml --- languages/scala/core/nbproject/project.xml 12 May 2007 19:19:49 -0000 1.2 +++ languages/scala/core/nbproject/project.xml 23 May 2007 14:44:07 -0000 @@ -40,13 +40,13 @@ org.openide.text - 6.11 + 6.16 org.openide.util Index: languages/studio/nbproject/project.xml =================================================================== RCS file: /cvs/languages/studio/nbproject/project.xml,v retrieving revision 1.7 diff -u -6 -r1.7 project.xml --- languages/studio/nbproject/project.xml 26 Apr 2007 18:41:45 -0000 1.7 +++ languages/studio/nbproject/project.xml 23 May 2007 14:44:07 -0000 @@ -107,13 +107,13 @@ org.openide.text - 6.7 + 6.16 org.openide.util Index: languages/xml/nbproject/project.xml =================================================================== RCS file: /cvs/languages/xml/nbproject/project.xml,v retrieving revision 1.5 diff -u -6 -r1.5 project.xml --- languages/xml/nbproject/project.xml 8 Apr 2007 12:28:13 -0000 1.5 +++ languages/xml/nbproject/project.xml 23 May 2007 14:44:08 -0000 @@ -25,13 +25,13 @@ org.openide.text - 6.12 + 6.16 org.openide.util Index: latex/auted/nbproject/project.xml =================================================================== RCS file: /cvs/latex/auted/nbproject/project.xml,v retrieving revision 1.6 diff -u -6 -r1.6 project.xml --- latex/auted/nbproject/project.xml 30 Jun 2006 14:04:36 -0000 1.6 +++ latex/auted/nbproject/project.xml 23 May 2007 14:44:09 -0000 @@ -74,13 +74,13 @@ org.openide.text - 6.2 + 6.16 org.openide.actions Index: latex/bibtex/nbproject/project.xml =================================================================== RCS file: /cvs/latex/bibtex/nbproject/project.xml,v retrieving revision 1.10 diff -u -6 -r1.10 project.xml --- latex/bibtex/nbproject/project.xml 30 Jun 2006 14:04:40 -0000 1.10 +++ latex/bibtex/nbproject/project.xml 23 May 2007 14:44:09 -0000 @@ -118,13 +118,13 @@ org.openide.text - 6.2 + 6.16 org.openide.util Index: latex/completion/nbproject/project.xml =================================================================== RCS file: /cvs/latex/completion/nbproject/project.xml,v retrieving revision 1.4 diff -u -6 -r1.4 project.xml --- latex/completion/nbproject/project.xml 15 May 2006 17:50:54 -0000 1.4 +++ latex/completion/nbproject/project.xml 23 May 2007 14:44:10 -0000 @@ -100,13 +100,13 @@ org.openide.text - 6.2 + 6.16 org.openide.util Index: latex/core/nbproject/project.xml =================================================================== RCS file: /cvs/latex/core/nbproject/project.xml,v retrieving revision 1.8 diff -u -6 -r1.8 project.xml --- latex/core/nbproject/project.xml 5 Aug 2006 21:32:11 -0000 1.8 +++ latex/core/nbproject/project.xml 23 May 2007 14:44:11 -0000 @@ -107,13 +107,13 @@ org.openide.text - 6.2 + 6.16 org.openide.util Index: latex/editor/nbproject/project.xml =================================================================== RCS file: /cvs/latex/editor/nbproject/project.xml,v retrieving revision 1.14 diff -u -6 -r1.14 project.xml --- latex/editor/nbproject/project.xml 30 Jun 2006 14:04:56 -0000 1.14 +++ latex/editor/nbproject/project.xml 23 May 2007 14:44:13 -0000 @@ -140,13 +140,13 @@ org.openide.text - 6.2 + 6.16 org.openide.util Index: latex/guiproject/nbproject/project.xml =================================================================== RCS file: /cvs/latex/guiproject/nbproject/project.xml,v retrieving revision 1.17 diff -u -6 -r1.17 project.xml --- latex/guiproject/nbproject/project.xml 5 Aug 2006 21:32:16 -0000 1.17 +++ latex/guiproject/nbproject/project.xml 23 May 2007 14:44:13 -0000 @@ -194,13 +194,13 @@ org.openide.text - 6.2 + 6.16 org.openide.util Index: latex/hints/nbproject/project.xml =================================================================== RCS file: /cvs/latex/hints/nbproject/project.xml,v retrieving revision 1.7 diff -u -6 -r1.7 project.xml --- latex/hints/nbproject/project.xml 30 Jun 2006 14:05:10 -0000 1.7 +++ latex/hints/nbproject/project.xml 23 May 2007 14:44:14 -0000 @@ -51,13 +51,13 @@ org.openide.text - 6.2 + 6.16 org.openide.util Index: latex/loaders/nbproject/project.xml =================================================================== RCS file: /cvs/latex/loaders/nbproject/project.xml,v retrieving revision 1.8 diff -u -6 -r1.8 project.xml --- latex/loaders/nbproject/project.xml 30 Jun 2006 14:05:12 -0000 1.8 +++ latex/loaders/nbproject/project.xml 23 May 2007 14:44:14 -0000 @@ -82,13 +82,13 @@ org.openide.text - 6.2 + 6.16 org.openide.actions Index: latex/model/nbproject/project.xml =================================================================== RCS file: /cvs/latex/model/nbproject/project.xml,v retrieving revision 1.11 diff -u -6 -r1.11 project.xml --- latex/model/nbproject/project.xml 5 Aug 2006 21:32:18 -0000 1.11 +++ latex/model/nbproject/project.xml 23 May 2007 14:44:15 -0000 @@ -75,13 +75,13 @@ org.openide.text - 6.2 + 6.16 org.openide.util Index: latex/ui/nbproject/project.xml =================================================================== RCS file: /cvs/latex/ui/nbproject/project.xml,v retrieving revision 1.13 diff -u -6 -r1.13 project.xml --- latex/ui/nbproject/project.xml 30 Jun 2006 14:05:32 -0000 1.13 +++ latex/ui/nbproject/project.xml 23 May 2007 14:44:17 -0000 @@ -209,13 +209,13 @@ org.openide.text - 6.2 + 6.16 org.openide.util Index: lexer/editorbridge/calc/nbproject/project.xml =================================================================== RCS file: /cvs/lexer/editorbridge/calc/nbproject/project.xml,v retrieving revision 1.10 diff -u -6 -r1.10 project.xml --- lexer/editorbridge/calc/nbproject/project.xml 2 Feb 2007 14:46:36 -0000 1.10 +++ lexer/editorbridge/calc/nbproject/project.xml 23 May 2007 14:44:18 -0000 @@ -82,13 +82,13 @@ org.openide.text - 6.2 + 6.16 org.openide.actions Index: logger/uihandler/nbproject/project.xml =================================================================== RCS file: /cvs/logger/uihandler/nbproject/project.xml,v retrieving revision 1.11 diff -u -6 -r1.11 project.xml --- logger/uihandler/nbproject/project.xml 5 May 2007 16:45:49 -0000 1.11 +++ logger/uihandler/nbproject/project.xml 23 May 2007 14:44:22 -0000 @@ -106,13 +106,13 @@ org.openide.text - 6.12 + 6.16 org.openide.util Index: management/jmx/nbproject/project.xml =================================================================== RCS file: /cvs/management/jmx/nbproject/project.xml,v retrieving revision 1.20 diff -u -6 -r1.20 project.xml --- management/jmx/nbproject/project.xml 10 Jan 2007 15:57:49 -0000 1.20 +++ management/jmx/nbproject/project.xml 23 May 2007 14:44:26 -0000 @@ -202,13 +202,13 @@ org.openide.text - 6 + 6.16 org.openide.util Index: mobility/designer/nbproject/project.xml =================================================================== RCS file: /cvs/mobility/designer/nbproject/project.xml,v retrieving revision 1.8 diff -u -6 -r1.8 project.xml --- mobility/designer/nbproject/project.xml 16 Apr 2007 13:26:07 -0000 1.8 +++ mobility/designer/nbproject/project.xml 23 May 2007 14:44:45 -0000 @@ -240,13 +240,13 @@ org.openide.text - 6.2 + 6.16 org.openide.util Index: mobility/designer2/codegen/nbproject/project.xml =================================================================== RCS file: /cvs/mobility/designer2/codegen/nbproject/project.xml,v retrieving revision 1.2 diff -u -6 -r1.2 project.xml --- mobility/designer2/codegen/nbproject/project.xml 22 Dec 2006 14:22:38 -0000 1.2 +++ mobility/designer2/codegen/nbproject/project.xml 23 May 2007 14:44:48 -0000 @@ -66,13 +66,13 @@ org.openide.text - 6.12 + 6.16 org.openide.util Index: mobility/designer2/io/nbproject/project.xml =================================================================== RCS file: /cvs/mobility/designer2/io/nbproject/project.xml,v retrieving revision 1.2 diff -u -6 -r1.2 project.xml --- mobility/designer2/io/nbproject/project.xml 22 Dec 2006 14:22:40 -0000 1.2 +++ mobility/designer2/io/nbproject/project.xml 23 May 2007 14:44:50 -0000 @@ -134,13 +134,13 @@ org.openide.text - 6.8 + 6.16 org.openide.util Index: mobility/designer2/iojavame/nbproject/project.xml =================================================================== RCS file: /cvs/mobility/designer2/iojavame/nbproject/project.xml,v retrieving revision 1.4 diff -u -6 -r1.4 project.xml --- mobility/designer2/iojavame/nbproject/project.xml 20 Apr 2007 07:59:39 -0000 1.4 +++ mobility/designer2/iojavame/nbproject/project.xml 23 May 2007 14:44:50 -0000 @@ -223,13 +223,13 @@ org.openide.text - 6.8 + 6.16 org.openide.util Index: mobility/designer2/midp/nbproject/project.xml =================================================================== RCS file: /cvs/mobility/designer2/midp/nbproject/project.xml,v retrieving revision 1.12 diff -u -6 -r1.12 project.xml --- mobility/designer2/midp/nbproject/project.xml 20 Apr 2007 17:12:26 -0000 1.12 +++ mobility/designer2/midp/nbproject/project.xml 23 May 2007 14:44:52 -0000 @@ -310,13 +310,13 @@ org.openide.text - 6.12 + 6.16 org.openide.util Index: mobility/editor/nbproject/project.xml =================================================================== RCS file: /cvs/mobility/editor/nbproject/project.xml,v retrieving revision 1.10 diff -u -6 -r1.10 project.xml --- mobility/editor/nbproject/project.xml 19 Jan 2007 16:11:13 -0000 1.10 +++ mobility/editor/nbproject/project.xml 23 May 2007 14:44:56 -0000 @@ -210,13 +210,13 @@ org.openide.text - 6.2 + 6.16 org.openide.util Index: mobility/end2end/jsr172/nbproject/project.xml =================================================================== RCS file: /cvs/mobility/end2end/jsr172/nbproject/project.xml,v retrieving revision 1.5 diff -u -6 -r1.5 project.xml --- mobility/end2end/jsr172/nbproject/project.xml 15 Feb 2007 07:58:46 -0000 1.5 +++ mobility/end2end/jsr172/nbproject/project.xml 23 May 2007 14:44:57 -0000 @@ -169,13 +169,13 @@ org.openide.text - 6.12 + 6.16 org.openide.util Index: mobility/end2end/nbproject/project.xml =================================================================== RCS file: /cvs/mobility/end2end/nbproject/project.xml,v retrieving revision 1.4 diff -u -6 -r1.4 project.xml --- mobility/end2end/nbproject/project.xml 8 Jan 2007 17:00:11 -0000 1.4 +++ mobility/end2end/nbproject/project.xml 23 May 2007 14:44:59 -0000 @@ -313,13 +313,13 @@ org.openide.text - 6.2 + 6.16 org.openide.util Index: mobility/project/nbproject/project.xml =================================================================== RCS file: /cvs/mobility/project/nbproject/project.xml,v retrieving revision 1.18 diff -u -6 -r1.18 project.xml --- mobility/project/nbproject/project.xml 27 Apr 2007 14:45:52 -0000 1.18 +++ mobility/project/nbproject/project.xml 23 May 2007 14:45:05 -0000 @@ -297,13 +297,13 @@ org.openide.text - 6.2 + 6.16 org.openide.util Index: mobility/snippets/nbproject/project.xml =================================================================== RCS file: /cvs/mobility/snippets/nbproject/project.xml,v retrieving revision 1.2 diff -u -6 -r1.2 project.xml --- mobility/snippets/nbproject/project.xml 7 Dec 2006 14:53:14 -0000 1.2 +++ mobility/snippets/nbproject/project.xml 23 May 2007 14:45:08 -0000 @@ -41,13 +41,13 @@ org.openide.text - 6.12 + 6.16 org.openide.util Index: mobility/svg/core/nbproject/project.xml =================================================================== RCS file: /cvs/mobility/svg/core/nbproject/project.xml,v retrieving revision 1.2 diff -u -6 -r1.2 project.xml --- mobility/svg/core/nbproject/project.xml 7 Dec 2006 14:53:16 -0000 1.2 +++ mobility/svg/core/nbproject/project.xml 23 May 2007 14:45:08 -0000 @@ -182,13 +182,13 @@ org.openide.text - 6.12 + 6.16 org.openide.util Index: monitor/jmeter/nbproject/project.xml =================================================================== RCS file: /cvs/monitor/jmeter/nbproject/project.xml,v retrieving revision 1.5 diff -u -6 -r1.5 project.xml --- monitor/jmeter/nbproject/project.xml 8 Mar 2007 16:34:09 -0000 1.5 +++ monitor/jmeter/nbproject/project.xml 23 May 2007 14:45:11 -0000 @@ -74,13 +74,13 @@ org.openide.text - 6.12 + 6.16 org.openide.util Index: openide/actions/nbproject/project.xml =================================================================== RCS file: /cvs/openide/actions/nbproject/project.xml,v retrieving revision 1.10 diff -u -6 -r1.10 project.xml --- openide/actions/nbproject/project.xml 9 Nov 2006 16:53:52 -0000 1.10 +++ openide/actions/nbproject/project.xml 23 May 2007 14:45:18 -0000 @@ -45,25 +45,17 @@ 6.5 - org.openide.options - - - - 6.2 - - - org.openide.text - 6.2 + 6.16 org.openide.explorer Index: openide/actions/src/org/openide/actions/PageSetupAction.java =================================================================== RCS file: /cvs/openide/actions/src/org/openide/actions/PageSetupAction.java,v retrieving revision 1.3 diff -u -6 -r1.3 PageSetupAction.java --- openide/actions/src/org/openide/actions/PageSetupAction.java 1 Jul 2006 09:07:18 -0000 1.3 +++ openide/actions/src/org/openide/actions/PageSetupAction.java 23 May 2007 14:45:18 -0000 @@ -10,18 +10,18 @@ * and include the License file at http://www.netbeans.org/cddl.txt. * If applicable, add the following below the CDDL Header, with the fields * enclosed by brackets [] replaced by your own identifying information: * "Portions Copyrighted [year] [name of copyright owner]" * * The Original Software is NetBeans. The Initial Developer of the Original - * Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun + * Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun * Microsystems, Inc. All Rights Reserved. */ package org.openide.actions; -import org.openide.text.PrintSettings; +import org.openide.text.PrintPreferences; import org.openide.util.HelpCtx; import org.openide.util.NbBundle; import org.openide.util.actions.CallableSystemAction; import java.awt.print.PrinterJob; @@ -31,15 +31,14 @@ public final class PageSetupAction extends CallableSystemAction { public PageSetupAction() { putValue("noIconInMenu", Boolean.TRUE); //NOI18N } public synchronized void performAction() { - PrintSettings ps = (PrintSettings) PrintSettings.findObject(PrintSettings.class, true); PrinterJob pj = PrinterJob.getPrinterJob(); - ps.setPageFormat(pj.pageDialog(PrintSettings.getPageFormat(pj))); + PrintPreferences.setPageFormat(pj.pageDialog(PrintPreferences.getPageFormat(pj))); } protected boolean asynchronous() { return false; } Index: openide/compat/nbproject/project.xml =================================================================== RCS file: /cvs/openide/compat/nbproject/project.xml,v retrieving revision 1.11 diff -u -6 -r1.11 project.xml --- openide/compat/nbproject/project.xml 30 Nov 2006 17:24:42 -0000 1.11 +++ openide/compat/nbproject/project.xml 23 May 2007 14:45:19 -0000 @@ -81,13 +81,13 @@ org.openide.text - 6.2 + 6.16 org.openide.util Index: openide/loaders/nbproject/project.xml =================================================================== RCS file: /cvs/openide/loaders/nbproject/project.xml,v retrieving revision 1.29 diff -u -6 -r1.29 project.xml --- openide/loaders/nbproject/project.xml 4 Apr 2007 08:32:47 -0000 1.29 +++ openide/loaders/nbproject/project.xml 23 May 2007 14:45:22 -0000 @@ -99,13 +99,13 @@ org.openide.text - 6.2 + 6.16 org.openide.util Index: openide/nbproject/project.xml =================================================================== RCS file: /cvs/openide/nbproject/project.xml,v retrieving revision 1.12 diff -u -6 -r1.12 project.xml --- openide/nbproject/project.xml 9 Nov 2006 16:53:53 -0000 1.12 +++ openide/nbproject/project.xml 23 May 2007 14:45:26 -0000 @@ -139,13 +139,13 @@ org.openide.text - 6.2 + 6.16 org.openide.util Index: openide/options/manifest.mf =================================================================== RCS file: /cvs/openide/options/manifest.mf,v retrieving revision 1.8 diff -u -6 -r1.8 manifest.mf --- openide/options/manifest.mf 9 Nov 2006 16:54:16 -0000 1.8 +++ openide/options/manifest.mf 23 May 2007 14:45:27 -0000 @@ -1,6 +1,6 @@ Manifest-Version: 1.0 OpenIDE-Module: org.openide.options -OpenIDE-Module-Specification-Version: 6.6 +OpenIDE-Module-Specification-Version: 6.7 OpenIDE-Module-Localizing-Bundle: org/openide/options/Bundle.properties OpenIDE-Module-Deprecated: true Index: openide/options/nbproject/project.xml =================================================================== RCS file: /cvs/openide/options/nbproject/project.xml,v retrieving revision 1.8 diff -u -6 -r1.8 project.xml --- openide/options/nbproject/project.xml 9 Nov 2006 16:54:16 -0000 1.8 +++ openide/options/nbproject/project.xml 23 May 2007 14:45:27 -0000 @@ -21,12 +21,20 @@ org.netbeans.modules.apisupport.project org.openide.options + org.openide.text + + + + 6.16 + + + org.openide.util 6.2 @@ -45,10 +53,11 @@ qa-functional org.openide.explorer.propertysheet org.openide.options + org.openide.text Index: openide/options/src/org/openide/text/NbDocument$Colors.java =================================================================== RCS file: openide/options/src/org/openide/text/NbDocument$Colors.java diff -N openide/options/src/org/openide/text/NbDocument$Colors.java --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openide/options/src/org/openide/text/NbDocument$Colors.java 23 May 2007 14:45:27 -0000 @@ -0,0 +1,61 @@ +/* + * The contents of this file are subject to the terms of the Common Development + * and Distribution License (the License). You may not use this file except in + * compliance with the License. + * + * You can obtain a copy of the License at http://www.netbeans.org/cddl.html + * or http://www.netbeans.org/cddl.txt. + * + * When distributing Covered Code, include this CDDL Header Notice in each file + * and include the License file at http://www.netbeans.org/cddl.txt. + * If applicable, add the following below the CDDL Header, with the fields + * enclosed by brackets [] replaced by your own identifying information: + * "Portions Copyrighted [year] [name of copyright owner]" + * + * The Original Software is NetBeans. The Initial Developer of the Original + * Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun + * Microsystems, Inc. All Rights Reserved. + */ +package org.openide.text; + +import java.awt.Color; + + +/** Dummy class holding utility methods for working with NetBeans document conventions. +* +* @author Jaroslav Tulach +*/ + + +/** @deprecated Not useful for anything. */ +public final class NbDocument$Colors extends org.openide.options.SystemOption { + public static final String PROP_BREAKPOINT = "NbBreakpointStyle"; // NOI18N + public static final String PROP_ERROR = "NbErrorStyle"; // NOI18N + public static final String PROP_CURRENT = "NbCurrentStyle"; // NOI18N + static final long serialVersionUID = -9152250591365746193L; + + public void setBreakpoint(Color c) { + } + + public Color getBreakpoint() { + return new Color(127, 127, 255); + } + + public void setError(Color c) { + } + + public Color getError() { + return Color.red; + } + + public void setCurrent(Color c) { + } + + public Color getCurrent() { + return Color.magenta; + } + + public String displayName() { + return "COLORS"; // NOI18N + } +} Index: openide/options/src/org/openide/text/PrintSettings.java =================================================================== RCS file: openide/options/src/org/openide/text/PrintSettings.java diff -N openide/options/src/org/openide/text/PrintSettings.java --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openide/options/src/org/openide/text/PrintSettings.java 23 May 2007 14:45:28 -0000 @@ -0,0 +1,267 @@ +/* + * The contents of this file are subject to the terms of the Common Development + * and Distribution License (the License). You may not use this file except in + * compliance with the License. + * + * You can obtain a copy of the License at http://www.netbeans.org/cddl.html + * or http://www.netbeans.org/cddl.txt. + * + * When distributing Covered Code, include this CDDL Header Notice in each file + * and include the License file at http://www.netbeans.org/cddl.txt. + * If applicable, add the following below the CDDL Header, with the fields + * enclosed by brackets [] replaced by your own identifying information: + * "Portions Copyrighted [year] [name of copyright owner]" + * + * The Original Software is NetBeans. The Initial Developer of the Original + * Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun + * Microsystems, Inc. All Rights Reserved. + */ +package org.openide.text; + +import org.openide.options.ContextSystemOption; +import org.openide.util.HelpCtx; +import org.openide.util.NbBundle; +import java.awt.Font; +import java.awt.print.PageFormat; +import java.awt.print.PrinterJob; + +/** Settings for output window. +* +* @author Ales Novak +*/ +public final class PrintSettings extends ContextSystemOption { + // final because overrides Externalizable methods + + /** serialVersionUID */ + static final long serialVersionUID = -9102470021814206818L; + + /** Constant for center position of page header. */ + public static final int CENTER = 0x1; + + /** Constant for right position of page header. */ + public static final int RIGHT = 0x2; + + /** Constant for left position of page header. */ + public static final int LEFT = 0x0; + + /** Property name of the wrap property */ + public static final String PROP_PAGE_FORMAT = "pageFormat"; // NOI18N + + /** Property name of the wrap property */ + public static final String PROP_WRAP = "wrap"; // NOI18N + + /** Property name of the header format property */ + public static final String PROP_HEADER_FORMAT = "headerFormat"; // NOI18N + + /** Property name of the footer format property */ + public static final String PROP_FOOTER_FORMAT = "footerFormat"; // NOI18N + + /** Property name of the header font property */ + public static final String PROP_HEADER_FONT = "headerFont"; // NOI18N + + /** Property name of the footer font property */ + public static final String PROP_FOOTER_FONT = "footerFont"; // NOI18N + + /** Property name of the header alignment property */ + public static final String PROP_HEADER_ALIGNMENT = "headerAlignment"; // NOI18N + + /** Property name of the footer alignment property */ + public static final String PROP_FOOTER_ALIGNMENT = "footerAlignment"; // NOI18N + + /** Property name of the line ascent correction property */ + public static final String PROP_LINE_ASCENT_CORRECTION = "lineAscentCorrection"; // NOI18N + private static final String HELP_ID = "editing.printing"; // !!! NOI18N + + + public String displayName() { + return NbBundle.getMessage(PrintSettings.class, "CTL_Print_settings"); + } + + public HelpCtx getHelpCtx() { + return new HelpCtx(HELP_ID); + } + + /** @return an instance of PageFormat + * The returned page format is either previously set by + * PageSetupAction or is acquired as a default PageFormat + * from supported PrinterJob + */ + public static PageFormat getPageFormat(PrinterJob pj) { + return PrintPreferences.getPageFormat(pj); + } + + /** @deprecated Use {@link #getPageFormat(PrinterJob)} instead. */ + public PageFormat getPageFormat() { + return getPageFormat(PrinterJob.getPrinterJob()); + } + + /** sets page format */ + public void setPageFormat(PageFormat pf) { + PrintPreferences.setPageFormat(pf); + firePropertyChange(PROP_PAGE_FORMAT, null, pf); + } + + public boolean getWrap() { + return PrintPreferences.getWrap(); + } + + public void setWrap(boolean b) { + PrintPreferences.setWrap(b); + firePropertyChange(PROP_WRAP, (b ? Boolean.FALSE : Boolean.TRUE), (b ? Boolean.TRUE : Boolean.FALSE)); + } + + public String getHeaderFormat() { + return PrintPreferences.getHeaderFormat(); + } + + public void setHeaderFormat(String s) { + PrintPreferences.setHeaderFormat(s); + firePropertyChange(PROP_HEADER_FORMAT, null, s); + } + + public String getFooterFormat() { + return PrintPreferences.getFooterFormat(); + } + + public void setFooterFormat(String s) { + PrintPreferences.setFooterFormat(s); + firePropertyChange(PROP_FOOTER_FORMAT, null, s); + } + + public Font getHeaderFont() { + return PrintPreferences.getHeaderFont(); + } + + public void setHeaderFont(Font f) { + PrintPreferences.setHeaderFont(f); + firePropertyChange(PROP_HEADER_FONT, null, f); + } + + public Font getFooterFont() { + return PrintPreferences.getFooterFont(); + } + + public void setFooterFont(Font f) { + PrintPreferences.setFooterFont(f); + firePropertyChange(PROP_FOOTER_FONT, null, f); + } + + public int getHeaderAlignment() { + return fromAlignment(PrintPreferences.getHeaderAlignment()); + } + + public void setHeaderAlignment(int alignment) { + PrintPreferences.setHeaderAlignment(toAlignment(alignment)); + firePropertyChange(PROP_HEADER_ALIGNMENT, null, new Integer(alignment)); + } + + private PrintPreferences.Alignment toAlignment(int alignment) { + PrintPreferences.Alignment retval = PrintPreferences.Alignment.CENTER; + switch(alignment) { + case CENTER: + retval = PrintPreferences.Alignment.CENTER; + break; + case LEFT: + retval = PrintPreferences.Alignment.LEFT; + break; + case RIGHT: + retval = PrintPreferences.Alignment.RIGHT; + break; + } + return retval; + } + + private int fromAlignment(PrintPreferences.Alignment alignment) { + int retval = CENTER; + if (PrintPreferences.Alignment.CENTER.equals(alignment)) { + retval = CENTER; + } else if (PrintPreferences.Alignment.LEFT.equals(alignment)) { + retval = LEFT; + } else if (PrintPreferences.Alignment.RIGHT.equals(alignment)) { + retval = RIGHT; + } + return retval; + } + + + public int getFooterAlignment() { + return fromAlignment(PrintPreferences.getFooterAlignment()); + } + + public void setFooterAlignment(int alignment) { + PrintPreferences.setFooterAlignment(toAlignment(alignment)); + firePropertyChange(PROP_FOOTER_ALIGNMENT, null, new Integer(alignment)); + } + + /** Getter for lineAscentCorrection property. */ + public float getLineAscentCorrection() { + return PrintPreferences.getLineAscentCorrection(); + } + + /** Setter for lineAscentCorrection property. + * @param correction the correction + * @exception IllegalArgumentException if correction is less than 0. + */ + public void setLineAscentCorrection(float correction) { + PrintPreferences.setLineAscentCorrection(correction); + firePropertyChange(PROP_LINE_ASCENT_CORRECTION, null, new Float(correction)); + } + + /** Property editor for alignment properties */ + public static class AlignmentEditor extends java.beans.PropertyEditorSupport { + private String sCENTER; + private String sRIGHT; + private String sLEFT; + private String[] tags = new String[] { + sLEFT = NbBundle.getMessage(PrintSettings.class, "CTL_LEFT"), + sCENTER = NbBundle.getMessage(PrintSettings.class, "CTL_CENTER"), + sRIGHT = NbBundle.getMessage(PrintSettings.class, "CTL_RIGHT") + }; + + public String[] getTags() { + return tags; + } + + public String getAsText() { + return tags[((Integer) getValue()).intValue()]; + } + + public void setAsText(String s) { + if (s.equals(sLEFT)) { + setValue(new Integer(0)); + } else if (s.equals(sCENTER)) { + setValue(new Integer(1)); + } else { + setValue(new Integer(2)); + } + } + } + + /** Property editor for PageFormat instances */ + public static class PageFormatEditor extends java.beans.PropertyEditorSupport { + /** No text */ + public String getAsText() { + return null; + } + + /* @return true */ + public boolean supportsCustomEditor() { + return true; + } + + /** + * @return null Shows pageDialog, however. + */ + public java.awt.Component getCustomEditor() { + PageFormat pf = (PageFormat) getValue(); + PrinterJob pj = PrinterJob.getPrinterJob(); + PageFormat npf = pj.pageDialog(pf); + + //setValue(npf); + ((PrintSettings)PrintSettings.findObject(PrintSettings.class)).setPageFormat((PageFormat) npf.clone()); + pj.cancel(); + + return null; + } + } +} Index: openide/options/src/org/openide/text/PrintSettingsBeanInfo.java =================================================================== RCS file: openide/options/src/org/openide/text/PrintSettingsBeanInfo.java diff -N openide/options/src/org/openide/text/PrintSettingsBeanInfo.java --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openide/options/src/org/openide/text/PrintSettingsBeanInfo.java 23 May 2007 14:45:28 -0000 @@ -0,0 +1,86 @@ +/* + * The contents of this file are subject to the terms of the Common Development + * and Distribution License (the License). You may not use this file except in + * compliance with the License. + * + * You can obtain a copy of the License at http://www.netbeans.org/cddl.html + * or http://www.netbeans.org/cddl.txt. + * + * When distributing Covered Code, include this CDDL Header Notice in each file + * and include the License file at http://www.netbeans.org/cddl.txt. + * If applicable, add the following below the CDDL Header, with the fields + * enclosed by brackets [] replaced by your own identifying information: + * "Portions Copyrighted [year] [name of copyright owner]" + * + * The Original Software is NetBeans. The Initial Developer of the Original + * Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun + * Microsystems, Inc. All Rights Reserved. + */ +package org.openide.text; + + +import java.awt.Image; +import java.beans.*; +import org.openide.util.*; + + +/** BeanInfo for PrintSettings. +* +* @author Ales Novak +*/ +public class PrintSettingsBeanInfo extends SimpleBeanInfo { + /** Returns the PrintSettings' icon */ + public Image getIcon(int type) { + return Utilities.loadImage("org/openide/text/printSettings.gif"); // NOI18N + } + + /** Descriptor of valid properties + * @return array of properties + */ + public PropertyDescriptor[] getPropertyDescriptors() { + try { + PropertyDescriptor[] desc = new PropertyDescriptor[] { + new PropertyDescriptor(PrintSettings.PROP_WRAP, PrintSettings.class), // 0 + new PropertyDescriptor(PrintSettings.PROP_HEADER_FORMAT, PrintSettings.class), // 1 + new PropertyDescriptor(PrintSettings.PROP_FOOTER_FORMAT, PrintSettings.class), // 2 + new PropertyDescriptor(PrintSettings.PROP_HEADER_FONT, PrintSettings.class), // 3 + new PropertyDescriptor(PrintSettings.PROP_FOOTER_FONT, PrintSettings.class), // 4 + new PropertyDescriptor(PrintSettings.PROP_HEADER_ALIGNMENT, PrintSettings.class), // 5 + new PropertyDescriptor(PrintSettings.PROP_FOOTER_ALIGNMENT, PrintSettings.class), // 6 + + // new PropertyDescriptor(PrintSettings.PROP_PAGE_FORMAT, PrintSettings.class), // 7 + new PropertyDescriptor(PrintSettings.PROP_LINE_ASCENT_CORRECTION, PrintSettings.class) // 8 + }; + desc[0].setDisplayName(NbBundle.getMessage(PrintSettings.class, "PROP_WRAP")); + desc[0].setShortDescription(NbBundle.getMessage(PrintSettings.class, "HINT_WRAP")); + desc[1].setDisplayName(NbBundle.getMessage(PrintSettings.class, "PROP_HEADER_FORMAT")); + desc[1].setShortDescription(NbBundle.getMessage(PrintSettings.class, "HINT_HEADER_FORMAT")); + desc[2].setDisplayName(NbBundle.getMessage(PrintSettings.class, "PROP_FOOTER_FORMAT")); + desc[2].setShortDescription(NbBundle.getMessage(PrintSettings.class, "HINT_FOOTER_FORMAT")); + desc[3].setDisplayName(NbBundle.getMessage(PrintSettings.class, "PROP_HEADER_FONT")); + desc[3].setShortDescription(NbBundle.getMessage(PrintSettings.class, "HINT_HEADER_FONT")); + desc[4].setDisplayName(NbBundle.getMessage(PrintSettings.class, "PROP_FOOTER_FONT")); + desc[4].setShortDescription(NbBundle.getMessage(PrintSettings.class, "HINT_FOOTER_FONT")); + desc[5].setDisplayName(NbBundle.getMessage(PrintSettings.class, "PROP_HEADER_ALIGNMENT")); + desc[5].setShortDescription(NbBundle.getMessage(PrintSettings.class, "HINT_HEADER_ALIGNMENT")); + desc[5].setPropertyEditorClass(PrintSettings.AlignmentEditor.class); + desc[6].setDisplayName(NbBundle.getMessage(PrintSettings.class, "PROP_FOOTER_ALIGNMENT")); + desc[6].setShortDescription(NbBundle.getMessage(PrintSettings.class, "HINT_FOOTER_ALIGNMENT")); + desc[6].setPropertyEditorClass(PrintSettings.AlignmentEditor.class); + + /* + desc[7].setDisplayName(PrintSettings.getString("PROP_PAGE_FORMAT")); + desc[7].setShortDescription(PrintSettings.getString("HINT_PAGE_FORMAT")); + desc[7].setPropertyEditorClass(PrintSettings.PageFormatEditor.class); + */ + desc[7].setDisplayName(NbBundle.getMessage(PrintSettings.class, "PROP_LINE_ASCENT_CORRECTION")); + desc[7].setShortDescription(NbBundle.getMessage(PrintSettings.class, "HINT_LINE_ASCENT_CORRECTION")); + + return desc; + } catch (IntrospectionException ex) { + Exceptions.printStackTrace(ex); + + return null; + } + } +} Index: openide/templates/nbproject/project.xml =================================================================== RCS file: /cvs/openide/templates/nbproject/project.xml,v retrieving revision 1.3 diff -u -6 -r1.3 project.xml --- openide/templates/nbproject/project.xml 22 Mar 2007 09:19:43 -0000 1.3 +++ openide/templates/nbproject/project.xml 23 May 2007 14:45:29 -0000 @@ -57,13 +57,13 @@ org.openide.text - 6.12 + 6.16 org.openide.util Index: openide/text/apichanges.xml =================================================================== RCS file: /cvs/openide/text/apichanges.xml,v retrieving revision 1.18 diff -u -6 -r1.18 apichanges.xml --- openide/text/apichanges.xml 13 Mar 2007 13:26:54 -0000 1.18 +++ openide/text/apichanges.xml 23 May 2007 14:45:31 -0000 @@ -20,13 +20,78 @@ Text API - + + + Public static inner class NbDocument.Colors moved to org.openide.options. + + + + + +

+ Class NbDocument.Colors was removed to remove dependency on org.openide.options. + Runtime backward compatibility was ensured by moving into org.openide.options module which is + already deprecated. +

+
+ + +
+ + + Remove public field NbDocument.COLORS + + + + + +

+ Field NbDocument.COLORS was removed to remove dependency on org.openide.options. +

+
+ + +
+ + + Adding PrintPreferences + + + + + +

+ Class PrintPreferences was added as replacement for original + class PrintSettings. +

+
+ + +
+ + + Removing PrintSettings + + + + + +

+ Classes PrintSettings and PrintSettingsBeanInfo + were removed. Runtime backward compatibility was ensured + by moving both into org.openide.options module which is already deprecated. +

+
+ + +
+ Adding Line.SHOW_REUSE and Line.SHOW_REUSE_NEW constants for Line.show method Index: openide/text/manifest.mf =================================================================== RCS file: /cvs/openide/text/manifest.mf,v retrieving revision 1.17 diff -u -6 -r1.17 manifest.mf --- openide/text/manifest.mf 6 Apr 2007 20:11:26 -0000 1.17 +++ openide/text/manifest.mf 23 May 2007 14:45:31 -0000 @@ -1,5 +1,5 @@ Manifest-Version: 1.0 OpenIDE-Module: org.openide.text -OpenIDE-Module-Specification-Version: 6.15 +OpenIDE-Module-Specification-Version: 6.16 OpenIDE-Module-Localizing-Bundle: org/openide/text/Bundle.properties Index: openide/text/module-auto-deps.xml =================================================================== RCS file: openide/text/module-auto-deps.xml diff -N openide/text/module-auto-deps.xml --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openide/text/module-auto-deps.xml 23 May 2007 14:45:31 -0000 @@ -0,0 +1,38 @@ + + + + + + + + #88531 Remove SystemOption usage from PrintSettings + + + + + + + + + + + + + Index: openide/text/nbproject/project.xml =================================================================== RCS file: /cvs/openide/text/nbproject/project.xml,v retrieving revision 1.14 diff -u -6 -r1.14 project.xml --- openide/text/nbproject/project.xml 6 Apr 2007 20:11:27 -0000 1.14 +++ openide/text/nbproject/project.xml 23 May 2007 14:45:32 -0000 @@ -54,20 +54,12 @@ 6.2
- org.openide.options - - - - 6.2 - - - org.openide.util 6.10 Index: openide/text/src/org/openide/text/CloneableEditorSupport.java =================================================================== RCS file: /cvs/openide/text/src/org/openide/text/CloneableEditorSupport.java,v retrieving revision 1.32 diff -u -6 -r1.32 CloneableEditorSupport.java --- openide/text/src/org/openide/text/CloneableEditorSupport.java 27 Apr 2007 04:50:58 -0000 1.32 +++ openide/text/src/org/openide/text/CloneableEditorSupport.java 23 May 2007 14:45:38 -0000 @@ -971,13 +971,13 @@ PrinterJob job = PrinterJob.getPrinterJob(); Object o = NbDocument.findPageable(openDocument()); if (o instanceof Pageable) { job.setPageable((Pageable) o); } else { - PageFormat pf = PrintSettings.getPageFormat(job); + PageFormat pf = PrintPreferences.getPageFormat(job); job.setPrintable((Printable) o, pf); } if (job.printDialog()) { job.print(); } Index: openide/text/src/org/openide/text/DefaultPrintable.java =================================================================== RCS file: /cvs/openide/text/src/org/openide/text/DefaultPrintable.java,v retrieving revision 1.5 diff -u -6 -r1.5 DefaultPrintable.java --- openide/text/src/org/openide/text/DefaultPrintable.java 23 Nov 2006 05:26:46 -0000 1.5 +++ openide/text/src/org/openide/text/DefaultPrintable.java 23 May 2007 14:45:39 -0000 @@ -37,16 +37,13 @@ * * @author Ales Novak */ final class DefaultPrintable extends Object implements Printable { /** Number of args. */ private static final int ARG_SIZE = 3; - - /** Options */ - private static PrintSettings printSettings; - + /** Font for CancellationDialog */ private static Font fontInstance; /** * for each item is created new LineBreakMeasurer */ @@ -112,17 +109,13 @@ * @param filename */ private DefaultPrintable(AttributedCharacterIterator[] iter, String filename) { if ((iter == null) || (iter.length == 0)) { throw new IllegalArgumentException(); } - - if (printSettings == null) { - printSettings = PrintSettings.findObject(PrintSettings.class, true); - } - + // bugfix for sun.awt.Bidi line 250 replaceEmptyIterators(iter); styledTexts = iter; // pageno = 0; @@ -428,33 +421,30 @@ * and for given alignment policy. * * @param rect Bounds of a TextLayout * @param width page width * @param alignment one of @see PageSettings#LEFT @see PageSettings#CENTER @see PageSettings#RIGHT */ - private static float computeStart(Rectangle2D rect, float width, int alignment) { + private static float computeStart(Rectangle2D rect, float width, PrintPreferences.Alignment alignment) { float x; if (rect instanceof Rectangle2D.Float) { x = ((Rectangle2D.Float) rect).width; } else { x = (float) ((Rectangle2D.Double) rect).width; } if (x >= width) { return 0; } - switch (alignment) { - case PrintSettings.LEFT: + if (alignment == PrintPreferences.Alignment.LEFT) { return 0; - - case PrintSettings.RIGHT: + } else if (alignment == PrintPreferences.Alignment.RIGHT) { return (width - x); - - default: + } else { return (width - x) / 2; } } /** * @param wrappingWidth width of the layout @@ -544,48 +534,48 @@ } // ------------------ options ----------------- /** @return true iff wrapping is on*/ private static boolean wrap() { - return printSettings.getWrap(); + return PrintPreferences.getWrap(); } /** @return String describing header */ private static String getHeaderFormat() { - return printSettings.getHeaderFormat(); + return PrintPreferences.getHeaderFormat(); } /** @return String describing footer */ private static String getFooterFormat() { - return printSettings.getFooterFormat(); + return PrintPreferences.getFooterFormat(); } /** @return font for header */ private static Font getHeaderFont() { - return printSettings.getHeaderFont(); + return PrintPreferences.getHeaderFont(); } /** @return font for footer */ private static Font getFooterFont() { - return printSettings.getFooterFont(); + return PrintPreferences.getFooterFont(); } /** @return an alignment constant for footer */ - private static int getFooterAlignment() { - return printSettings.getFooterAlignment(); + private static PrintPreferences.Alignment getFooterAlignment() { + return PrintPreferences.getFooterAlignment(); } /** @return an alignment constant for header */ - private static int getHeaderAlignment() { - return printSettings.getHeaderAlignment(); + private static PrintPreferences.Alignment getHeaderAlignment() { + return PrintPreferences.getHeaderAlignment(); } /** @return a line ascent correction */ private static float getLineAscentCorrection() { - return printSettings.getLineAscentCorrection(); + return PrintPreferences.getLineAscentCorrection(); } /** @return false */ private static boolean lineNumbers() { return false; } @@ -666,15 +656,15 @@ * @param job PrinterJob */ private void createCancellationPanel(final PrinterJob job) { cancellationPanel = new CancellationPanel(job); DialogDescriptor ddesc = new DialogDescriptor( - cancellationPanel, NbBundle.getMessage(PrintSettings.class, "CTL_Print_cancellation"), false, - new Object[] { NbBundle.getMessage(PrintSettings.class, "CTL_Cancel") }, - NbBundle.getMessage(PrintSettings.class, "CTL_Cancel"), DialogDescriptor.BOTTOM_ALIGN, null, + cancellationPanel, NbBundle.getMessage(PrintPreferences.class, "CTL_Print_cancellation"), false, + new Object[] { NbBundle.getMessage(PrintPreferences.class, "CTL_Cancel") }, + NbBundle.getMessage(PrintPreferences.class, "CTL_Cancel"), DialogDescriptor.BOTTOM_ALIGN, null, new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent ev) { setCancelled(job); closeDialog(); } } @@ -757,13 +747,13 @@ */ public CancellationPanel(PrinterJob job) { if (job == null) { throw new IllegalArgumentException(); } - format = new MessageFormat(NbBundle.getMessage(PrintSettings.class, "CTL_Print_progress")); + format = new MessageFormat(NbBundle.getMessage(PrintPreferences.class, "CTL_Print_progress")); msgParams = new Object[1]; setLayout(new java.awt.BorderLayout()); setBorder(new javax.swing.border.EmptyBorder(12, 12, 0, 12)); printProgress = new javax.swing.JLabel(); printProgress.setHorizontalAlignment(javax.swing.JLabel.CENTER); Index: openide/text/src/org/openide/text/NbDocument.java =================================================================== RCS file: /cvs/openide/text/src/org/openide/text/NbDocument.java,v retrieving revision 1.4 diff -u -6 -r1.4 NbDocument.java --- openide/text/src/org/openide/text/NbDocument.java 28 Nov 2006 01:36:47 -0000 1.4 +++ openide/text/src/org/openide/text/NbDocument.java 23 May 2007 14:45:41 -0000 @@ -70,17 +70,13 @@ public static final String CURRENT_STYLE_NAME = "NbCurrentStyle"; // NOI18N /** Name of style attached to documents to unmark a paragraph (line) * as anything special. */ public static final String NORMAL_STYLE_NAME = "NbNormalStyle"; // NOI18N - - /** @deprecated Not useful for anything. */ - @Deprecated - public static final Colors COLORS = new Colors(); - + private NbDocument() { } /** Find the root element of all lines. * All conforming NetBeans documents * should return a valid element. @@ -602,47 +598,13 @@ public void addAnnotation(Position startPos, int length, Annotation annotation); /** Removal of added annotation. * @param annotation annotation which is going to be removed */ public void removeAnnotation(Annotation annotation); } - - /** @deprecated Not useful for anything. */ - @Deprecated - public static final class Colors extends org.openide.options.SystemOption { - public static final String PROP_BREAKPOINT = BREAKPOINT_STYLE_NAME; - public static final String PROP_ERROR = ERROR_STYLE_NAME; - public static final String PROP_CURRENT = CURRENT_STYLE_NAME; - static final long serialVersionUID = -9152250591365746193L; - - public void setBreakpoint(Color c) { - } - - public Color getBreakpoint() { - return new Color(127, 127, 255); - } - - public void setError(Color c) { - } - - public Color getError() { - return Color.red; - } - - public void setCurrent(Color c) { - } - - public Color getCurrent() { - return Color.magenta; - } - - public String displayName() { - return "COLORS"; // NOI18N - } - } - + private static final class DocumentRenderer implements Runnable { private static final int FIND_LINE_NUMBER = 0; private static final int FIND_LINE_COLUMN = 1; private static final int FIND_LINE_OFFSET = 2; private StyledDocument doc; private int opCode; Index: openide/text/src/org/openide/text/PrintPreferences.java =================================================================== RCS file: openide/text/src/org/openide/text/PrintPreferences.java diff -N openide/text/src/org/openide/text/PrintPreferences.java --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openide/text/src/org/openide/text/PrintPreferences.java 23 May 2007 14:45:41 -0000 @@ -0,0 +1,291 @@ +/* + * The contents of this file are subject to the terms of the Common Development + * and Distribution License (the License). You may not use this file except in + * compliance with the License. + * + * You can obtain a copy of the License at http://www.netbeans.org/cddl.html + * or http://www.netbeans.org/cddl.txt. + * + * When distributing Covered Code, include this CDDL Header Notice in each file + * and include the License file at http://www.netbeans.org/cddl.txt. + * If applicable, add the following below the CDDL Header, with the fields + * enclosed by brackets [] replaced by your own identifying information: + * "Portions Copyrighted [year] [name of copyright owner]" + * + * The Original Software is NetBeans. The Initial Developer of the Original + * Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun + * Microsystems, Inc. All Rights Reserved. + */ +package org.openide.text; + +import org.openide.util.HelpCtx; +import org.openide.util.NbBundle; +import java.awt.Font; +import java.awt.print.PageFormat; +import java.awt.print.Paper; +import java.awt.print.PrinterJob; +import java.util.prefs.Preferences; +import org.openide.nodes.BeanNode; +import org.openide.util.NbPreferences; + +/** + * Allows get, set properties that specify the look of a printed Source Editor page, + * including headers, footers, vertical spacing, and line numbers. + * + * @author Radek Matous + * @since 6.16 + */ +public final class PrintPreferences { + /** Constants for center, right, left position of page header, footer. */ + public static enum Alignment { LEFT, CENTER, RIGHT}; + + private static final PrintPreferences INSTANCE = new PrintPreferences(); + /** Property name of the wrap property */ + private static final String PROP_WRAP = "wrap"; // NOI18N + + /** Property name of the header format property */ + private static final String PROP_HEADER_FORMAT = "headerFormat"; // NOI18N + + /** Property name of the footer format property */ + private static final String PROP_FOOTER_FORMAT = "footerFormat"; // NOI18N + + /** Property name of the header alignment property */ + private static final String PROP_HEADER_ALIGNMENT = "headerAlignment"; // NOI18N + + /** Property name of the footer alignment property */ + private static final String PROP_FOOTER_ALIGNMENT = "footerAlignment"; // NOI18N + + /** Property names of the page format */ + private static final String PROP_PAGE_ORIENTATION = "pageOrientation";// NOI18N + private static final String PROP_PAGE_WIDTH = "pageWidth";// NOI18N + private static final String PROP_PAGE_HEIGHT = "pageHeight";// NOI18N + private static final String PROP_PAGE_IMAGEABLEAREA_Y = "imageableAreaY"; + private static final String PROP_PAGE_IMAGEABLEAREA_X = "imageableAreaX"; + private static final String PROP_PAGE_IMAGEABLEAREA_WIDTH = "imageableAreaWidth"; + private static final String PROP_PAGE_IMAGEABLEAREA_HEIGHT = "imageableAreaHeight"; + + /** Property names of the header font property */ + private static final String PROP_HEADER_FONT_NAME = "headerFontName";//NOI18N + private static final String PROP_HEADER_FONT_STYLE = "headerFontStyle";//NOI18N + private static final String PROP_HEADER_FONT_SIZE = "headerFontSize";//NOI18N + + /** Property names of the footer font property */ + private static final String PROP_FOOTER_FONT_NAME = "footerFontName";//NOI18N + private static final String PROP_FOOTER_FONT_STYLE = "footerFontStyle";//NOI18N + private static final String PROP_FOOTER_FONT_SIZE = "footerFontSize";//NOI18N + + /** Defaults for both heeader font and foote font */ + private static final String DEFAULT_FONT_NAME = "Monospaced";//NOI18N + private static final int DEFAULT_FONT_STYLE = java.awt.Font.PLAIN; + private static final int DEFAULT_FONT_SIZE = 6; + + /** Property name of the line ascent correction property */ + private static final String PROP_LINE_ASCENT_CORRECTION = "lineAscentCorrection"; // NOI18N + + private PrintPreferences() {} + + private static Preferences getPreferences() { + return NbPreferences.forModule(PrintPreferences.class); + } + + /** + * Get an instance of {@link java.awt.print.PageFormat}. + * @param pj {@link java.awt.print.PrinterJob} which is + * associated with the default printer. + * @return an instance of PageFormat that describes the size and + * orientation of a page to be printed. + */ + public static PageFormat getPageFormat(PrinterJob pj) { + PageFormat pageFormat = null; + pageFormat = pj.defaultPage(); + Paper p = pageFormat.getPaper(); + int pageOrientation = getPreferences().getInt(PROP_PAGE_ORIENTATION, pageFormat.getOrientation()); + double paperWidth = getPreferences().getDouble(PROP_PAGE_WIDTH, p.getWidth()); + double paperHeight = getPreferences().getDouble(PROP_PAGE_HEIGHT, p.getHeight()); + + double iaWidth = getPreferences().getDouble(PROP_PAGE_IMAGEABLEAREA_WIDTH, p.getImageableWidth()); + double iaHeight = getPreferences().getDouble(PROP_PAGE_IMAGEABLEAREA_HEIGHT, p.getImageableHeight()); + double iaX = getPreferences().getDouble(PROP_PAGE_IMAGEABLEAREA_X, p.getImageableX()); + double iaY = getPreferences().getDouble(PROP_PAGE_IMAGEABLEAREA_Y, p.getImageableY()); + + pageFormat.setOrientation(pageOrientation); + p.setSize(paperWidth, paperHeight); + p.setImageableArea(iaX, iaY, iaWidth, iaHeight); + pageFormat.setPaper(p); + return pageFormat; + } + + /** + * @param pf PageFormat that describes the size and + * orientation of a page to be printed + */ + public static void setPageFormat(PageFormat pf) { + getPreferences().putInt(PROP_PAGE_ORIENTATION, pf.getOrientation()); + getPreferences().putDouble(PROP_PAGE_WIDTH, pf.getPaper().getWidth()); + getPreferences().putDouble(PROP_PAGE_HEIGHT, pf.getPaper().getHeight()); + + getPreferences().putDouble(PROP_PAGE_IMAGEABLEAREA_WIDTH, pf.getPaper().getImageableWidth()); + getPreferences().putDouble(PROP_PAGE_IMAGEABLEAREA_HEIGHT, pf.getPaper().getImageableHeight()); + getPreferences().putDouble(PROP_PAGE_IMAGEABLEAREA_X, pf.getPaper().getImageableX()); + getPreferences().putDouble(PROP_PAGE_IMAGEABLEAREA_Y, pf.getPaper().getImageableY()); + } + + /** + * Wrap lines. + * @return true if lines that are too long for the page size will be wrapped + * to the following line. If false is returned, then long lines will be truncated. + */ + public static boolean getWrap() { + return getPreferences().getBoolean(PROP_WRAP, true); + } + + /** + * @param wrap + * See {@link #getWrap} + */ + public static void setWrap(boolean wrap) { + if (getWrap() == wrap) return; + getPreferences().putBoolean(PROP_WRAP, wrap); + } + + /** + * See {@link #setHeaderFormat} + * @return the text for the page header + */ + public static String getHeaderFormat() { + return getPreferences().get(PROP_HEADER_FORMAT, + NbBundle.getMessage(PrintPreferences.class, "CTL_Header_format")); + } + + /** + * Set the text for the page header. + * The following special characters can be used: + *
    + *
  • {0} is replaced with the page number. + *
  • {1} is replaced with the date and time. + *
  • {2} is replaced with the file name. + *
+ * @param s the text for the page header + */ + public static void setHeaderFormat(String s) { + if (getHeaderFormat().equals(s)) return; + getPreferences().put(PROP_HEADER_FORMAT, s); + } + + /** + * See {@link #setFooterFormat} + * @return the text for the page footer + */ + public static String getFooterFormat() { + return getPreferences().get(PROP_FOOTER_FORMAT, + NbBundle.getMessage(PrintPreferences.class, "CTL_Footer_format")); + } + + /** + * Set the text for the page footer. + * The following special characters can be used: + *
    + *
  • {0} is replaced with the page number. + *
  • {1} is replaced with the date and time. + *
  • {2} is replaced with the file name. + *
+ * @param s the text for the page footer + */ + public static void setFooterFormat(String s) { + if (getFooterFormat().equals(s)) return; + getPreferences().put(PROP_FOOTER_FORMAT, s); + + } + + /** + * @return the font for the header + */ + public static Font getHeaderFont() { + String name = getPreferences().get(PROP_HEADER_FONT_NAME,DEFAULT_FONT_NAME); + int style = getPreferences().getInt(PROP_HEADER_FONT_STYLE,DEFAULT_FONT_STYLE); + int size = getPreferences().getInt(PROP_HEADER_FONT_SIZE,DEFAULT_FONT_SIZE); + + return new Font(name, style, size); + } + + /** + * @param f the font for the header + */ + public static void setHeaderFont(Font f) { + if (getHeaderFont().equals(f)) return; + getPreferences().put(PROP_HEADER_FONT_NAME,f.getName()); + getPreferences().putInt(PROP_HEADER_FONT_STYLE,f.getStyle()); + getPreferences().putInt(PROP_HEADER_FONT_SIZE,f.getSize()); + + } + + /** + * @return the font for the footer + */ + public static Font getFooterFont() { + String name = getPreferences().get(PROP_FOOTER_FONT_NAME,DEFAULT_FONT_NAME); + int style = getPreferences().getInt(PROP_FOOTER_FONT_STYLE,DEFAULT_FONT_STYLE); + int size = getPreferences().getInt(PROP_FOOTER_FONT_SIZE,DEFAULT_FONT_SIZE); + + return new Font(name, style, size); + } + + /** + * @param f the font for the footer + */ + public static void setFooterFont(Font f) { + if (getFooterFont().equals(f)) return; + getPreferences().put(PROP_FOOTER_FONT_NAME,f.getName()); + getPreferences().putInt(PROP_FOOTER_FONT_STYLE,f.getStyle()); + getPreferences().putInt(PROP_FOOTER_FONT_SIZE,f.getSize()); + } + + /** + * @return information whether the header is centered, left aligned, or right aligned. + */ + public static PrintPreferences.Alignment getHeaderAlignment() { + return Alignment.valueOf(getPreferences().get(PROP_HEADER_ALIGNMENT, Alignment.CENTER.name())); + } + + /** + * @param alignment whether the header should be centered, left aligned, or right aligned. + */ + public static void setHeaderAlignment(PrintPreferences.Alignment alignment) { + if (getHeaderAlignment().equals(alignment)) return; + getPreferences().put(PROP_HEADER_ALIGNMENT, alignment.name()); + } + + /** + * @return whether the footer is centered, left aligned, or right aligned. + */ + public static PrintPreferences.Alignment getFooterAlignment() { + return Alignment.valueOf(getPreferences().get(PROP_FOOTER_ALIGNMENT, Alignment.CENTER.name())); + } + + /** + * @param alignment whether the footer should be centered, left aligned, or right aligned. + */ + public static void setFooterAlignment(PrintPreferences.Alignment alignment) { + if (getFooterAlignment().equals(alignment)) return; + getPreferences().put(PROP_FOOTER_ALIGNMENT, alignment.name()); + } + + /** + * @return the amount of vertical space to print between lines. + */ + public static float getLineAscentCorrection() { + return getPreferences().getFloat(PROP_LINE_ASCENT_CORRECTION, 1.0f); + } + + /** + * @param correction the amount of vertical space to print between lines. + * @exception IllegalArgumentException if correction is less than 0. + */ + public static void setLineAscentCorrection(float correction) { + if (getLineAscentCorrection() == correction) return; + if (correction < 0) { + throw new IllegalArgumentException(); + } + getPreferences().putFloat(PROP_LINE_ASCENT_CORRECTION, correction); + } +} Index: openide/text/src/org/openide/text/PrintSettings.java =================================================================== RCS file: openide/text/src/org/openide/text/PrintSettings.java diff -N openide/text/src/org/openide/text/PrintSettings.java --- openide/text/src/org/openide/text/PrintSettings.java 23 Nov 2006 05:26:45 -0000 1.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,457 +0,0 @@ -/* - * The contents of this file are subject to the terms of the Common Development - * and Distribution License (the License). You may not use this file except in - * compliance with the License. - * - * You can obtain a copy of the License at http://www.netbeans.org/cddl.html - * or http://www.netbeans.org/cddl.txt. - * - * When distributing Covered Code, include this CDDL Header Notice in each file - * and include the License file at http://www.netbeans.org/cddl.txt. - * If applicable, add the following below the CDDL Header, with the fields - * enclosed by brackets [] replaced by your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * The Original Software is NetBeans. The Initial Developer of the Original - * Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun - * Microsystems, Inc. All Rights Reserved. - */ -package org.openide.text; - -import org.openide.options.ContextSystemOption; -import org.openide.util.HelpCtx; -import org.openide.util.NbBundle; - -import java.awt.Font; -import java.awt.print.PageFormat; -import java.awt.print.Paper; -import java.awt.print.PrinterJob; - -import java.io.IOException; -import java.io.ObjectInput; -import java.io.ObjectOutput; - -/** Settings for output window. -* -* @author Ales Novak -*/ -public final class PrintSettings extends ContextSystemOption { - // final because overrides Externalizable methods - - /** serialVersionUID */ - static final long serialVersionUID = -9102470021814206818L; - - /** Constant for center position of page header. */ - public static final int CENTER = 0x1; - - /** Constant for right position of page header. */ - public static final int RIGHT = 0x2; - - /** Constant for left position of page header. */ - public static final int LEFT = 0x0; - - /** Property name of the wrap property */ - public static final String PROP_PAGE_FORMAT = "pageFormat"; // NOI18N - - /** Property name of the wrap property */ - public static final String PROP_WRAP = "wrap"; // NOI18N - - /** Property name of the header format property */ - public static final String PROP_HEADER_FORMAT = "headerFormat"; // NOI18N - - /** Property name of the footer format property */ - public static final String PROP_FOOTER_FORMAT = "footerFormat"; // NOI18N - - /** Property name of the header font property */ - public static final String PROP_HEADER_FONT = "headerFont"; // NOI18N - - /** Property name of the footer font property */ - public static final String PROP_FOOTER_FONT = "footerFont"; // NOI18N - - /** Property name of the header alignment property */ - public static final String PROP_HEADER_ALIGNMENT = "headerAlignment"; // NOI18N - - /** Property name of the footer alignment property */ - public static final String PROP_FOOTER_ALIGNMENT = "footerAlignment"; // NOI18N - - /** Property name of the line ascent correction property */ - public static final String PROP_LINE_ASCENT_CORRECTION = "lineAscentCorrection"; // NOI18N - private static final String HELP_ID = "editing.printing"; // !!! NOI18N - - /** PageFormat */ - private static PageFormat pageFormat; - - /** Wrap lines? */ - private static boolean wrap = true; - - /** Header format - see MessageFormat */ - private static String headerFormat; - - /** Footer format - see MessageFormat */ - private static String footerFormat; - - /** Header font */ - private static Font headerFont; - - /** Footer font */ - private static Font footerFont; - - /** Header alignment */ - private static int headerAlignment = CENTER; - - /** Footer alignment */ - private static int footerAlignment = CENTER; - - /** Line ascent correction parameter. Ranged from 0 to infinity.*/ - private static float lineAscentCorrection = 1.0f; - - /** Externalizes this SystemOption - * @param obtos - * @exception IOException - */ - public void writeExternal(ObjectOutput obtos) throws IOException { - super.writeExternal(obtos); - obtos.writeBoolean(wrap); - obtos.writeObject(headerFormat); - obtos.writeObject(footerFormat); - obtos.writeObject(headerFont); - obtos.writeObject(footerFont); - obtos.writeInt(headerAlignment); - obtos.writeInt(footerAlignment); - externalizePageFormat(pageFormat, obtos); - } - - /** Deexetrnalizes this SystemOption - * @param obtis - * @exception IOException - * @exception ClassNotFoundException - */ - public void readExternal(ObjectInput obtis) throws IOException, ClassNotFoundException { - super.readExternal(obtis); - wrap = obtis.readBoolean(); - headerFormat = (String) obtis.readObject(); - footerFormat = (String) obtis.readObject(); - headerFont = (Font) obtis.readObject(); - footerFont = (Font) obtis.readObject(); - headerAlignment = obtis.readInt(); - footerAlignment = obtis.readInt(); - pageFormat = internalizePageFormat(obtis); - } - - /** Writes a PageFormat instance into ObjectOutput - * @param pf - * @param obtos - */ - private static void externalizePageFormat(PageFormat pf, ObjectOutput obtos) - throws IOException { - if (pf == null) { - obtos.writeInt(PageFormat.LANDSCAPE ^ PageFormat.REVERSE_LANDSCAPE ^ PageFormat.PORTRAIT); - - return; - } - - obtos.writeInt(pf.getOrientation()); - - Paper paper = pf.getPaper(); - - // paper size - obtos.writeDouble(paper.getWidth()); - obtos.writeDouble(paper.getHeight()); - - // paper imageable area - obtos.writeDouble(paper.getImageableX()); - obtos.writeDouble(paper.getImageableY()); - obtos.writeDouble(paper.getImageableWidth()); - obtos.writeDouble(paper.getImageableHeight()); - } - - /** Reads a PageFormat instance from ObjectInput - * @param obtis - * @return deserialized PageFormat instance - */ - private static PageFormat internalizePageFormat(ObjectInput obtis) - throws IOException, ClassNotFoundException { - PageFormat pf = new PageFormat(); - Paper paper = pf.getPaper(); - int etc = obtis.readInt(); - - if (etc == (PageFormat.LANDSCAPE ^ PageFormat.REVERSE_LANDSCAPE ^ PageFormat.PORTRAIT)) { - return null; - } - - pf.setOrientation(etc); - - // paper size - paper.setSize(obtis.readDouble(), obtis.readDouble()); - - // imageable - paper.setImageableArea(obtis.readDouble(), obtis.readDouble(), obtis.readDouble(), obtis.readDouble()); - pf.setPaper(paper); - - return pf; - } - - public String displayName() { - return NbBundle.getMessage(PrintSettings.class, "CTL_Print_settings"); - } - - public HelpCtx getHelpCtx() { - return new HelpCtx(HELP_ID); - } - - /** @return an instance of PageFormat - * The returned page format is either previously set by - * PageSetupAction or is acquired as a default PageFormat - * from supported PrinterJob - */ - public static PageFormat getPageFormat(PrinterJob pj) { - if (pageFormat == null) { - pageFormat = pj.defaultPage(); - } - - return pageFormat; - } - - /** @deprecated Use {@link #getPageFormat(PrinterJob)} instead. */ - @Deprecated - public PageFormat getPageFormat() { - if (pageFormat == null) { - PrinterJob pj = PrinterJob.getPrinterJob(); - pageFormat = pj.defaultPage(new PageFormat()); - pj.cancel(); - } - - return pageFormat; - } - - /** sets page format */ - public void setPageFormat(PageFormat pf) { - if (pf == null) { - return; - } - - if (pf.equals(pageFormat)) { - return; - } - - PageFormat old = pageFormat; - pageFormat = pf; - firePropertyChange(PROP_PAGE_FORMAT, old, pageFormat); - } - - public boolean getWrap() { - return wrap; - } - - public void setWrap(boolean b) { - if (wrap == b) { - return; - } - - wrap = b; - firePropertyChange(PROP_WRAP, (b ? Boolean.FALSE : Boolean.TRUE), (b ? Boolean.TRUE : Boolean.FALSE)); - } - - public String getHeaderFormat() { - if (headerFormat == null) { - headerFormat = NbBundle.getMessage(PrintSettings.class, "CTL_Header_format"); - } - - return headerFormat; - } - - public void setHeaderFormat(String s) { - if (s == null) { - return; - } - - if (s.equals(headerFormat)) { - return; - } - - String of = headerFormat; - headerFormat = s; - firePropertyChange(PROP_HEADER_FORMAT, of, headerFormat); - } - - public String getFooterFormat() { - if (footerFormat == null) { - footerFormat = NbBundle.getMessage(PrintSettings.class, "CTL_Footer_format"); - } - - return footerFormat; - } - - public void setFooterFormat(String s) { - if (s == null) { - return; - } - - if (s.equals(footerFormat)) { - return; - } - - String of = footerFormat; - footerFormat = s; - firePropertyChange(PROP_FOOTER_FORMAT, of, footerFormat); - } - - public Font getHeaderFont() { - if (headerFont == null) { - headerFont = new Font("Monospaced", java.awt.Font.PLAIN, 6); // NOI18N - } - - return headerFont; - } - - public void setHeaderFont(Font f) { - if (f == null) { - return; - } - - if (f.equals(headerFont)) { - return; - } - - Font old = headerFont; - headerFont = f; - firePropertyChange(PROP_HEADER_FONT, old, headerFont); - } - - public Font getFooterFont() { - if (footerFont == null) { - footerFont = getHeaderFont(); - } - - return footerFont; - } - - public void setFooterFont(Font f) { - if (f == null) { - return; - } - - if (f.equals(footerFont)) { - return; - } - - Font old = headerFont; - footerFont = f; - firePropertyChange(PROP_FOOTER_FONT, old, footerFont); - } - - public int getHeaderAlignment() { - return headerAlignment; - } - - public void setHeaderAlignment(int alignment) { - if (alignment == headerAlignment) { - return; - } - - if ((alignment != LEFT) && (alignment != CENTER) && (alignment != RIGHT)) { - throw new IllegalArgumentException(); - } - - int old = headerAlignment; - headerAlignment = alignment; - firePropertyChange(PROP_HEADER_ALIGNMENT, new Integer(old), new Integer(headerAlignment)); - } - - public int getFooterAlignment() { - return footerAlignment; - } - - public void setFooterAlignment(int alignment) { - if (alignment == footerAlignment) { - return; - } - - if ((alignment != LEFT) && (alignment != CENTER) && (alignment != RIGHT)) { - throw new IllegalArgumentException(); - } - - int old = footerAlignment; - footerAlignment = alignment; - firePropertyChange(PROP_FOOTER_ALIGNMENT, new Integer(old), new Integer(footerAlignment)); - } - - /** Getter for lineAscentCorrection property. */ - public float getLineAscentCorrection() { - return lineAscentCorrection; - } - - /** Setter for lineAscentCorrection property. - * @param correction the correction - * @exception IllegalArgumentException if correction is less than 0. - */ - public void setLineAscentCorrection(float correction) { - if (correction == lineAscentCorrection) { - return; - } else if (correction < 0) { - throw new IllegalArgumentException(); - } - - float old = lineAscentCorrection; - lineAscentCorrection = correction; - firePropertyChange(PROP_LINE_ASCENT_CORRECTION, new Float(old), new Float(lineAscentCorrection)); - } - - /** Property editor for alignment properties */ - public static class AlignmentEditor extends java.beans.PropertyEditorSupport { - private String sCENTER; - private String sRIGHT; - private String sLEFT; - private String[] tags = new String[] { - sLEFT = NbBundle.getMessage(PrintSettings.class, "CTL_LEFT"), - sCENTER = NbBundle.getMessage(PrintSettings.class, "CTL_CENTER"), - sRIGHT = NbBundle.getMessage(PrintSettings.class, "CTL_RIGHT") - }; - - public String[] getTags() { - return tags; - } - - public String getAsText() { - return tags[((Integer) getValue()).intValue()]; - } - - public void setAsText(String s) { - if (s.equals(sLEFT)) { - setValue(new Integer(0)); - } else if (s.equals(sCENTER)) { - setValue(new Integer(1)); - } else { - setValue(new Integer(2)); - } - } - } - - /** Property editor for PageFormat instances */ - public static class PageFormatEditor extends java.beans.PropertyEditorSupport { - /** No text */ - public String getAsText() { - return null; - } - - /* @return true */ - public boolean supportsCustomEditor() { - return true; - } - - /** - * @return null Shows pageDialog, however. - */ - public java.awt.Component getCustomEditor() { - PageFormat pf = (PageFormat) getValue(); - PrinterJob pj = PrinterJob.getPrinterJob(); - PageFormat npf = pj.pageDialog(pf); - - //setValue(npf); - PrintSettings.findObject(PrintSettings.class).setPageFormat((PageFormat) npf.clone()); - pj.cancel(); - - return null; - } - } -} Index: openide/text/src/org/openide/text/PrintSettingsBeanInfo.java =================================================================== RCS file: openide/text/src/org/openide/text/PrintSettingsBeanInfo.java diff -N openide/text/src/org/openide/text/PrintSettingsBeanInfo.java --- openide/text/src/org/openide/text/PrintSettingsBeanInfo.java 10 Aug 2006 14:58:41 -0000 1.4 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,86 +0,0 @@ -/* - * The contents of this file are subject to the terms of the Common Development - * and Distribution License (the License). You may not use this file except in - * compliance with the License. - * - * You can obtain a copy of the License at http://www.netbeans.org/cddl.html - * or http://www.netbeans.org/cddl.txt. - * - * When distributing Covered Code, include this CDDL Header Notice in each file - * and include the License file at http://www.netbeans.org/cddl.txt. - * If applicable, add the following below the CDDL Header, with the fields - * enclosed by brackets [] replaced by your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * The Original Software is NetBeans. The Initial Developer of the Original - * Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun - * Microsystems, Inc. All Rights Reserved. - */ -package org.openide.text; - - -import java.awt.Image; -import java.beans.*; -import org.openide.util.*; - - -/** BeanInfo for PrintSettings. -* -* @author Ales Novak -*/ -public class PrintSettingsBeanInfo extends SimpleBeanInfo { - /** Returns the PrintSettings' icon */ - public Image getIcon(int type) { - return Utilities.loadImage("org/openide/text/printSettings.gif"); // NOI18N - } - - /** Descriptor of valid properties - * @return array of properties - */ - public PropertyDescriptor[] getPropertyDescriptors() { - try { - PropertyDescriptor[] desc = new PropertyDescriptor[] { - new PropertyDescriptor(PrintSettings.PROP_WRAP, PrintSettings.class), // 0 - new PropertyDescriptor(PrintSettings.PROP_HEADER_FORMAT, PrintSettings.class), // 1 - new PropertyDescriptor(PrintSettings.PROP_FOOTER_FORMAT, PrintSettings.class), // 2 - new PropertyDescriptor(PrintSettings.PROP_HEADER_FONT, PrintSettings.class), // 3 - new PropertyDescriptor(PrintSettings.PROP_FOOTER_FONT, PrintSettings.class), // 4 - new PropertyDescriptor(PrintSettings.PROP_HEADER_ALIGNMENT, PrintSettings.class), // 5 - new PropertyDescriptor(PrintSettings.PROP_FOOTER_ALIGNMENT, PrintSettings.class), // 6 - - // new PropertyDescriptor(PrintSettings.PROP_PAGE_FORMAT, PrintSettings.class), // 7 - new PropertyDescriptor(PrintSettings.PROP_LINE_ASCENT_CORRECTION, PrintSettings.class) // 8 - }; - desc[0].setDisplayName(NbBundle.getMessage(PrintSettings.class, "PROP_WRAP")); - desc[0].setShortDescription(NbBundle.getMessage(PrintSettings.class, "HINT_WRAP")); - desc[1].setDisplayName(NbBundle.getMessage(PrintSettings.class, "PROP_HEADER_FORMAT")); - desc[1].setShortDescription(NbBundle.getMessage(PrintSettings.class, "HINT_HEADER_FORMAT")); - desc[2].setDisplayName(NbBundle.getMessage(PrintSettings.class, "PROP_FOOTER_FORMAT")); - desc[2].setShortDescription(NbBundle.getMessage(PrintSettings.class, "HINT_FOOTER_FORMAT")); - desc[3].setDisplayName(NbBundle.getMessage(PrintSettings.class, "PROP_HEADER_FONT")); - desc[3].setShortDescription(NbBundle.getMessage(PrintSettings.class, "HINT_HEADER_FONT")); - desc[4].setDisplayName(NbBundle.getMessage(PrintSettings.class, "PROP_FOOTER_FONT")); - desc[4].setShortDescription(NbBundle.getMessage(PrintSettings.class, "HINT_FOOTER_FONT")); - desc[5].setDisplayName(NbBundle.getMessage(PrintSettings.class, "PROP_HEADER_ALIGNMENT")); - desc[5].setShortDescription(NbBundle.getMessage(PrintSettings.class, "HINT_HEADER_ALIGNMENT")); - desc[5].setPropertyEditorClass(PrintSettings.AlignmentEditor.class); - desc[6].setDisplayName(NbBundle.getMessage(PrintSettings.class, "PROP_FOOTER_ALIGNMENT")); - desc[6].setShortDescription(NbBundle.getMessage(PrintSettings.class, "HINT_FOOTER_ALIGNMENT")); - desc[6].setPropertyEditorClass(PrintSettings.AlignmentEditor.class); - - /* - desc[7].setDisplayName(PrintSettings.getString("PROP_PAGE_FORMAT")); - desc[7].setShortDescription(PrintSettings.getString("HINT_PAGE_FORMAT")); - desc[7].setPropertyEditorClass(PrintSettings.PageFormatEditor.class); - */ - desc[7].setDisplayName(NbBundle.getMessage(PrintSettings.class, "PROP_LINE_ASCENT_CORRECTION")); - desc[7].setShortDescription(NbBundle.getMessage(PrintSettings.class, "HINT_LINE_ASCENT_CORRECTION")); - - return desc; - } catch (IntrospectionException ex) { - Exceptions.printStackTrace(ex); - - return null; - } - } -} Index: openide/text/test/unit/src/org/openide/text/PrintPreferencesTest.java =================================================================== RCS file: openide/text/test/unit/src/org/openide/text/PrintPreferencesTest.java diff -N openide/text/test/unit/src/org/openide/text/PrintPreferencesTest.java --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openide/text/test/unit/src/org/openide/text/PrintPreferencesTest.java 23 May 2007 14:45:42 -0000 @@ -0,0 +1,168 @@ +/* + * The contents of this file are subject to the terms of the Common Development + * and Distribution License (the License). You may not use this file except in + * compliance with the License. + * + * You can obtain a copy of the License at http://www.netbeans.org/cddl.html + * or http://www.netbeans.org/cddl.txt. + * + * When distributing Covered Code, include this CDDL Header Notice in each file + * and include the License file at http://www.netbeans.org/cddl.txt. + * If applicable, add the following below the CDDL Header, with the fields + * enclosed by brackets [] replaced by your own identifying information: + * "Portions Copyrighted [year] [name of copyright owner]" + * + * The Original Software is NetBeans. The Initial Developer of the Original + * Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun + * Microsystems, Inc. All Rights Reserved. + */ + +package org.openide.text; + +import java.awt.Font; +import java.awt.font.TextAttribute; +import java.util.Iterator; +import java.util.Map; +import org.netbeans.junit.NbTestCase; +import junit.framework.*; +import org.openide.util.HelpCtx; +import org.openide.util.NbBundle; +import java.awt.print.PageFormat; +import java.awt.print.Paper; +import java.awt.print.PrinterJob; +import java.util.prefs.Preferences; +import org.openide.nodes.BeanNode; +import org.openide.util.NbPreferences; + +/** + * @author Radek Matous + */ +public class PrintPreferencesTest extends NbTestCase { + public PrintPreferencesTest(String testName) { + super(testName); + } + + public void testGetHeaderFont() { + Font expResult = PrintPreferences.getHeaderFont(); + PrintPreferences.setHeaderFont(expResult); + Font result = PrintPreferences.getHeaderFont(); + assertEquals(expResult, result); + Font derived = result.deriveFont(java.awt.Font.BOLD,8); + PrintPreferences.setHeaderFont(derived); + assertEquals(derived, PrintPreferences.getHeaderFont()); + } + + public void testGetFooterFont() { + Font expResult = PrintPreferences.getFooterFont(); + PrintPreferences.setFooterFont(expResult); + Font result = PrintPreferences.getFooterFont(); + assertEquals(expResult, result); + Font derived = result.deriveFont(java.awt.Font.BOLD,8); + PrintPreferences.setFooterFont(derived); + assertEquals(derived, PrintPreferences.getFooterFont()); + } + + public void testGetPageFormat() { + PrinterJob pj = PrinterJob.getPrinterJob(); + PageFormat expResult = PrintPreferences.getPageFormat(pj); + PrintPreferences.setPageFormat(expResult); + PageFormat result = PrintPreferences.getPageFormat(pj); + assertEquals(expResult.getHeight(), result.getHeight()); + assertEquals(expResult.getWidth(), result.getWidth()); + assertEquals(expResult.getOrientation(), result.getOrientation()); + assertEquals(expResult.getPaper().getHeight(), result.getPaper().getHeight()); + assertEquals(expResult.getPaper().getWidth(), result.getPaper().getWidth()); + assertEquals(expResult.getPaper().getImageableHeight(), result.getPaper().getImageableHeight()); + assertEquals(expResult.getPaper().getImageableWidth(), result.getPaper().getImageableWidth()); + assertEquals(expResult.getPaper().getImageableX(), result.getPaper().getImageableX()); + assertEquals(expResult.getPaper().getImageableY(), result.getPaper().getImageableY()); + + double w = expResult.getPaper().getWidth() + 10; + double h = expResult.getPaper().getHeight() + 10; + Paper p = expResult.getPaper(); + double ix = p.getImageableX() + 10; + double iy = p.getImageableY() + 10; + double iw = p.getImageableWidth() + 10; + double ih = p.getImageableHeight() + 10; + p.setImageableArea(ix, iy, iw, ih); + p.setSize(w, h); + expResult.setPaper(p); + PrintPreferences.setPageFormat(expResult); + assertEquals(h, PrintPreferences.getPageFormat(pj).getHeight()); + assertEquals(w, PrintPreferences.getPageFormat(pj).getWidth()); + assertEquals(ix, PrintPreferences.getPageFormat(pj).getPaper().getImageableX()); + assertEquals(iy, PrintPreferences.getPageFormat(pj).getPaper().getImageableY()); + assertEquals(iw, PrintPreferences.getPageFormat(pj).getPaper().getImageableWidth()); + assertEquals(ih, PrintPreferences.getPageFormat(pj).getPaper().getImageableHeight()); + + expResult.setOrientation(PageFormat.REVERSE_LANDSCAPE); + PrintPreferences.setPageFormat(expResult); + assertEquals(PageFormat.REVERSE_LANDSCAPE, PrintPreferences.getPageFormat(pj).getOrientation()); + } + + public void testGetWrap() { + PrintPreferences.setWrap(true); + assertEquals(true, PrintPreferences.getWrap()); + PrintPreferences.setWrap(false); + assertEquals(false, PrintPreferences.getWrap()); + } + + public void testGetHeaderFormat() { + String expResult = "my header format"; + PrintPreferences.setHeaderFormat(expResult); + String result = PrintPreferences.getHeaderFormat(); + assertEquals(expResult, result); + } + + public void testGetFooterFormat() { + String expResult = "my footer format"; + PrintPreferences.setFooterFormat(expResult); + String result = PrintPreferences.getFooterFormat(); + assertEquals(expResult, result); + } + + public void testGetHeaderAlignment() { + PrintPreferences.Alignment expResult = PrintPreferences.Alignment.LEFT; + PrintPreferences.setHeaderAlignment(expResult); + PrintPreferences.Alignment result = PrintPreferences.getHeaderAlignment(); + assertEquals(expResult, result); + + expResult = PrintPreferences.Alignment.RIGHT; + PrintPreferences.setHeaderAlignment(expResult); + result = PrintPreferences.getHeaderAlignment(); + assertEquals(expResult, result); + + expResult = PrintPreferences.Alignment.CENTER; + PrintPreferences.setHeaderAlignment(expResult); + result = PrintPreferences.getHeaderAlignment(); + assertEquals(expResult, result); + } + + public void testGetFooterAlignment() { + PrintPreferences.Alignment expResult = PrintPreferences.Alignment.LEFT; + PrintPreferences.setFooterAlignment(expResult); + PrintPreferences.Alignment result = PrintPreferences.getFooterAlignment(); + assertEquals(expResult, result); + + expResult = PrintPreferences.Alignment.RIGHT; + PrintPreferences.setFooterAlignment(expResult); + result = PrintPreferences.getFooterAlignment(); + assertEquals(expResult, result); + + expResult = PrintPreferences.Alignment.CENTER; + PrintPreferences.setFooterAlignment(expResult); + result = PrintPreferences.getFooterAlignment(); + assertEquals(expResult, result); + + } + + public void testGetLineAscentCorrection() { + float expResult = 0.0F; + for (int i = 0; i < 10; i++) { + expResult += 1; + PrintPreferences.setLineAscentCorrection(expResult); + float result = PrintPreferences.getLineAscentCorrection(); + assertEquals(expResult, result); + } + } +} Index: platform/samples/audio-files/nbproject/project.xml =================================================================== RCS file: /cvs/platform/samples/audio-files/nbproject/project.xml,v retrieving revision 1.3 diff -u -6 -r1.3 project.xml --- platform/samples/audio-files/nbproject/project.xml 30 Jun 2006 14:12:56 -0000 1.3 +++ platform/samples/audio-files/nbproject/project.xml 23 May 2007 14:45:45 -0000 @@ -63,13 +63,13 @@
org.openide.text - 6.2 + 6.16 org.openide.util Index: platform/samples/editor-action/nbproject/project.xml =================================================================== RCS file: /cvs/platform/samples/editor-action/nbproject/project.xml,v retrieving revision 1.3 diff -u -6 -r1.3 project.xml --- platform/samples/editor-action/nbproject/project.xml 30 Jun 2006 14:13:00 -0000 1.3 +++ platform/samples/editor-action/nbproject/project.xml 23 May 2007 14:45:46 -0000 @@ -48,13 +48,13 @@ org.openide.text - 6.2 + 6.16 Index: platform/samples/minicomposer/nbproject/project.xml =================================================================== RCS file: /cvs/platform/samples/minicomposer/nbproject/project.xml,v retrieving revision 1.4 diff -u -6 -r1.4 project.xml --- platform/samples/minicomposer/nbproject/project.xml 19 Jul 2006 06:54:00 -0000 1.4 +++ platform/samples/minicomposer/nbproject/project.xml 23 May 2007 14:45:47 -0000 @@ -125,13 +125,13 @@ org.openide.text - 6.2 + 6.16 org.openide.util Index: platform/samples/povray/povsuite-1/povfile/nbproject/project.xml =================================================================== RCS file: /cvs/platform/samples/povray/povsuite-1/povfile/nbproject/project.xml,v retrieving revision 1.1 diff -u -6 -r1.1 project.xml --- platform/samples/povray/povsuite-1/povfile/nbproject/project.xml 10 Jun 2006 06:20:49 -0000 1.1 +++ platform/samples/povray/povsuite-1/povfile/nbproject/project.xml 23 May 2007 14:45:48 -0000 @@ -32,13 +32,13 @@ org.openide.text - 6.9.1 + 6.16 org.openide.util Index: platform/samples/povray/povsuite-2/povfile/nbproject/project.xml =================================================================== RCS file: /cvs/platform/samples/povray/povsuite-2/povfile/nbproject/project.xml,v retrieving revision 1.1 diff -u -6 -r1.1 project.xml --- platform/samples/povray/povsuite-2/povfile/nbproject/project.xml 10 Jun 2006 06:21:06 -0000 1.1 +++ platform/samples/povray/povsuite-2/povfile/nbproject/project.xml 23 May 2007 14:45:48 -0000 @@ -50,13 +50,13 @@ org.openide.text - 6.9.1 + 6.16 org.openide.util Index: platform/samples/povray/povsuite-3/povfile/nbproject/project.xml =================================================================== RCS file: /cvs/platform/samples/povray/povsuite-3/povfile/nbproject/project.xml,v retrieving revision 1.1 diff -u -6 -r1.1 project.xml --- platform/samples/povray/povsuite-3/povfile/nbproject/project.xml 10 Jun 2006 06:20:53 -0000 1.1 +++ platform/samples/povray/povsuite-3/povfile/nbproject/project.xml 23 May 2007 14:45:49 -0000 @@ -50,13 +50,13 @@ org.openide.text - 6.9.1 + 6.16 org.openide.util Index: platform/samples/povray/povsuite-4/povfile/nbproject/project.xml =================================================================== RCS file: /cvs/platform/samples/povray/povsuite-4/povfile/nbproject/project.xml,v retrieving revision 1.1 diff -u -6 -r1.1 project.xml --- platform/samples/povray/povsuite-4/povfile/nbproject/project.xml 11 Jun 2006 06:27:25 -0000 1.1 +++ platform/samples/povray/povsuite-4/povfile/nbproject/project.xml 23 May 2007 14:45:50 -0000 @@ -50,13 +50,13 @@ org.openide.text - 6.9.1 + 6.16 org.openide.util Index: platform/samples/povray/povsuite-5/povfile/nbproject/project.xml =================================================================== RCS file: /cvs/platform/samples/povray/povsuite-5/povfile/nbproject/project.xml,v retrieving revision 1.1 diff -u -6 -r1.1 project.xml --- platform/samples/povray/povsuite-5/povfile/nbproject/project.xml 11 Jun 2006 06:27:43 -0000 1.1 +++ platform/samples/povray/povsuite-5/povfile/nbproject/project.xml 23 May 2007 14:45:50 -0000 @@ -50,13 +50,13 @@ org.openide.text - 6.9.1 + 6.16 org.openide.util Index: print/nbproject/project.xml =================================================================== RCS file: /cvs/print/nbproject/project.xml,v retrieving revision 1.6 diff -u -6 -r1.6 project.xml --- print/nbproject/project.xml 4 May 2007 11:15:12 -0000 1.6 +++ print/nbproject/project.xml 23 May 2007 14:45:56 -0000 @@ -65,13 +65,13 @@ org.openide.text - 6.2 + 6.16 org.openide.util Index: projects/projectui/nbproject/project.xml =================================================================== RCS file: /cvs/projects/projectui/nbproject/project.xml,v retrieving revision 1.36 diff -u -6 -r1.36 project.xml --- projects/projectui/nbproject/project.xml 4 May 2007 18:02:46 -0000 1.36 +++ projects/projectui/nbproject/project.xml 23 May 2007 14:46:01 -0000 @@ -169,13 +169,13 @@ org.openide.text - 6.2 + 6.16 org.openide.util Index: projects/tasklist/nbproject/project.xml =================================================================== RCS file: /cvs/projects/tasklist/nbproject/project.xml,v retrieving revision 1.1 diff -u -6 -r1.1 project.xml --- projects/tasklist/nbproject/project.xml 13 Apr 2007 07:06:39 -0000 1.1 +++ projects/tasklist/nbproject/project.xml 23 May 2007 14:46:02 -0000 @@ -58,13 +58,13 @@ org.openide.text - 6.12 + 6.16 org.openide.util Index: properties/nbproject/project.xml =================================================================== RCS file: /cvs/properties/nbproject/project.xml,v retrieving revision 1.12 diff -u -6 -r1.12 project.xml --- properties/nbproject/project.xml 18 Apr 2007 14:55:06 -0000 1.12 +++ properties/nbproject/project.xml 23 May 2007 14:46:03 -0000 @@ -88,13 +88,13 @@ org.openide.text - 6.8 + 6.16 org.openide.util Index: properties/syntax/nbproject/project.xml =================================================================== RCS file: /cvs/properties/syntax/nbproject/project.xml,v retrieving revision 1.4 diff -u -6 -r1.4 project.xml --- properties/syntax/nbproject/project.xml 30 Jun 2006 21:32:53 -0000 1.4 +++ properties/syntax/nbproject/project.xml 23 May 2007 14:46:03 -0000 @@ -41,21 +41,21 @@ org.openide.options - 6.2 + 6.7 org.openide.text - 6.2 + 6.16 org.netbeans.modules.properties Index: refactoring/api/nbproject/project.xml =================================================================== RCS file: /cvs/refactoring/api/nbproject/project.xml,v retrieving revision 1.9 diff -u -6 -r1.9 project.xml --- refactoring/api/nbproject/project.xml 27 Mar 2007 09:28:27 -0000 1.9 +++ refactoring/api/nbproject/project.xml 23 May 2007 14:46:04 -0000 @@ -111,13 +111,13 @@ org.openide.text - 6.10 + 6.16 org.openide.util Index: refactoring/experimental/nbproject/project.xml =================================================================== RCS file: /cvs/refactoring/experimental/nbproject/project.xml,v retrieving revision 1.14 diff -u -6 -r1.14 project.xml --- refactoring/experimental/nbproject/project.xml 30 Jun 2006 21:38:34 -0000 1.14 +++ refactoring/experimental/nbproject/project.xml 23 May 2007 14:46:05 -0000 @@ -91,13 +91,13 @@ org.openide.text - 6.2 + 6.16 org.openide.filesystems Index: refactoring/java/nbproject/project.xml =================================================================== RCS file: /cvs/refactoring/java/nbproject/project.xml,v retrieving revision 1.8 diff -u -6 -r1.8 project.xml --- refactoring/java/nbproject/project.xml 23 Jan 2007 10:34:27 -0000 1.8 +++ refactoring/java/nbproject/project.xml 23 May 2007 14:46:06 -0000 @@ -182,13 +182,13 @@ org.openide.text - 6.10 + 6.16 org.openide.util Index: scripting/ejs/nbproject/project.xml =================================================================== RCS file: /cvs/scripting/ejs/nbproject/project.xml,v retrieving revision 1.5 diff -u -6 -r1.5 project.xml --- scripting/ejs/nbproject/project.xml 29 Apr 2007 23:31:06 -0000 1.5 +++ scripting/ejs/nbproject/project.xml 23 May 2007 14:46:10 -0000 @@ -102,13 +102,13 @@ org.openide.text - 6.12 + 6.16 org.openide.util Index: scripting/gsf/api/nbproject/project.xml =================================================================== RCS file: /cvs/scripting/gsf/api/nbproject/project.xml,v retrieving revision 1.7 diff -u -6 -r1.7 project.xml --- scripting/gsf/api/nbproject/project.xml 21 Apr 2007 16:07:02 -0000 1.7 +++ scripting/gsf/api/nbproject/project.xml 23 May 2007 14:46:10 -0000 @@ -40,13 +40,13 @@ org.openide.text - 6.12 + 6.16 org.openide.util Index: scripting/gsf/nbproject/project.xml =================================================================== RCS file: /cvs/scripting/gsf/nbproject/project.xml,v retrieving revision 1.21 diff -u -6 -r1.21 project.xml --- scripting/gsf/nbproject/project.xml 17 May 2007 23:40:24 -0000 1.21 +++ scripting/gsf/nbproject/project.xml 23 May 2007 14:46:11 -0000 @@ -250,13 +250,13 @@ org.openide.text - 6.12 + 6.16 org.openide.util Index: scripting/gsf/tools/nbproject/project.xml =================================================================== RCS file: /cvs/scripting/gsf/tools/nbproject/project.xml,v retrieving revision 1.5 diff -u -6 -r1.5 project.xml --- scripting/gsf/tools/nbproject/project.xml 10 Apr 2007 04:54:35 -0000 1.5 +++ scripting/gsf/tools/nbproject/project.xml 23 May 2007 14:46:13 -0000 @@ -110,13 +110,13 @@ org.openide.text - 6.12 + 6.16 org.openide.util Index: scripting/javascript/nbproject/project.xml =================================================================== RCS file: /cvs/scripting/javascript/nbproject/project.xml,v retrieving revision 1.15 diff -u -6 -r1.15 project.xml --- scripting/javascript/nbproject/project.xml 17 Apr 2007 08:43:18 -0000 1.15 +++ scripting/javascript/nbproject/project.xml 23 May 2007 14:46:14 -0000 @@ -114,13 +114,13 @@ org.openide.text - 6.7 + 6.16 org.openide.util Index: scripting/php/dbginterface/nbproject/project.xml =================================================================== RCS file: /cvs/scripting/php/dbginterface/nbproject/project.xml,v retrieving revision 1.1 diff -u -6 -r1.1 project.xml --- scripting/php/dbginterface/nbproject/project.xml 13 Feb 2007 02:48:00 -0000 1.1 +++ scripting/php/dbginterface/nbproject/project.xml 23 May 2007 14:46:15 -0000 @@ -83,13 +83,13 @@ org.openide.text - 6.13 + 6.16 org.openide.util Index: scripting/ruby/debugger/nbproject/project.xml =================================================================== RCS file: /cvs/scripting/ruby/debugger/nbproject/project.xml,v retrieving revision 1.21 diff -u -6 -r1.21 project.xml --- scripting/ruby/debugger/nbproject/project.xml 18 May 2007 17:02:14 -0000 1.21 +++ scripting/ruby/debugger/nbproject/project.xml 23 May 2007 14:46:16 -0000 @@ -153,13 +153,13 @@ org.openide.text - 6.12 + 6.16 org.openide.util Index: scripting/ruby/editing/nbproject/project.xml =================================================================== RCS file: /cvs/scripting/ruby/editing/nbproject/project.xml,v retrieving revision 1.21 diff -u -6 -r1.21 project.xml --- scripting/ruby/editing/nbproject/project.xml 17 May 2007 23:19:07 -0000 1.21 +++ scripting/ruby/editing/nbproject/project.xml 23 May 2007 14:46:17 -0000 @@ -83,13 +83,13 @@ org.openide.text - 6.12 + 6.16 org.netbeans.modules.ruby.platform Index: scripting/ruby/projects/nbproject/project.xml =================================================================== RCS file: /cvs/scripting/ruby/projects/nbproject/project.xml,v retrieving revision 1.17 diff -u -6 -r1.17 project.xml --- scripting/ruby/projects/nbproject/project.xml 4 May 2007 16:34:01 -0000 1.17 +++ scripting/ruby/projects/nbproject/project.xml 23 May 2007 14:46:19 -0000 @@ -202,13 +202,13 @@ org.openide.text - 6.12 + 6.16 org.openide.util Index: scripting/ruby/railsprojects/nbproject/project.xml =================================================================== RCS file: /cvs/scripting/ruby/railsprojects/nbproject/project.xml,v retrieving revision 1.20 diff -u -6 -r1.20 project.xml --- scripting/ruby/railsprojects/nbproject/project.xml 18 May 2007 17:02:17 -0000 1.20 +++ scripting/ruby/railsprojects/nbproject/project.xml 23 May 2007 14:46:20 -0000 @@ -214,13 +214,13 @@ org.openide.text - 6.12 + 6.16 org.openide.util Index: scripting/ruby/rhtml/nbproject/project.xml =================================================================== RCS file: /cvs/scripting/ruby/rhtml/nbproject/project.xml,v retrieving revision 1.5 diff -u -6 -r1.5 project.xml --- scripting/ruby/rhtml/nbproject/project.xml 15 May 2007 09:14:22 -0000 1.5 +++ scripting/ruby/rhtml/nbproject/project.xml 23 May 2007 14:46:21 -0000 @@ -146,13 +146,13 @@ org.openide.text - 6.12 + 6.16 org.openide.util Index: serverplugins/jboss4/nbproject/project.xml =================================================================== RCS file: /cvs/serverplugins/jboss4/nbproject/project.xml,v retrieving revision 1.13 diff -u -6 -r1.13 project.xml --- serverplugins/jboss4/nbproject/project.xml 12 Oct 2006 14:37:58 -0000 1.13 +++ serverplugins/jboss4/nbproject/project.xml 23 May 2007 14:46:22 -0000 @@ -175,13 +175,13 @@ org.openide.text - 6.2 + 6.16 org.openide.util Index: serverplugins/oc4j/nbproject/project.xml =================================================================== RCS file: /cvs/serverplugins/oc4j/nbproject/project.xml,v retrieving revision 1.3 diff -u -6 -r1.3 project.xml --- serverplugins/oc4j/nbproject/project.xml 8 Mar 2007 15:14:16 -0000 1.3 +++ serverplugins/oc4j/nbproject/project.xml 23 May 2007 14:46:24 -0000 @@ -178,13 +178,13 @@ org.openide.text - 6.9.11 + 6.16 org.openide.util Index: serverplugins/sun/appsrv81/nbproject/project.xml =================================================================== RCS file: /cvs/serverplugins/sun/appsrv81/nbproject/project.xml,v retrieving revision 1.28 diff -u -6 -r1.28 project.xml --- serverplugins/sun/appsrv81/nbproject/project.xml 15 Apr 2007 15:58:32 -0000 1.28 +++ serverplugins/sun/appsrv81/nbproject/project.xml 23 May 2007 14:46:26 -0000 @@ -282,13 +282,13 @@ org.openide.text - 6.2 + 6.16 org.openide.util Index: serverplugins/sun/avk/nbproject/project.xml =================================================================== RCS file: /cvs/serverplugins/sun/avk/nbproject/project.xml,v retrieving revision 1.4 diff -u -6 -r1.4 project.xml --- serverplugins/sun/avk/nbproject/project.xml 29 Mar 2007 23:05:23 -0000 1.4 +++ serverplugins/sun/avk/nbproject/project.xml 23 May 2007 14:46:30 -0000 @@ -230,13 +230,13 @@ org.openide.text - 6.9.1 + 6.16 org.openide.util Index: serverplugins/sun/sunddui/nbproject/project.xml =================================================================== RCS file: /cvs/serverplugins/sun/sunddui/nbproject/project.xml,v retrieving revision 1.19 diff -u -6 -r1.19 project.xml --- serverplugins/sun/sunddui/nbproject/project.xml 29 Mar 2007 23:05:23 -0000 1.19 +++ serverplugins/sun/sunddui/nbproject/project.xml 23 May 2007 14:46:32 -0000 @@ -203,13 +203,13 @@ org.openide.text - 6.2 + 6.16 org.openide.util Index: serverplugins/sun/webserver7/nbproject/project.xml =================================================================== RCS file: /cvs/serverplugins/sun/webserver7/nbproject/project.xml,v retrieving revision 1.8 diff -u -6 -r1.8 project.xml --- serverplugins/sun/webserver7/nbproject/project.xml 10 Nov 2006 13:07:03 -0000 1.8 +++ serverplugins/sun/webserver7/nbproject/project.xml 23 May 2007 14:46:35 -0000 @@ -202,13 +202,13 @@ org.openide.text - 6.2 + 6.16 org.openide.util Index: serverplugins/weblogic9/nbproject/project.xml =================================================================== RCS file: /cvs/serverplugins/weblogic9/nbproject/project.xml,v retrieving revision 1.18 diff -u -6 -r1.18 project.xml --- serverplugins/weblogic9/nbproject/project.xml 29 Mar 2007 23:05:28 -0000 1.18 +++ serverplugins/weblogic9/nbproject/project.xml 23 May 2007 14:46:36 -0000 @@ -74,13 +74,13 @@ org.openide.text - 6.2 + 6.16 org.openide.windows Index: serverplugins/websphere6/nbproject/project.xml =================================================================== RCS file: /cvs/serverplugins/websphere6/nbproject/project.xml,v retrieving revision 1.14 diff -u -6 -r1.14 project.xml --- serverplugins/websphere6/nbproject/project.xml 15 Nov 2006 12:39:51 -0000 1.14 +++ serverplugins/websphere6/nbproject/project.xml 23 May 2007 14:46:37 -0000 @@ -253,13 +253,13 @@ org.openide.text - 6.9.1 + 6.16 org.openide.util Index: spellchecker/core/nbproject/project.xml =================================================================== RCS file: /cvs/spellchecker/core/nbproject/project.xml,v retrieving revision 1.3 diff -u -6 -r1.3 project.xml --- spellchecker/core/nbproject/project.xml 16 Feb 2007 17:19:49 -0000 1.3 +++ spellchecker/core/nbproject/project.xml 23 May 2007 14:46:41 -0000 @@ -154,13 +154,13 @@ org.openide.text - 6.9.1 + 6.16 org.openide.util Index: subversion/main/nbproject/project.xml =================================================================== RCS file: /cvs/subversion/main/nbproject/project.xml,v retrieving revision 1.19 diff -u -6 -r1.19 project.xml --- subversion/main/nbproject/project.xml 29 Mar 2007 12:07:32 -0000 1.19 +++ subversion/main/nbproject/project.xml 23 May 2007 14:46:42 -0000 @@ -214,13 +214,13 @@ org.openide.text - 6.9.1 + 6.16 org.openide.util Index: tasklist/api/nbproject/project.xml =================================================================== RCS file: /cvs/tasklist/api/nbproject/project.xml,v retrieving revision 1.9 diff -u -6 -r1.9 project.xml --- tasklist/api/nbproject/project.xml 30 Jun 2006 22:04:41 -0000 1.9 +++ tasklist/api/nbproject/project.xml 23 May 2007 14:46:45 -0000 @@ -49,13 +49,13 @@ org.openide.text - 6.2 + 6.16 org.openide.loaders Index: tasklist/bugs/nbproject/project.xml =================================================================== RCS file: /cvs/tasklist/bugs/nbproject/project.xml,v retrieving revision 1.9 diff -u -6 -r1.9 project.xml --- tasklist/bugs/nbproject/project.xml 17 May 2007 18:56:20 -0000 1.9 +++ tasklist/bugs/nbproject/project.xml 23 May 2007 14:46:45 -0000 @@ -124,13 +124,13 @@ org.openide.text - 6.2 + 6.16 org.openide.util Index: tasklist/checkstyle/nbproject/project.xml =================================================================== RCS file: /cvs/tasklist/checkstyle/nbproject/project.xml,v retrieving revision 1.10 diff -u -6 -r1.10 project.xml --- tasklist/checkstyle/nbproject/project.xml 9 Nov 2006 16:54:09 -0000 1.10 +++ tasklist/checkstyle/nbproject/project.xml 23 May 2007 14:46:46 -0000 @@ -106,13 +106,13 @@ org.openide.text - 6.9.1 + 6.16 org.openide.util Index: tasklist/copyright/nbproject/project.xml =================================================================== RCS file: /cvs/tasklist/copyright/nbproject/project.xml,v retrieving revision 1.4 diff -u -6 -r1.4 project.xml --- tasklist/copyright/nbproject/project.xml 30 Jun 2006 22:04:50 -0000 1.4 +++ tasklist/copyright/nbproject/project.xml 23 May 2007 14:46:47 -0000 @@ -83,13 +83,13 @@ org.openide.text - 6.2 + 6.16 org.openide.loaders Index: tasklist/core/nbproject/project.xml =================================================================== RCS file: /cvs/tasklist/core/nbproject/project.xml,v retrieving revision 1.10 diff -u -6 -r1.10 project.xml --- tasklist/core/nbproject/project.xml 17 May 2007 18:56:25 -0000 1.10 +++ tasklist/core/nbproject/project.xml 23 May 2007 14:46:47 -0000 @@ -124,13 +124,13 @@ org.openide.text - 6.2 + 6.16 org.openide.util Index: tasklist/docscan/nbproject/project.xml =================================================================== RCS file: /cvs/tasklist/docscan/nbproject/project.xml,v retrieving revision 1.9 diff -u -6 -r1.9 project.xml --- tasklist/docscan/nbproject/project.xml 17 May 2007 18:56:22 -0000 1.9 +++ tasklist/docscan/nbproject/project.xml 23 May 2007 14:46:49 -0000 @@ -156,13 +156,13 @@ org.openide.text - 6.2 + 6.16 org.openide.util Index: tasklist/editor/nbproject/project.xml =================================================================== RCS file: /cvs/tasklist/editor/nbproject/project.xml,v retrieving revision 1.4 diff -u -6 -r1.4 project.xml --- tasklist/editor/nbproject/project.xml 30 Jun 2006 22:05:06 -0000 1.4 +++ tasklist/editor/nbproject/project.xml 23 May 2007 14:46:49 -0000 @@ -83,13 +83,13 @@ org.openide.text - 6.2 + 6.16 Index: tasklist/i18n/nbproject/project.xml =================================================================== RCS file: /cvs/tasklist/i18n/nbproject/project.xml,v retrieving revision 1.9 diff -u -6 -r1.9 project.xml --- tasklist/i18n/nbproject/project.xml 30 Jun 2006 22:05:08 -0000 1.9 +++ tasklist/i18n/nbproject/project.xml 23 May 2007 14:46:50 -0000 @@ -91,13 +91,13 @@ org.openide.text - 6.2 + 6.16 org.openide.loaders Index: tasklist/javadoc/nbproject/project.xml =================================================================== RCS file: /cvs/tasklist/javadoc/nbproject/project.xml,v retrieving revision 1.5 diff -u -6 -r1.5 project.xml --- tasklist/javadoc/nbproject/project.xml 30 Jun 2006 22:05:09 -0000 1.5 +++ tasklist/javadoc/nbproject/project.xml 23 May 2007 14:46:51 -0000 @@ -106,13 +106,13 @@ org.openide.text - 6.10 + 6.16 org.openide.util Index: tasklist/suggestions/nbproject/project.xml =================================================================== RCS file: /cvs/tasklist/suggestions/nbproject/project.xml,v retrieving revision 1.6 diff -u -6 -r1.6 project.xml --- tasklist/suggestions/nbproject/project.xml 17 May 2007 18:56:31 -0000 1.6 +++ tasklist/suggestions/nbproject/project.xml 23 May 2007 14:46:51 -0000 @@ -132,13 +132,13 @@ org.openide.text - 6.2 + 6.16 org.openide.util Index: tasklist/suggestions/ui/nbproject/project.xml =================================================================== RCS file: /cvs/tasklist/suggestions/ui/nbproject/project.xml,v retrieving revision 1.7 diff -u -6 -r1.7 project.xml --- tasklist/suggestions/ui/nbproject/project.xml 17 May 2007 18:56:20 -0000 1.7 +++ tasklist/suggestions/ui/nbproject/project.xml 23 May 2007 14:46:52 -0000 @@ -125,13 +125,13 @@ org.openide.text - 6.2 + 6.16 org.openide.util Index: tasklist/usertasks/nbproject/project.xml =================================================================== RCS file: /cvs/tasklist/usertasks/nbproject/project.xml,v retrieving revision 1.19 diff -u -6 -r1.19 project.xml --- tasklist/usertasks/nbproject/project.xml 17 May 2007 18:56:25 -0000 1.19 +++ tasklist/usertasks/nbproject/project.xml 23 May 2007 14:46:53 -0000 @@ -160,13 +160,13 @@ org.openide.text - 6.2 + 6.16 org.openide.util Index: tomcatint/tomcat5/nbproject/project.xml =================================================================== RCS file: /cvs/tomcatint/tomcat5/nbproject/project.xml,v retrieving revision 1.23 diff -u -6 -r1.23 project.xml --- tomcatint/tomcat5/nbproject/project.xml 4 May 2007 09:00:41 -0000 1.23 +++ tomcatint/tomcat5/nbproject/project.xml 23 May 2007 14:46:57 -0000 @@ -201,13 +201,13 @@ org.openide.text - 6.2 + 6.16 org.openide.util Index: uml/core/nbproject/project.xml =================================================================== RCS file: /cvs/uml/core/nbproject/project.xml,v retrieving revision 1.9 diff -u -6 -r1.9 project.xml --- uml/core/nbproject/project.xml 15 May 2007 16:34:37 -0000 1.9 +++ uml/core/nbproject/project.xml 23 May 2007 14:48:44 -0000 @@ -159,13 +159,13 @@ org.openide.text - 6.9.12 + 6.16 org.openide.util Index: uml/drawingareacontrol/nbproject/project.xml =================================================================== RCS file: /cvs/uml/drawingareacontrol/nbproject/project.xml,v retrieving revision 1.6 diff -u -6 -r1.6 project.xml --- uml/drawingareacontrol/nbproject/project.xml 15 May 2007 16:34:29 -0000 1.6 +++ uml/drawingareacontrol/nbproject/project.xml 23 May 2007 14:49:05 -0000 @@ -171,13 +171,13 @@ org.openide.text - 6.9.1 + 6.16 org.openide.util Index: uml/ideintegration/nbproject/project.xml =================================================================== RCS file: /cvs/uml/ideintegration/nbproject/project.xml,v retrieving revision 1.8 diff -u -6 -r1.8 project.xml --- uml/ideintegration/nbproject/project.xml 18 May 2007 00:14:00 -0000 1.8 +++ uml/ideintegration/nbproject/project.xml 23 May 2007 14:49:06 -0000 @@ -228,13 +228,13 @@ org.openide.text - 6.6.1 + 6.16 org.openide.util Index: uml/projectui/nbproject/project.xml =================================================================== RCS file: /cvs/uml/projectui/nbproject/project.xml,v retrieving revision 1.6 diff -u -6 -r1.6 project.xml --- uml/projectui/nbproject/project.xml 15 May 2007 16:34:30 -0000 1.6 +++ uml/projectui/nbproject/project.xml 23 May 2007 14:49:10 -0000 @@ -231,13 +231,13 @@ org.openide.text - 6.9.22 + 6.16 org.openide.util Index: utilities/loaderswitcher/nbproject/project.xml =================================================================== RCS file: /cvs/utilities/loaderswitcher/nbproject/project.xml,v retrieving revision 1.3 diff -u -6 -r1.3 project.xml --- utilities/loaderswitcher/nbproject/project.xml 9 Nov 2006 16:54:10 -0000 1.3 +++ utilities/loaderswitcher/nbproject/project.xml 23 May 2007 14:49:26 -0000 @@ -76,12 +76,15 @@ 6.2 org.openide.text + + 6.16 + org.openide.util Index: utilities/nbproject/project.xml =================================================================== RCS file: /cvs/utilities/nbproject/project.xml,v retrieving revision 1.25 diff -u -6 -r1.25 project.xml --- utilities/nbproject/project.xml 19 Mar 2007 16:55:29 -0000 1.25 +++ utilities/nbproject/project.xml 23 May 2007 14:49:27 -0000 @@ -123,21 +123,21 @@ org.openide.options - 6.2 + 6.7 org.openide.text - 6.2 + 6.16 org.openide.util Index: vcscore/nbproject/project.xml =================================================================== RCS file: /cvs/vcscore/nbproject/project.xml,v retrieving revision 1.19 diff -u -6 -r1.19 project.xml --- vcscore/nbproject/project.xml 9 Nov 2006 16:54:11 -0000 1.19 +++ vcscore/nbproject/project.xml 23 May 2007 14:49:29 -0000 @@ -139,13 +139,13 @@ org.openide.text - 6.12 + 6.16 org.openide.util Index: versioncontrol/mercurial/nbproject/project.xml =================================================================== RCS file: /cvs/versioncontrol/mercurial/nbproject/Attic/project.xml,v retrieving revision 1.1.2.12 diff -u -6 -r1.1.2.12 project.xml --- versioncontrol/mercurial/nbproject/project.xml 21 May 2007 15:20:53 -0000 1.1.2.12 +++ versioncontrol/mercurial/nbproject/project.xml 23 May 2007 14:49:36 -0000 @@ -205,13 +205,13 @@ org.openide.text - 6.9.1 + 6.16 org.openide.util Index: versioncontrol/nbproject/project.xml =================================================================== RCS file: /cvs/versioncontrol/nbproject/project.xml,v retrieving revision 1.22 diff -u -6 -r1.22 project.xml --- versioncontrol/nbproject/project.xml 17 Apr 2007 13:05:36 -0000 1.22 +++ versioncontrol/nbproject/project.xml 23 May 2007 14:49:37 -0000 @@ -133,13 +133,13 @@ org.openide.text - 6.12 + 6.16 org.openide.util Index: versioncontrol/util/nbproject/project.xml =================================================================== RCS file: /cvs/versioncontrol/util/nbproject/project.xml,v retrieving revision 1.3 diff -u -6 -r1.3 project.xml --- versioncontrol/util/nbproject/project.xml 25 Apr 2007 14:54:05 -0000 1.3 +++ versioncontrol/util/nbproject/project.xml 23 May 2007 14:49:37 -0000 @@ -97,13 +97,13 @@ org.openide.text - 6.12 + 6.16 org.openide.util Index: visualweb/complib/nbproject/project.xml =================================================================== RCS file: /cvs/visualweb/complib/nbproject/project.xml,v retrieving revision 1.7 diff -u -6 -r1.7 project.xml --- visualweb/complib/nbproject/project.xml 23 Apr 2007 15:50:14 -0000 1.7 +++ visualweb/complib/nbproject/project.xml 23 May 2007 14:49:39 -0000 @@ -305,13 +305,13 @@ org.openide.text - 6.8.1 + 6.16 org.openide.util Index: visualweb/dataconnectivity/nbproject/project.xml =================================================================== RCS file: /cvs/visualweb/dataconnectivity/nbproject/project.xml,v retrieving revision 1.9 diff -u -6 -r1.9 project.xml --- visualweb/dataconnectivity/nbproject/project.xml 2 May 2007 22:49:15 -0000 1.9 +++ visualweb/dataconnectivity/nbproject/project.xml 23 May 2007 14:49:40 -0000 @@ -283,13 +283,13 @@ org.openide.text - 6.2 + 6.16 org.openide.util Index: visualweb/dataprovider/designtime/nbproject/project.xml =================================================================== RCS file: /cvs/visualweb/dataprovider/designtime/nbproject/project.xml,v retrieving revision 1.3 diff -u -6 -r1.3 project.xml --- visualweb/dataprovider/designtime/nbproject/project.xml 23 Apr 2007 15:50:16 -0000 1.3 +++ visualweb/dataprovider/designtime/nbproject/project.xml 23 May 2007 14:49:42 -0000 @@ -100,13 +100,13 @@ org.openide.text - 6.9.2 + 6.16 org.openide.util Index: visualweb/designer/cssengine/nbproject/project.xml =================================================================== RCS file: /cvs/visualweb/designer/cssengine/nbproject/project.xml,v retrieving revision 1.2 diff -u -6 -r1.2 project.xml --- visualweb/designer/cssengine/nbproject/project.xml 23 Apr 2007 15:50:20 -0000 1.2 +++ visualweb/designer/cssengine/nbproject/project.xml 23 May 2007 14:49:43 -0000 @@ -75,13 +75,13 @@ org.openide.text - 6.9.1 + 6.16 org.openide.util Index: visualweb/designer/jsf/nbproject/project.xml =================================================================== RCS file: /cvs/visualweb/designer/jsf/nbproject/project.xml,v retrieving revision 1.8 diff -u -6 -r1.8 project.xml --- visualweb/designer/jsf/nbproject/project.xml 23 Apr 2007 15:50:23 -0000 1.8 +++ visualweb/designer/jsf/nbproject/project.xml 23 May 2007 14:49:45 -0000 @@ -326,13 +326,13 @@ org.openide.text - 6.9.22 + 6.16 org.openide.util Index: visualweb/ejb/nbproject/project.xml =================================================================== RCS file: /cvs/visualweb/ejb/nbproject/project.xml,v retrieving revision 1.2 diff -u -6 -r1.2 project.xml --- visualweb/ejb/nbproject/project.xml 14 May 2007 22:16:41 -0000 1.2 +++ visualweb/ejb/nbproject/project.xml 23 May 2007 14:49:47 -0000 @@ -145,13 +145,13 @@ org.openide.text - 6.9 + 6.16 org.openide.util Index: visualweb/errorhandler/server/nbproject/project.xml =================================================================== RCS file: /cvs/visualweb/errorhandler/server/nbproject/project.xml,v retrieving revision 1.2 diff -u -6 -r1.2 project.xml --- visualweb/errorhandler/server/nbproject/project.xml 23 Apr 2007 15:50:33 -0000 1.2 +++ visualweb/errorhandler/server/nbproject/project.xml 23 May 2007 14:49:48 -0000 @@ -76,13 +76,13 @@ org.openide.text - 6.7 + 6.16 org.openide.util Index: visualweb/extension_openide/nbproject/project.xml =================================================================== RCS file: /cvs/visualweb/extension_openide/nbproject/project.xml,v retrieving revision 1.5 diff -u -6 -r1.5 project.xml --- visualweb/extension_openide/nbproject/project.xml 14 May 2007 22:25:00 -0000 1.5 +++ visualweb/extension_openide/nbproject/project.xml 23 May 2007 14:49:49 -0000 @@ -41,13 +41,13 @@ org.openide.text - 6.7 + 6.16 org.openide.util Index: visualweb/insync/nbproject/project.xml =================================================================== RCS file: /cvs/visualweb/insync/nbproject/project.xml,v retrieving revision 1.11 diff -u -6 -r1.11 project.xml --- visualweb/insync/nbproject/project.xml 23 Apr 2007 15:50:40 -0000 1.11 +++ visualweb/insync/nbproject/project.xml 23 May 2007 14:49:51 -0000 @@ -407,13 +407,13 @@ org.openide.text - 6.9 + 6.16 org.openide.util Index: visualweb/palette/nbproject/project.xml =================================================================== RCS file: /cvs/visualweb/palette/nbproject/project.xml,v retrieving revision 1.2 diff -u -6 -r1.2 project.xml --- visualweb/palette/nbproject/project.xml 23 Apr 2007 15:50:49 -0000 1.2 +++ visualweb/palette/nbproject/project.xml 23 May 2007 14:49:56 -0000 @@ -93,13 +93,13 @@ org.openide.text - 6.9.2 + 6.16 org.openide.util Index: visualweb/project/jsfloader/nbproject/project.xml =================================================================== RCS file: /cvs/visualweb/project/jsfloader/nbproject/project.xml,v retrieving revision 1.6 diff -u -6 -r1.6 project.xml --- visualweb/project/jsfloader/nbproject/project.xml 23 Apr 2007 15:50:54 -0000 1.6 +++ visualweb/project/jsfloader/nbproject/project.xml 23 May 2007 14:49:58 -0000 @@ -195,13 +195,13 @@ org.openide.text - 6.9 + 6.16 org.openide.util Index: visualweb/project/navigationloader/nbproject/project.xml =================================================================== RCS file: /cvs/visualweb/project/navigationloader/nbproject/project.xml,v retrieving revision 1.1 diff -u -6 -r1.1 project.xml --- visualweb/project/navigationloader/nbproject/project.xml 28 Jan 2007 18:55:02 -0000 1.1 +++ visualweb/project/navigationloader/nbproject/project.xml 23 May 2007 14:49:59 -0000 @@ -95,13 +95,13 @@ org.openide.text - 6.9 + 6.16 org.openide.util Index: visualweb/websvcmgr/nbproject/project.xml =================================================================== RCS file: /cvs/visualweb/websvcmgr/nbproject/project.xml,v retrieving revision 1.7 diff -u -6 -r1.7 project.xml --- visualweb/websvcmgr/nbproject/project.xml 2 May 2007 23:22:19 -0000 1.7 +++ visualweb/websvcmgr/nbproject/project.xml 23 May 2007 14:50:13 -0000 @@ -221,13 +221,13 @@ org.openide.text - 6.9 + 6.16 org.openide.util Index: web/core/nbproject/project.xml =================================================================== RCS file: /cvs/web/core/nbproject/project.xml,v retrieving revision 1.25 diff -u -6 -r1.25 project.xml --- web/core/nbproject/project.xml 4 May 2007 08:45:46 -0000 1.25 +++ web/core/nbproject/project.xml 23 May 2007 14:50:23 -0000 @@ -270,13 +270,13 @@ org.openide.text - 6.2 + 6.16 org.openide.util Index: web/css/nbproject/project.xml =================================================================== RCS file: /cvs/web/css/nbproject/project.xml,v retrieving revision 1.4 diff -u -6 -r1.4 project.xml --- web/css/nbproject/project.xml 29 Mar 2007 12:17:20 -0000 1.4 +++ web/css/nbproject/project.xml 23 May 2007 14:50:25 -0000 @@ -167,13 +167,13 @@ org.openide.text - 6.12 + 6.16 org.openide.util Index: web/freeform/nbproject/project.xml =================================================================== RCS file: /cvs/web/freeform/nbproject/project.xml,v retrieving revision 1.19 diff -u -6 -r1.19 project.xml --- web/freeform/nbproject/project.xml 23 Apr 2007 15:16:20 -0000 1.19 +++ web/freeform/nbproject/project.xml 23 May 2007 14:50:28 -0000 @@ -154,13 +154,13 @@ org.openide.text - 6.2 + 6.16 org.openide.util Index: web/jsf/nbproject/project.xml =================================================================== RCS file: /cvs/web/jsf/nbproject/project.xml,v retrieving revision 1.19 diff -u -6 -r1.19 project.xml --- web/jsf/nbproject/project.xml 4 May 2007 08:45:47 -0000 1.19 +++ web/jsf/nbproject/project.xml 23 May 2007 14:50:30 -0000 @@ -335,13 +335,13 @@ org.openide.text - 6.2 + 6.16 org.openide.util Index: web/jspdebug/nbproject/project.xml =================================================================== RCS file: /cvs/web/jspdebug/nbproject/project.xml,v retrieving revision 1.14 diff -u -6 -r1.14 project.xml --- web/jspdebug/nbproject/project.xml 30 Jun 2006 22:34:27 -0000 1.14 +++ web/jspdebug/nbproject/project.xml 23 May 2007 14:50:31 -0000 @@ -133,13 +133,13 @@ org.openide.text - 6.2 + 6.16 Index: web/jspparser/nbproject/project.xml =================================================================== RCS file: /cvs/web/jspparser/nbproject/project.xml,v retrieving revision 1.13 diff -u -6 -r1.13 project.xml --- web/jspparser/nbproject/project.xml 12 Apr 2007 13:39:37 -0000 1.13 +++ web/jspparser/nbproject/project.xml 23 May 2007 14:50:33 -0000 @@ -88,13 +88,13 @@ org.openide.text - 6.2 + 6.16 org.openide.util Index: web/jspsyntax/nbproject/project.xml =================================================================== RCS file: /cvs/web/jspsyntax/nbproject/project.xml,v retrieving revision 1.29 diff -u -6 -r1.29 project.xml --- web/jspsyntax/nbproject/project.xml 13 Apr 2007 11:44:53 -0000 1.29 +++ web/jspsyntax/nbproject/project.xml 23 May 2007 14:50:34 -0000 @@ -285,21 +285,21 @@ org.openide.options - 6.2 + 6.7 org.openide.text - 6.2 + 6.16 org.openide.util Index: web/struts/nbproject/project.xml =================================================================== RCS file: /cvs/web/struts/nbproject/project.xml,v retrieving revision 1.11 diff -u -6 -r1.11 project.xml --- web/struts/nbproject/project.xml 4 May 2007 08:45:48 -0000 1.11 +++ web/struts/nbproject/project.xml 23 May 2007 14:50:42 -0000 @@ -244,13 +244,13 @@ org.openide.text - 6.2 + 6.16 org.openide.util Index: websvc/core/nbproject/project.xml =================================================================== RCS file: /cvs/websvc/core/nbproject/project.xml,v retrieving revision 1.44 diff -u -6 -r1.44 project.xml --- websvc/core/nbproject/project.xml 4 May 2007 11:18:54 -0000 1.44 +++ websvc/core/nbproject/project.xml 23 May 2007 14:50:46 -0000 @@ -346,13 +346,13 @@ org.openide.text - 6.2 + 6.16 org.openide.util Index: websvc/customization/nbproject/project.xml =================================================================== RCS file: /cvs/websvc/customization/nbproject/project.xml,v retrieving revision 1.3 diff -u -6 -r1.3 project.xml --- websvc/customization/nbproject/project.xml 9 Nov 2006 16:54:12 -0000 1.3 +++ websvc/customization/nbproject/project.xml 23 May 2007 14:50:48 -0000 @@ -177,13 +177,13 @@ org.openide.text - 6.9.11 + 6.16 org.openide.util Index: websvc/design/nbproject/project.xml =================================================================== RCS file: /cvs/websvc/design/nbproject/project.xml,v retrieving revision 1.17 diff -u -6 -r1.17 project.xml --- websvc/design/nbproject/project.xml 18 Apr 2007 18:19:38 -0000 1.17 +++ websvc/design/nbproject/project.xml 23 May 2007 14:50:49 -0000 @@ -238,13 +238,13 @@ org.openide.text - 6.13 + 6.16 org.openide.util Index: websvc/dev/nbproject/project.xml =================================================================== RCS file: /cvs/websvc/dev/nbproject/project.xml,v retrieving revision 1.24 diff -u -6 -r1.24 project.xml --- websvc/dev/nbproject/project.xml 24 Nov 2006 13:35:08 -0000 1.24 +++ websvc/dev/nbproject/project.xml 23 May 2007 14:50:50 -0000 @@ -243,13 +243,13 @@ org.openide.text - 6.2 + 6.16 org.openide.util Index: websvc/jaxrpcsupport/nbproject/project.xml =================================================================== RCS file: /cvs/websvc/jaxrpcsupport/nbproject/project.xml,v retrieving revision 1.3 diff -u -6 -r1.3 project.xml --- websvc/jaxrpcsupport/nbproject/project.xml 29 Mar 2007 23:05:37 -0000 1.3 +++ websvc/jaxrpcsupport/nbproject/project.xml 23 May 2007 14:50:51 -0000 @@ -311,13 +311,13 @@ org.openide.text - 6.12 + 6.16 org.openide.util Index: websvc/rest/nbproject/project.xml =================================================================== RCS file: /cvs/websvc/rest/nbproject/project.xml,v retrieving revision 1.15 diff -u -6 -r1.15 project.xml --- websvc/rest/nbproject/project.xml 16 Apr 2007 03:33:59 -0000 1.15 +++ websvc/rest/nbproject/project.xml 23 May 2007 14:50:54 -0000 @@ -135,13 +135,13 @@ org.openide.text - 6.14 + 6.16 org.openide.util Index: websvc/wsitconf/nbproject/project.xml =================================================================== RCS file: /cvs/websvc/wsitconf/nbproject/project.xml,v retrieving revision 1.12 diff -u -6 -r1.12 project.xml --- websvc/wsitconf/nbproject/project.xml 4 May 2007 08:45:49 -0000 1.12 +++ websvc/wsitconf/nbproject/project.xml 23 May 2007 14:50:57 -0000 @@ -311,13 +311,13 @@ org.openide.text - 6.9.1 + 6.16 org.openide.util Index: xml/api/nbproject/project.xml =================================================================== RCS file: /cvs/xml/api/nbproject/project.xml,v retrieving revision 1.6 diff -u -6 -r1.6 project.xml --- xml/api/nbproject/project.xml 30 Jun 2006 22:49:12 -0000 1.6 +++ xml/api/nbproject/project.xml 23 May 2007 14:51:02 -0000 @@ -55,13 +55,13 @@ org.openide.text - 6.2 + 6.16 org.netbeans.api.xml.cookies org.netbeans.api.xml.parsers Index: xml/catalog/nbproject/project.xml =================================================================== RCS file: /cvs/xml/catalog/nbproject/project.xml,v retrieving revision 1.9 diff -u -6 -r1.9 project.xml --- xml/catalog/nbproject/project.xml 21 May 2007 19:57:57 -0000 1.9 +++ xml/catalog/nbproject/project.xml 23 May 2007 14:51:04 -0000 @@ -105,13 +105,13 @@ org.openide.text - 6.2 + 6.16 org.openide.util Index: xml/core/nbproject/project.xml =================================================================== RCS file: /cvs/xml/core/nbproject/project.xml,v retrieving revision 1.11 diff -u -6 -r1.11 project.xml --- xml/core/nbproject/project.xml 18 Apr 2007 23:36:28 -0000 1.11 +++ xml/core/nbproject/project.xml 23 May 2007 14:51:07 -0000 @@ -139,13 +139,13 @@ org.openide.text - 6.2 + 6.16 org.openide.util Index: xml/css/nbproject/project.xml =================================================================== RCS file: /cvs/xml/css/nbproject/project.xml,v retrieving revision 1.6 diff -u -6 -r1.6 project.xml --- xml/css/nbproject/project.xml 19 Jul 2006 06:54:04 -0000 1.6 +++ xml/css/nbproject/project.xml 23 May 2007 14:51:09 -0000 @@ -104,13 +104,13 @@ org.openide.text - 6.2 + 6.16 org.openide.util Index: xml/jaxb/nbproject/project.xml =================================================================== RCS file: /cvs/xml/jaxb/nbproject/project.xml,v retrieving revision 1.4 diff -u -6 -r1.4 project.xml --- xml/jaxb/nbproject/project.xml 16 May 2007 02:03:21 -0000 1.4 +++ xml/jaxb/nbproject/project.xml 23 May 2007 14:51:10 -0000 @@ -187,13 +187,13 @@ org.openide.text - 6.9.12 + 6.16 org.openide.util Index: xml/multiview/nbproject/project.xml =================================================================== RCS file: /cvs/xml/multiview/nbproject/project.xml,v retrieving revision 1.14 diff -u -6 -r1.14 project.xml --- xml/multiview/nbproject/project.xml 17 Apr 2007 23:59:16 -0000 1.14 +++ xml/multiview/nbproject/project.xml 23 May 2007 14:51:11 -0000 @@ -87,13 +87,13 @@ org.openide.text - 6.2 + 6.16 org.openide.actions Index: xml/refactoring/nbproject/project.xml =================================================================== RCS file: /cvs/xml/refactoring/nbproject/project.xml,v retrieving revision 1.8 diff -u -6 -r1.8 project.xml --- xml/refactoring/nbproject/project.xml 18 Apr 2007 07:34:42 -0000 1.8 +++ xml/refactoring/nbproject/project.xml 23 May 2007 14:51:13 -0000 @@ -150,13 +150,13 @@ org.openide.text - 6.9.1 + 6.16 org.openide.util Index: xml/retriever/nbproject/project.xml =================================================================== RCS file: /cvs/xml/retriever/nbproject/project.xml,v retrieving revision 1.4 diff -u -6 -r1.4 project.xml --- xml/retriever/nbproject/project.xml 24 Jan 2007 21:27:51 -0000 1.4 +++ xml/retriever/nbproject/project.xml 23 May 2007 14:51:13 -0000 @@ -125,13 +125,15 @@ org.openide.text - + + 6.16 + org.openide.util Index: xml/schema/abe/nbproject/project.xml =================================================================== RCS file: /cvs/xml/schema/abe/nbproject/project.xml,v retrieving revision 1.8 diff -u -6 -r1.8 project.xml --- xml/schema/abe/nbproject/project.xml 18 Apr 2007 07:34:44 -0000 1.8 +++ xml/schema/abe/nbproject/project.xml 23 May 2007 14:51:14 -0000 @@ -194,13 +194,13 @@ org.openide.text - 6.9.1 + 6.16 org.openide.util Index: xml/schema/core/nbproject/project.xml =================================================================== RCS file: /cvs/xml/schema/core/nbproject/project.xml,v retrieving revision 1.8 diff -u -6 -r1.8 project.xml --- xml/schema/core/nbproject/project.xml 18 Apr 2007 07:34:49 -0000 1.8 +++ xml/schema/core/nbproject/project.xml 23 May 2007 14:51:18 -0000 @@ -236,13 +236,13 @@ org.openide.text - 6.2 + 6.16 org.openide.util Index: xml/schema/refactoring/nbproject/project.xml =================================================================== RCS file: /cvs/xml/schema/refactoring/nbproject/project.xml,v retrieving revision 1.6 diff -u -6 -r1.6 project.xml --- xml/schema/refactoring/nbproject/project.xml 18 Apr 2007 07:34:53 -0000 1.6 +++ xml/schema/refactoring/nbproject/project.xml 23 May 2007 14:51:20 -0000 @@ -202,13 +202,13 @@ org.openide.text - 6.2 + 6.16 org.openide.util Index: xml/schema/schemaui/nbproject/project.xml =================================================================== RCS file: /cvs/xml/schema/schemaui/nbproject/project.xml,v retrieving revision 1.12 diff -u -6 -r1.12 project.xml --- xml/schema/schemaui/nbproject/project.xml 4 May 2007 21:10:10 -0000 1.12 +++ xml/schema/schemaui/nbproject/project.xml 23 May 2007 14:51:21 -0000 @@ -238,13 +238,13 @@ org.openide.text - 6.8.1 + 6.16 org.openide.util Index: xml/tax/nbproject/project.xml =================================================================== RCS file: /cvs/xml/tax/nbproject/project.xml,v retrieving revision 1.7 diff -u -6 -r1.7 project.xml --- xml/tax/nbproject/project.xml 9 Nov 2006 16:54:14 -0000 1.7 +++ xml/tax/nbproject/project.xml 23 May 2007 14:51:24 -0000 @@ -108,13 +108,13 @@ org.openide.text - 6.2 + 6.16 org.openide.util Index: xml/text-edit/nbproject/project.xml =================================================================== RCS file: /cvs/xml/text-edit/nbproject/project.xml,v retrieving revision 1.20 diff -u -6 -r1.20 project.xml --- xml/text-edit/nbproject/project.xml 25 Jan 2007 23:34:15 -0000 1.20 +++ xml/text-edit/nbproject/project.xml 23 May 2007 14:51:25 -0000 @@ -182,13 +182,13 @@ org.openide.text - 6.2 + 6.16 org.openide.util Index: xml/tools/nbproject/project.xml =================================================================== RCS file: /cvs/xml/tools/nbproject/project.xml,v retrieving revision 1.6 diff -u -6 -r1.6 project.xml --- xml/tools/nbproject/project.xml 5 Apr 2007 17:37:47 -0000 1.6 +++ xml/tools/nbproject/project.xml 23 May 2007 14:51:26 -0000 @@ -92,13 +92,13 @@ org.openide.text - 6.2 + 6.16 org.openide.loaders Index: xml/validation/nbproject/project.xml =================================================================== RCS file: /cvs/xml/validation/nbproject/project.xml,v retrieving revision 1.6 diff -u -6 -r1.6 project.xml --- xml/validation/nbproject/project.xml 26 Apr 2007 07:23:03 -0000 1.6 +++ xml/validation/nbproject/project.xml 23 May 2007 14:51:28 -0000 @@ -75,13 +75,13 @@ org.openide.text - 6.9.11 + 6.16 org.openide.util Index: xml/wsdl/refactoring/nbproject/project.xml =================================================================== RCS file: /cvs/xml/wsdl/refactoring/nbproject/project.xml,v retrieving revision 1.5 diff -u -6 -r1.5 project.xml --- xml/wsdl/refactoring/nbproject/project.xml 18 Apr 2007 07:34:59 -0000 1.5 +++ xml/wsdl/refactoring/nbproject/project.xml 23 May 2007 14:51:31 -0000 @@ -116,13 +116,13 @@ org.openide.text - 6.13 + 6.16 org.openide.util Index: xml/wsdlui/nbproject/project.xml =================================================================== RCS file: /cvs/xml/wsdlui/nbproject/project.xml,v retrieving revision 1.26 diff -u -6 -r1.26 project.xml --- xml/wsdlui/nbproject/project.xml 16 May 2007 22:31:28 -0000 1.26 +++ xml/wsdlui/nbproject/project.xml 23 May 2007 14:51:36 -0000 @@ -323,13 +323,13 @@ org.openide.text - 6.9.1 + 6.16 org.openide.util Index: xml/xdm/nbproject/project.xml =================================================================== RCS file: /cvs/xml/xdm/nbproject/project.xml,v retrieving revision 1.6 diff -u -6 -r1.6 project.xml --- xml/xdm/nbproject/project.xml 25 Jan 2007 23:40:59 -0000 1.6 +++ xml/xdm/nbproject/project.xml 23 May 2007 14:51:43 -0000 @@ -83,13 +83,13 @@ org.openide.text - 6.9.1 + 6.16 org.openide.util