[simplyhtml] 01/04: Imported Upstream version 0.16.16

[Felix Natter]

This is an automated email from the git hooks/post-receive script.

fnatter-guest pushed a commit to branch master
in repository simplyhtml.

commit 4e87afc9b74f67a4b74c975c979a6e5339f7f625
Author: Felix Natter <fnatter at gmx.net>
Date:   Thu Apr 14 19:56:08 2016 +0200

    Imported Upstream version 0.16.16
---
 build.gradle                                   |  5 ++---
 src/com/lightdev/app/shtm/FrmMain.java         |  2 +-
 src/com/lightdev/app/shtm/SHTMLEditorPane.java | 24 ------------------------
 3 files changed, 3 insertions(+), 28 deletions(-)

diff --git a/build.gradle b/build.gradle
index 164d825..8ca4ec0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,7 @@ apply plugin: 'eclipse'
 apply plugin: 'maven-publish'
 
 group 'com.lightdev.app.shtm.simplyhtml'
-version = '0.16.15'
+version = '0.16.16'
 
 targetCompatibility='1.7'
 sourceCompatibility='1.7'
@@ -35,8 +35,7 @@ bintray {
 
 dependencies {
 	compile 'javax.help:javahelp:2.0.05',
-			'gnu-regexp:gnu-regexp:1.1.4',
-			'org.dpolivaev.mnemonicsetter:mnemonicsetter:0.3'  
+          'org.dpolivaev.mnemonicsetter:mnemonicsetter:0.3'  
 }
 
 sourceSets {  
diff --git a/src/com/lightdev/app/shtm/FrmMain.java b/src/com/lightdev/app/shtm/FrmMain.java
index 335e542..aca5b1b 100644
--- a/src/com/lightdev/app/shtm/FrmMain.java
+++ b/src/com/lightdev/app/shtm/FrmMain.java
@@ -51,7 +51,7 @@ import javax.swing.JFrame;
  */
 class FrmMain extends JFrame {
     public static final String APP_NAME = "SimplyHTML";
-    public static final String VERSION = "0.16.15";
+    public static final String VERSION = "0.16.16";
     /** static reference to this instance of class FrmMain */
     private SHTMLPanelImpl mainPane;
 
diff --git a/src/com/lightdev/app/shtm/SHTMLEditorPane.java b/src/com/lightdev/app/shtm/SHTMLEditorPane.java
index f79a0e9..3000e0d 100644
--- a/src/com/lightdev/app/shtm/SHTMLEditorPane.java
+++ b/src/com/lightdev/app/shtm/SHTMLEditorPane.java
@@ -295,9 +295,6 @@ public class SHTMLEditorPane extends JEditorPane implements DropTargetListener,
         */
     }
 
-    private static gnu.regexp.RE pattern1 = null;
-    private static gnu.regexp.RE pattern2 = null;
-
     /* (non-Javadoc)
     * @see javax.swing.JComponent#processKeyBinding(javax.swing.KeyStroke, java.awt.event.KeyEvent, int, boolean)
     */
@@ -315,30 +312,9 @@ public class SHTMLEditorPane extends JEditorPane implements DropTargetListener,
 
     /**
        * Convenience method for setting the document text
-       * contains hack around JDK bug 4799813
-       * see http://developer.java.sun.com/developer/bugParade/bugs/4799813.html
-       * regression in 1.4.x, to be fixed in 1.5
-       * When setting the text to be "& footext", it becomes "&footext" (space disappears)
-       * same ocurrs for "</a> &amp;", it becomes "</a>&amp;" (space disappears)
-       * with the hack it now does not occur anymore.
        * @param sText the html-text of the document
        */
     public void setText(String sText) {
-        try {
-            if (System.getProperty("java.version").substring(0, 3).equals("1.4")) {
-                if (pattern1 == null) {
-                    pattern1 = new gnu.regexp.RE("(&\\w+;|&#\\d+;)(\\s| | )(?=<|&\\w+;|&#\\d+;)");
-                }
-                sText = pattern1.substituteAll(sText, "$1 $3");
-                if (pattern2 == null) {
-                    pattern2 = new gnu.regexp.RE("<(/[^>])>(\\s| | |\\n\\s+)(?! )(&\\w+;|&#\\d+;)");
-                }
-                sText = pattern2.substituteAll(sText, "<$1> $3$4");
-            }
-        }
-        catch (final gnu.regexp.REException ree) {
-            ree.printStackTrace();
-        }
         final SHTMLDocument doc = (SHTMLDocument) getDocument();
         doc.startCompoundEdit();
         if (sText == null || sText.equals("")) {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/simplyhtml.git