diff --git a/ada.editor/nbproject/project.xml b/ada.editor/nbproject/project.xml
--- a/ada.editor/nbproject/project.xml
+++ b/ada.editor/nbproject/project.xml
@@ -63,8 +63,8 @@
- 1
- 1.29.1
+ 3
+ 3.1
diff --git a/cnd.fortran/nbproject/project.xml b/cnd.fortran/nbproject/project.xml
--- a/cnd.fortran/nbproject/project.xml
+++ b/cnd.fortran/nbproject/project.xml
@@ -55,8 +55,8 @@
- 1
- 1.27
+ 3
+ 3.1
diff --git a/cnd.syntaxerr/nbproject/project.xml b/cnd.syntaxerr/nbproject/project.xml
--- a/cnd.syntaxerr/nbproject/project.xml
+++ b/cnd.syntaxerr/nbproject/project.xml
@@ -72,8 +72,8 @@
- 1
- 1.27
+ 3
+ 3.1
diff --git a/codetemplatetools/nbproject/project.xml b/codetemplatetools/nbproject/project.xml
--- a/codetemplatetools/nbproject/project.xml
+++ b/codetemplatetools/nbproject/project.xml
@@ -60,8 +60,8 @@
- 2
- 2.1
+ 3
+ 3.1
diff --git a/editor.fold.support/nbproject/project.xml b/editor.fold.support/nbproject/project.xml
--- a/editor.fold.support/nbproject/project.xml
+++ b/editor.fold.support/nbproject/project.xml
@@ -28,8 +28,8 @@
- 1-2
- 1.38
+ 3
+ 3.1
diff --git a/editor.fscompletion/nbproject/project.xml b/editor.fscompletion/nbproject/project.xml
--- a/editor.fscompletion/nbproject/project.xml
+++ b/editor.fscompletion/nbproject/project.xml
@@ -19,8 +19,8 @@
- 1
- 1.27
+ 3
+ 3.1
diff --git a/editor.hints.spi.support/nbproject/project.xml b/editor.hints.spi.support/nbproject/project.xml
--- a/editor.hints.spi.support/nbproject/project.xml
+++ b/editor.hints.spi.support/nbproject/project.xml
@@ -28,8 +28,8 @@
- 1
- 1.27
+ 3
+ 3.1
diff --git a/editor.java.doclet.ejb/nbproject/project.xml b/editor.java.doclet.ejb/nbproject/project.xml
--- a/editor.java.doclet.ejb/nbproject/project.xml
+++ b/editor.java.doclet.ejb/nbproject/project.xml
@@ -59,8 +59,8 @@
- 1
- 1.27
+ 3
+ 3.1
diff --git a/editor.java.doclet.hibernate/nbproject/project.xml b/editor.java.doclet.hibernate/nbproject/project.xml
--- a/editor.java.doclet.hibernate/nbproject/project.xml
+++ b/editor.java.doclet.hibernate/nbproject/project.xml
@@ -59,8 +59,8 @@
- 1
- 1.27
+ 3
+ 3.1
diff --git a/editor.java.doclet.javadoc/nbproject/project.xml b/editor.java.doclet.javadoc/nbproject/project.xml
--- a/editor.java.doclet.javadoc/nbproject/project.xml
+++ b/editor.java.doclet.javadoc/nbproject/project.xml
@@ -78,8 +78,8 @@
- 1
- 1.27
+ 3
+ 3.1
diff --git a/editor.java.doclet.spring/nbproject/project.xml b/editor.java.doclet.spring/nbproject/project.xml
--- a/editor.java.doclet.spring/nbproject/project.xml
+++ b/editor.java.doclet.spring/nbproject/project.xml
@@ -59,8 +59,8 @@
- 1
- 1.27
+ 3
+ 3.1
diff --git a/editor.java.doclet/nbproject/project.xml b/editor.java.doclet/nbproject/project.xml
--- a/editor.java.doclet/nbproject/project.xml
+++ b/editor.java.doclet/nbproject/project.xml
@@ -58,8 +58,8 @@
- 1
- 1.27
+ 3
+ 3.1
diff --git a/editor.nexterror/nbproject/project.xml b/editor.nexterror/nbproject/project.xml
--- a/editor.nexterror/nbproject/project.xml
+++ b/editor.nexterror/nbproject/project.xml
@@ -51,8 +51,8 @@
- 2
- 2.1
+ 3
+ 3.1
diff --git a/erlang.editing/nbproject/project.xml b/erlang.editing/nbproject/project.xml
--- a/erlang.editing/nbproject/project.xml
+++ b/erlang.editing/nbproject/project.xml
@@ -11,7 +11,7 @@
3
- 1.41
+ 1.53
@@ -36,8 +36,8 @@
- 1
- 1.27
+ 3
+ 3.1
diff --git a/erlang.editor/nbproject/project.xml b/erlang.editor/nbproject/project.xml
--- a/erlang.editor/nbproject/project.xml
+++ b/erlang.editor/nbproject/project.xml
@@ -46,7 +46,7 @@
3
- 1.42
+ 1.53
@@ -72,8 +72,8 @@
- 1
- 1.30
+ 3
+ 3.1
diff --git a/erlang.platform/nbproject/project.xml b/erlang.platform/nbproject/project.xml
--- a/erlang.platform/nbproject/project.xml
+++ b/erlang.platform/nbproject/project.xml
@@ -46,7 +46,7 @@
3
- 1.41
+ 1.53
@@ -71,8 +71,8 @@
- 1
- 1.27
+ 3
+ 3.1
diff --git a/erlang.project/nbproject/project.xml b/erlang.project/nbproject/project.xml
--- a/erlang.project/nbproject/project.xml
+++ b/erlang.project/nbproject/project.xml
@@ -46,8 +46,8 @@
- 1
- 1.27
+ 3
+ 3.1
diff --git a/fileopenserver/nbproject/project.xml b/fileopenserver/nbproject/project.xml
--- a/fileopenserver/nbproject/project.xml
+++ b/fileopenserver/nbproject/project.xml
@@ -19,8 +19,8 @@
- 1
- 1.27
+ 3
+ 3.1
diff --git a/fisheye/nbproject/project.xml b/fisheye/nbproject/project.xml
--- a/fisheye/nbproject/project.xml
+++ b/fisheye/nbproject/project.xml
@@ -19,8 +19,8 @@
- 1
- 1.37
+ 3
+ 3.1
diff --git a/fixtabs/nbproject/project.xml b/fixtabs/nbproject/project.xml
--- a/fixtabs/nbproject/project.xml
+++ b/fixtabs/nbproject/project.xml
@@ -20,7 +20,7 @@
3
- 1.41
+ 1.53
@@ -28,8 +28,8 @@
- 1
- 1.27
+ 3
+ 3.1
diff --git a/formatmany/nbproject/project.xml b/formatmany/nbproject/project.xml
--- a/formatmany/nbproject/project.xml
+++ b/formatmany/nbproject/project.xml
@@ -15,12 +15,21 @@
+ org.netbeans.modules.editor.indent
+
+
+
+ 2
+ 1.20.0
+
+
+
org.netbeans.modules.editor.lib
- 2
- 2.1
+ 3
+ 3.1
diff --git a/formatmany/src/org/netbeans/modules/formatmany/FormatManyAction.java b/formatmany/src/org/netbeans/modules/formatmany/FormatManyAction.java
--- a/formatmany/src/org/netbeans/modules/formatmany/FormatManyAction.java
+++ b/formatmany/src/org/netbeans/modules/formatmany/FormatManyAction.java
@@ -51,6 +51,7 @@
import org.netbeans.api.project.SourceGroup;
import org.netbeans.api.project.Sources;
import org.netbeans.editor.BaseDocument;
+import org.netbeans.modules.editor.indent.api.Reformat;
import org.openide.LifecycleManager;
import org.openide.awt.StatusDisplayer;
import org.openide.cookies.EditorCookie;
@@ -182,27 +183,24 @@
StyledDocument document = ec.openDocument();
if (document instanceof BaseDocument) {
final BaseDocument doc = (BaseDocument) document;
- final org.netbeans.editor.Formatter f = doc.getFormatter();
- doc.runAtomic(new Runnable() {
+ final Reformat f = Reformat.get(doc);
+ f.lock();
+ try {
+ doc.runAtomic(new Runnable() {
+ public void run() {
+ try {
+ f.reformat(0, doc.getLength());
+ count++;
+ } catch (BadLocationException ex) {
+ Exceptions.attachMessage(ex, "Failure while formatting " + FileUtil.getFileDisplayName(fo));
+ Exceptions.printStackTrace(ex);
+ }
- public void run() {
- boolean locked = false;
- try {
- f.reformatLock();
- locked = true;
- f.reformat(doc, 0, doc.getLength());
- count++;
- } catch (BadLocationException ex) {
- Exceptions.attachMessage(ex, "Failure while formatting " + FileUtil.getFileDisplayName(fo));
- Exceptions.printStackTrace(ex);
- } finally {
- if (locked) {
- f.reformatUnlock();
- }
}
-
- }
- });
+ });
+ } finally {
+ f.unlock();
+ }
}
} catch (DataObjectNotFoundException ex) {
Exceptions.attachMessage(ex, "Failure while formatting " + FileUtil.getFileDisplayName(fo));
diff --git a/fortress.editing/nbproject/project.xml b/fortress.editing/nbproject/project.xml
--- a/fortress.editing/nbproject/project.xml
+++ b/fortress.editing/nbproject/project.xml
@@ -18,8 +18,8 @@
- 2
- 2.1
+ 3
+ 3.1
diff --git a/freemarker/nbproject/project.xml b/freemarker/nbproject/project.xml
--- a/freemarker/nbproject/project.xml
+++ b/freemarker/nbproject/project.xml
@@ -11,7 +11,7 @@
3
- 1.41
+ 1.53
@@ -19,8 +19,8 @@
- 2
- 2.9
+ 3
+ 3.1
diff --git a/gsf.tools/nbproject/project.xml b/gsf.tools/nbproject/project.xml
--- a/gsf.tools/nbproject/project.xml
+++ b/gsf.tools/nbproject/project.xml
@@ -56,7 +56,7 @@
3
- 1.41
+ 1.53
@@ -64,8 +64,8 @@
- 1
- 1.27
+ 3
+ 3.1
diff --git a/java.fscompletion/nbproject/project.xml b/java.fscompletion/nbproject/project.xml
--- a/java.fscompletion/nbproject/project.xml
+++ b/java.fscompletion/nbproject/project.xml
@@ -45,8 +45,8 @@
- 1
- 1.27
+ 3
+ 3.1
diff --git a/java.hints.scripting/nbproject/project.xml b/java.hints.scripting/nbproject/project.xml
--- a/java.hints.scripting/nbproject/project.xml
+++ b/java.hints.scripting/nbproject/project.xml
@@ -27,8 +27,8 @@
- 1
- 1.21.0.4.2
+ 3
+ 3.1
diff --git a/java.tools.navigation/nbproject/project.xml b/java.tools.navigation/nbproject/project.xml
--- a/java.tools.navigation/nbproject/project.xml
+++ b/java.tools.navigation/nbproject/project.xml
@@ -18,8 +18,8 @@
- 1
- 1.27
+ 3
+ 3.1
diff --git a/javadeclgen/nbproject/project.xml b/javadeclgen/nbproject/project.xml
--- a/javadeclgen/nbproject/project.xml
+++ b/javadeclgen/nbproject/project.xml
@@ -19,8 +19,8 @@
- 1
- 1.27
+ 3
+ 3.1
diff --git a/javahints/nbproject/project.xml b/javahints/nbproject/project.xml
--- a/javahints/nbproject/project.xml
+++ b/javahints/nbproject/project.xml
@@ -113,8 +113,8 @@
- 2
- 2.1
+ 3
+ 3.1
diff --git a/javatextcopypaste/nbproject/project.xml b/javatextcopypaste/nbproject/project.xml
--- a/javatextcopypaste/nbproject/project.xml
+++ b/javatextcopypaste/nbproject/project.xml
@@ -11,8 +11,8 @@
- 1
- 1.27
+ 3
+ 3.1
diff --git a/keybindings/nbproject/project.xml b/keybindings/nbproject/project.xml
--- a/keybindings/nbproject/project.xml
+++ b/keybindings/nbproject/project.xml
@@ -52,7 +52,7 @@
3
- 1.41
+ 1.53
@@ -60,8 +60,8 @@
- 1
- 1.27
+ 3
+ 3.1
diff --git a/languages.ejs/nbproject/project.xml b/languages.ejs/nbproject/project.xml
--- a/languages.ejs/nbproject/project.xml
+++ b/languages.ejs/nbproject/project.xml
@@ -11,7 +11,7 @@
3
- 1.41
+ 1.53
@@ -46,8 +46,8 @@
- 1
- 1.27
+ 3
+ 3.1
diff --git a/languages.powershell/nbproject/project.xml b/languages.powershell/nbproject/project.xml
--- a/languages.powershell/nbproject/project.xml
+++ b/languages.powershell/nbproject/project.xml
@@ -11,7 +11,7 @@
3
- 1.41
+ 1.53
@@ -19,8 +19,8 @@
- 1
- 1.27
+ 3
+ 3.1
diff --git a/languages.studio/nbproject/project.xml b/languages.studio/nbproject/project.xml
--- a/languages.studio/nbproject/project.xml
+++ b/languages.studio/nbproject/project.xml
@@ -20,7 +20,7 @@
3
- 1.41
+ 1.53
@@ -37,8 +37,8 @@
- 1
- 1.27
+ 3
+ 3.1
diff --git a/lexer.editorbridge.calc/nbproject/project.xml b/lexer.editorbridge.calc/nbproject/project.xml
--- a/lexer.editorbridge.calc/nbproject/project.xml
+++ b/lexer.editorbridge.calc/nbproject/project.xml
@@ -52,7 +52,7 @@
3
- 1.41
+ 1.53
@@ -69,8 +69,8 @@
- 1
- 1.27
+ 3
+ 3.1
diff --git a/linetools/nbproject/project.xml b/linetools/nbproject/project.xml
--- a/linetools/nbproject/project.xml
+++ b/linetools/nbproject/project.xml
@@ -10,8 +10,8 @@
- 1
- 1.27
+ 3
+ 3.1
diff --git a/php.devtools/nbproject/project.xml b/php.devtools/nbproject/project.xml
--- a/php.devtools/nbproject/project.xml
+++ b/php.devtools/nbproject/project.xml
@@ -20,7 +20,7 @@
3
- 1.41
+ 1.53
@@ -37,8 +37,8 @@
- 1
- 1.27
+ 3
+ 3.1
diff --git a/php.fuse/nbproject/project.xml b/php.fuse/nbproject/project.xml
--- a/php.fuse/nbproject/project.xml
+++ b/php.fuse/nbproject/project.xml
@@ -35,7 +35,7 @@
3
- 1.46
+ 1.53
@@ -52,8 +52,8 @@
- 2
- 2.2
+ 3
+ 3.1
diff --git a/php.prado/nbproject/project.xml b/php.prado/nbproject/project.xml
--- a/php.prado/nbproject/project.xml
+++ b/php.prado/nbproject/project.xml
@@ -11,7 +11,7 @@
3
- 1.41
+ 1.53
@@ -37,8 +37,8 @@
- 1
- 1.29
+ 3
+ 3.1
diff --git a/php.smarty/nbproject/project.xml b/php.smarty/nbproject/project.xml
--- a/php.smarty/nbproject/project.xml
+++ b/php.smarty/nbproject/project.xml
@@ -20,7 +20,7 @@
3
- 1.49
+ 1.53
@@ -46,8 +46,8 @@
- 2
- 2.5
+ 3
+ 3.1
diff --git a/portalpack.cms/nbproject/project.xml b/portalpack.cms/nbproject/project.xml
--- a/portalpack.cms/nbproject/project.xml
+++ b/portalpack.cms/nbproject/project.xml
@@ -54,7 +54,7 @@
3
- 1.36.0.1.4.2
+ 1.53
@@ -62,8 +62,8 @@
- 1
- 1.22.0.4.2
+ 3
+ 3.1
diff --git a/portalpack.commons.palette/nbproject/project.xml b/portalpack.commons.palette/nbproject/project.xml
--- a/portalpack.commons.palette/nbproject/project.xml
+++ b/portalpack.commons.palette/nbproject/project.xml
@@ -37,7 +37,7 @@
3
- 1.32.0.1.2
+ 1.53
@@ -45,8 +45,8 @@
- 1
- 1.12.0.1.2
+ 3
+ 3.1
diff --git a/portalpack.commons/nbproject/project.xml b/portalpack.commons/nbproject/project.xml
--- a/portalpack.commons/nbproject/project.xml
+++ b/portalpack.commons/nbproject/project.xml
@@ -45,7 +45,7 @@
3
- 1.32.0.1.2
+ 1.53
@@ -53,8 +53,8 @@
- 1
- 1.12.0.1.2
+ 3
+ 3.1
diff --git a/portalpack.saw/nbproject/project.xml b/portalpack.saw/nbproject/project.xml
--- a/portalpack.saw/nbproject/project.xml
+++ b/portalpack.saw/nbproject/project.xml
@@ -54,7 +54,7 @@
3
- 1.32.0.1.2
+ 1.53
@@ -62,8 +62,8 @@
- 1
- 1.12.0.1.2
+ 3
+ 3.1
diff --git a/portalpack.servers.base_psframework/nbproject/project.xml b/portalpack.servers.base_psframework/nbproject/project.xml
--- a/portalpack.servers.base_psframework/nbproject/project.xml
+++ b/portalpack.servers.base_psframework/nbproject/project.xml
@@ -107,8 +107,8 @@
- 1
- 1.27
+ 3
+ 3.1
diff --git a/portalpack.websynergy.palette/nbproject/project.xml b/portalpack.websynergy.palette/nbproject/project.xml
--- a/portalpack.websynergy.palette/nbproject/project.xml
+++ b/portalpack.websynergy.palette/nbproject/project.xml
@@ -54,7 +54,7 @@
3
- 1.36.0.1.4.2
+ 1.53
@@ -62,8 +62,8 @@
- 1
- 1.22.0.4.2
+ 3
+ 3.1
diff --git a/ramos.linkwitheditor/nbproject/project.xml b/ramos.linkwitheditor/nbproject/project.xml
--- a/ramos.linkwitheditor/nbproject/project.xml
+++ b/ramos.linkwitheditor/nbproject/project.xml
@@ -11,7 +11,7 @@
3
- 1.41
+ 1.53
@@ -19,8 +19,8 @@
- 1
- 1.27
+ 3
+ 3.1
diff --git a/rats.editor/nbproject/project.xml b/rats.editor/nbproject/project.xml
--- a/rats.editor/nbproject/project.xml
+++ b/rats.editor/nbproject/project.xml
@@ -38,7 +38,7 @@
3
- 1.42
+ 1.53
@@ -55,8 +55,8 @@
- 1
- 1.30
+ 3
+ 3.1
diff --git a/readonlyeditor/nbproject/project.xml b/readonlyeditor/nbproject/project.xml
--- a/readonlyeditor/nbproject/project.xml
+++ b/readonlyeditor/nbproject/project.xml
@@ -19,8 +19,8 @@
- 1
- 1.27
+ 3
+ 3.1
diff --git a/regexphighlighter/nbproject/project.xml b/regexphighlighter/nbproject/project.xml
--- a/regexphighlighter/nbproject/project.xml
+++ b/regexphighlighter/nbproject/project.xml
@@ -11,7 +11,7 @@
3
- 1.41
+ 1.53
@@ -19,8 +19,8 @@
- 1
- 1.27
+ 3
+ 3.1
diff --git a/regextester/nbproject/project.xml b/regextester/nbproject/project.xml
--- a/regextester/nbproject/project.xml
+++ b/regextester/nbproject/project.xml
@@ -20,7 +20,7 @@
3
- 1.41
+ 1.53
@@ -28,8 +28,8 @@
- 1
- 1.27
+ 3
+ 3.1
diff --git a/scala.core/nbproject/project.xml b/scala.core/nbproject/project.xml
--- a/scala.core/nbproject/project.xml
+++ b/scala.core/nbproject/project.xml
@@ -58,7 +58,7 @@
3
- 1.42
+ 1.53
@@ -66,8 +66,8 @@
- 2
- 2.1
+ 3
+ 3.1
diff --git a/scala.debugger.projects/nbproject/project.xml b/scala.debugger.projects/nbproject/project.xml
--- a/scala.debugger.projects/nbproject/project.xml
+++ b/scala.debugger.projects/nbproject/project.xml
@@ -83,8 +83,8 @@
- 2
- 2.1
+ 3
+ 3.1
diff --git a/scala.editing/nbproject/project.xml b/scala.editing/nbproject/project.xml
--- a/scala.editing/nbproject/project.xml
+++ b/scala.editing/nbproject/project.xml
@@ -73,7 +73,7 @@
3
- 1.41
+ 1.53
@@ -90,8 +90,8 @@
- 1
- 1.27
+ 3
+ 3.1
diff --git a/scala.editor/nbproject/project.xml b/scala.editor/nbproject/project.xml
--- a/scala.editor/nbproject/project.xml
+++ b/scala.editor/nbproject/project.xml
@@ -67,7 +67,7 @@
3
- 1.42
+ 1.53
@@ -102,8 +102,8 @@
- 2
- 2.1
+ 3
+ 3.1
diff --git a/scala.refactoring/nbproject/project.xml b/scala.refactoring/nbproject/project.xml
--- a/scala.refactoring/nbproject/project.xml
+++ b/scala.refactoring/nbproject/project.xml
@@ -64,7 +64,7 @@
3
- 1.42
+ 1.53
@@ -72,8 +72,8 @@
- 2
- 2.1
+ 3
+ 3.1
diff --git a/showtodos/nbproject/project.xml b/showtodos/nbproject/project.xml
--- a/showtodos/nbproject/project.xml
+++ b/showtodos/nbproject/project.xml
@@ -11,7 +11,7 @@
3
- 1.41.1.3.8.2
+ 1.53
@@ -19,8 +19,8 @@
- 2
- 2.1
+ 3
+ 3.1
diff --git a/tasklist.editor/nbproject/project.xml b/tasklist.editor/nbproject/project.xml
--- a/tasklist.editor/nbproject/project.xml
+++ b/tasklist.editor/nbproject/project.xml
@@ -52,7 +52,7 @@
3
- 1.41
+ 1.53
@@ -60,8 +60,8 @@
- 2
- 2.1
+ 3
+ 3.1
diff --git a/whichelement/nbproject/project.xml b/whichelement/nbproject/project.xml
--- a/whichelement/nbproject/project.xml
+++ b/whichelement/nbproject/project.xml
@@ -18,8 +18,8 @@
- 1
- 1.27
+ 3
+ 3.1
diff --git a/whitespacetools/nbproject/project.xml b/whitespacetools/nbproject/project.xml
--- a/whitespacetools/nbproject/project.xml
+++ b/whitespacetools/nbproject/project.xml
@@ -11,7 +11,7 @@
3
- 1.41
+ 1.53
@@ -19,8 +19,8 @@
- 1
- 1.27
+ 3
+ 3.1