Merge branch 'feature/issue-46'

* feature/issue-46:
  Issue #46: Update to use eclipse formatter libs from eclipse 4.4
  Update to JDK7

manifest.mf

@@ -3,4 +3,3 @@ OpenIDE-Module: de.markiewb.netbeans.plugins.eclipse.formatter
 OpenIDE-Module-Layer: de/markiewb/netbeans/plugins/eclipse/formatter/layer.xml
 OpenIDE-Module-Localizing-Bundle: de/markiewb/netbeans/plugins/eclipse/formatter/Bundle.properties
 OpenIDE-Module-Specification-Version: 1.7.1
-

nbproject/genfiles.properties

@@ -3,6 +3,6 @@ build.xml.script.CRC32=c015b071
 build.xml.stylesheet.CRC32=a56c6a5b@2.62.1
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=01759efa
+nbproject/build-impl.xml.data.CRC32=25f4cf0a
 nbproject/build-impl.xml.script.CRC32=f84eb312
 nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.67.1

nbproject/platform.properties

@@ -12,4 +12,5 @@ cluster.path=\
     ${nbplatform.active.dir}/apisupport:\
     ${nbplatform.active.dir}/webcommon:\
     ${nbplatform.active.dir}/java
-nbplatform.active=nb731
+nbjdk.active=JDK_1.7
+nbplatform.active=default

nbproject/project.properties

@@ -6,13 +6,13 @@ auxiliary.de-markiewb-netbeans-plugins-eclipse-formatter.useProjectSettings=fals
 file.reference.commons-beanutils-1.8.3.jar=release/modules/ext/commons-beanutils-1.8.3.jar
 file.reference.commons-digester3-3.2.jar=release/modules/ext/commons-digester3-3.2.jar
 file.reference.commons-logging-1.1.3.jar=release/modules/ext/commons-logging-1.1.3.jar
-file.reference.org.eclipse.core.contenttype_3.4.200.v20130326-1255.jar=release/modules/ext/org.eclipse.core.contenttype_3.4.200.v20130326-1255.jar
-file.reference.org.eclipse.core.jobs_3.5.300.v20130429-1813.jar=release/modules/ext/org.eclipse.core.jobs_3.5.300.v20130429-1813.jar
-file.reference.org.eclipse.core.resources_3.8.101.v20130717-0806.jar=release/modules/ext/org.eclipse.core.resources_3.8.101.v20130717-0806.jar
+file.reference.org.eclipse.core.contenttype_3.4.200.v20140207-1251.jar=release/modules/ext/org.eclipse.core.contenttype_3.4.200.v20140207-1251.jar
+file.reference.org.eclipse.core.jobs_3.6.0.v20140424-0053.jar=release/modules/ext/org.eclipse.core.jobs_3.6.0.v20140424-0053.jar
+file.reference.org.eclipse.core.resources_3.9.1.v20140825-1431.jar=release/modules/ext/org.eclipse.core.resources_3.9.1.v20140825-1431.jar
 file.reference.org.eclipse.core.runtime_3.9.0.v20130326-1255.jar=release/modules/ext/org.eclipse.core.runtime_3.9.0.v20130326-1255.jar
 file.reference.org.eclipse.equinox.common_3.6.200.v20130402-1505.jar=release/modules/ext/org.eclipse.equinox.common_3.6.200.v20130402-1505.jar
-file.reference.org.eclipse.equinox.preferences_3.5.100.v20130422-1538.jar=release/modules/ext/org.eclipse.equinox.preferences_3.5.100.v20130422-1538.jar
-file.reference.org.eclipse.jdt.core_3.9.1.v20130905-0837.jar=release/modules/ext/org.eclipse.jdt.core_3.9.1.v20130905-0837.jar
+file.reference.org.eclipse.equinox.preferences_3.5.200.v20140224-1527.jar=release/modules/ext/org.eclipse.equinox.preferences_3.5.200.v20140224-1527.jar
+file.reference.org.eclipse.jdt.core_3.10.0.v20140902-0626.jar=release/modules/ext/org.eclipse.jdt.core_3.10.0.v20140902-0626.jar
 file.reference.org.eclipse.text_3.5.300.v20130515-1451.jar=release/modules/ext/org.eclipse.text_3.5.300.v20130515-1451.jar
 javac.source=1.6
 javac.compilerargs=-Xlint -Xlint:-serial

nbproject/project.xml

@@ -214,28 +214,36 @@
             </test-dependencies>
             <public-packages/>
             <class-path-extension>
-                <runtime-relative-path>ext/org.eclipse.equinox.preferences_3.5.100.v20130422-1538.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/org.eclipse.equinox.preferences_3.5.100.v20130422-1538.jar</binary-origin>
+                <runtime-relative-path>ext/org.eclipse.core.jobs_3.6.0.v20140424-0053.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/org.eclipse.core.jobs_3.6.0.v20140424-0053.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/org.eclipse.text_3.5.300.v20130515-1451.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/org.eclipse.text_3.5.300.v20130515-1451.jar</binary-origin>
             </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/org.eclipse.equinox.preferences_3.5.200.v20140224-1527.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/org.eclipse.equinox.preferences_3.5.200.v20140224-1527.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/org.eclipse.core.contenttype_3.4.200.v20140207-1251.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/org.eclipse.core.contenttype_3.4.200.v20140207-1251.jar</binary-origin>
+            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/commons-digester3-3.2.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/commons-digester3-3.2.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/org.eclipse.core.resources_3.8.101.v20130717-0806.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/org.eclipse.core.resources_3.8.101.v20130717-0806.jar</binary-origin>
+                <runtime-relative-path>ext/org.eclipse.jdt.core_3.10.0.v20140902-0626.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/org.eclipse.jdt.core_3.10.0.v20140902-0626.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/commons-beanutils-1.8.3.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/commons-beanutils-1.8.3.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/org.eclipse.core.contenttype_3.4.200.v20130326-1255.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/org.eclipse.core.contenttype_3.4.200.v20130326-1255.jar</binary-origin>
+                <runtime-relative-path>ext/org.eclipse.core.resources_3.9.1.v20140825-1431.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/org.eclipse.core.resources_3.9.1.v20140825-1431.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/org.eclipse.equinox.common_3.6.200.v20130402-1505.jar</runtime-relative-path>
@@ -245,14 +253,6 @@
                 <runtime-relative-path>ext/commons-logging-1.1.3.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/commons-logging-1.1.3.jar</binary-origin>
             </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/org.eclipse.core.jobs_3.5.300.v20130429-1813.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/org.eclipse.core.jobs_3.5.300.v20130429-1813.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/org.eclipse.jdt.core_3.9.1.v20130905-0837.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/org.eclipse.jdt.core_3.9.1.v20130905-0837.jar</binary-origin>
-            </class-path-extension>
         </data>
     </configuration>
 </project>

src/de/markiewb/netbeans/plugins/eclipse/formatter/Bundle.properties

@@ -11,7 +11,7 @@ OpenIDE-Module-Long-Description=\
     Such AST-based transformations are not provided by this plugin. \
     The plugin also won't format source code with guarded sections - like the Java sources generated by the NetBeans GUI builder.\n\n\
     <h2>Licensing</h2>\n<ul>\n<li>This plugin is licensed under <a href="http://www.eclipse.org/legal/epl-v10.html">Eclipse Public License, Version 1.0</a>\n</li>\n<li>This plugin bundles several 3rd-party libraries to provide its functionality.\n\
-    <dl><dt><a href="http://www.eclipse.org/legal/epl-v10.html">Eclipse Public License, Version 1.0</a></dt><dd>org.eclipse.core.contenttype_3.4.200.v20130326-1255.jar\norg.eclipse.core.jobs_3.5.300.v20130429-1813.jar\norg.eclipse.core.resources_3.8.101.v20130717-0806.jar\norg.eclipse.core.runtime_3.9.0.v20130326-1255.jar\norg.eclipse.equinox.common_3.6.200.v20130402-1505.jar\norg.eclipse.equinox.preferences_3.5.100.v20130422-1538.jar\norg.eclipse.jdt.core_3.9.1.v20130905-0837.jar\norg.eclipse.text_3.5.300.v20130515-1451.jar</dd>\n</dl>\n<dl><dt><a href="http://www.apache.org/licenses/LICENSE-2.0.txt">Apache License, Version 2.0</a></dt><dd>commons-beanutils-1.8.3.jar\ncommons-digester3-3.2.jar\ncommons-logging-1.1.3.jar</dd>\n</dl>\n</li>\n<li>Originally forked from <a href="https://blogs.oracle.com/geertjan/entry/eclipse_formatter_for_netbeans_ide">https://blogs.oracle.com/geertjan/entry/eclipse_formatter_for_netbeans_ide</a> with allowance of Geertjan Wielenga.\
+    <dl><dt><a href="http://www.eclipse.org/legal/epl-v10.html">Eclipse Public License, Version 1.0</a></dt><dd>\norg.eclipse.core.contenttype_3.4.200.v20140207-1251.jar\norg.eclipse.core.jobs_3.6.0.v20140424-0053.jar\norg.eclipse.core.resources_3.9.1.v20140825-1431.jar\norg.eclipse.equinox.common_3.6.200.v20130402-1505.jar\norg.eclipse.equinox.preferences_3.5.200.v20140224-1527.jar\norg.eclipse.jdt.core_3.10.0.v20140902-0626.jar\norg.eclipse.text_3.5.300.v20130515-1451.jar\n</dd>\n</dl>\n<dl><dt><a href="http://www.apache.org/licenses/LICENSE-2.0.txt">Apache License, Version 2.0</a></dt><dd>commons-beanutils-1.8.3.jar\ncommons-digester3-3.2.jar\ncommons-logging-1.1.3.jar</dd>\n</dl>\n</li>\n<li>Originally forked from <a href="https://blogs.oracle.com/geertjan/entry/eclipse_formatter_for_netbeans_ide">https://blogs.oracle.com/geertjan/entry/eclipse_formatter_for_netbeans_ide</a> with allowance of Geertjan Wielenga.\
     </li>\n<li>Based on <a href="http://epochcoder.blogspot.com/2013/08/import-eclipse-formatter-into-netbeans.html">http://epochcoder.blogspot.com/2013/08/import-eclipse-formatter-into-netbeans.html</a> from Willie Scholtz.\
     </li>\n</ul>\n\n<p>\nProvide defects, request for enhancements and feedback at <a href="https://github.com/markiewb/eclipsecodeformatter_for_netbeans/issues">https://github.com/markiewb/eclipsecodeformatter_for_netbeans/issues</a>\n</p>\nCompatible to NetBeans 7.3.1+ and JDK6+.
 OpenIDE-Module-Name=Eclipse Java Code Formatter

src/de/markiewb/netbeans/plugins/eclipse/formatter/EclipseFormatter.java

@@ -21,10 +21,8 @@
 import org.eclipse.jdt.core.ToolFactory;
 import org.eclipse.jdt.core.formatter.CodeFormatter;
 import org.eclipse.jdt.core.formatter.DefaultCodeFormatterConstants;
-import org.eclipse.jface.text.BadLocationException;
 import org.eclipse.jface.text.Document;
 import org.eclipse.jface.text.IDocument;
-import org.eclipse.text.edits.MalformedTreeException;
 import org.eclipse.text.edits.TextEdit;
 import org.openide.filesystems.FileUtil;