Remove SwingWorker library, it is included in Java 7

5 files changed, 1 insertions, 20 deletions

diff --git a/.classpath b/.classpath
index 605ad0c..9d0d798 100755
--- a/.classpath
+++ b/.classpath
@@ -63,7 +63,6 @@
 	<classpathentry kind="lib" path="lib/installer-exclude/sdes4j-1.1.3.jar"/>
 	<classpathentry kind="lib" path="lib/installer-exclude/smack.jar" sourcepath="lib/installer-exclude/smack-src.jar"/>
 	<classpathentry kind="lib" path="lib/installer-exclude/smackx.jar"/>
-	<classpathentry kind="lib" path="lib/installer-exclude/swing-worker-1.2.jar"/>
 	<classpathentry kind="lib" path="lib/installer-exclude/jna-platform.jar"/>
 	<classpathentry kind="lib" path="lib/installer-exclude/unix-0.5.jar"/>
 	<classpathentry kind="lib" path="lib/installer-exclude/ymsg_network_v0_67.jar"/>
diff --git a/build.xml b/build.xml
index a036c49..289f21c 100644
--- a/build.xml
+++ b/build.xml
@@ -1601,7 +1601,6 @@ javax.swing.event, javax.swing.border"/>
             manifest="${src}/net/java/sip/communicator/impl/gui/swing.ui.manifest.mf">
             <zipfileset dir="${dest}/net/java/sip/communicator/impl/gui"
                 prefix="net/java/sip/communicator/impl/gui"/>
-            <zipfileset src="${lib.noinst}/swing-worker-1.2.jar" prefix=""/>
             <zipfileset src="${lib.noinst}/mac_widgets-0.9.5.jar" prefix=""/>
             <zipfileset src="${lib.noinst}/forms-1.2.1.jar" prefix=""/>
         </jar>
diff --git a/lib/installer-exclude/swing-worker-1.2.jar b/lib/installer-exclude/swing-worker-1.2.jar
deleted file mode 100644
index 6953042..0000000
--- a/lib/installer-exclude/swing-worker-1.2.jar
+++ /dev/null
diff --git a/resources/install/debian/patches/encoding.patch b/resources/install/debian/patches/encoding.patch
deleted file mode 100644
index 09176fd..0000000
--- a/resources/install/debian/patches/encoding.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Set encoding for javadoc to fix errors with Java 7
-Author: Colin Watson <cjwatson@ubuntu.com>
-Bug-Debian: https://bugs.debian.org/759835
-Forwarded: no
-Last-Update: 2014-09-05
-
---- jitsi.orig/lib/src/swingworker/build.xml
-+++ jitsi/lib/src/swingworker/build.xml
-@@ -63,7 +63,7 @@ reserved. Use is subject to license term
-         <javadoc access="protected" link="" 
-             packagenames="org.jdesktop.swingworker" author="true" destdir="${javadoc.dir}" 
-             nodeprecated="false" nodeprecatedlist="false" noindex="false" 
--            nonavbar="false" notree="false" use="true" version="true">
-+            nonavbar="false" notree="false" use="true" version="true" encoding="iso-8859-1">
-             <link href="${external.doc}" />
-             <sourcepath>
-                 <pathelement path="${src.dir}" />
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/conference/ConferenceChatManager.java b/src/net/java/sip/communicator/impl/gui/main/chat/conference/ConferenceChatManager.java
index 079e22b..89ceb48 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chat/conference/ConferenceChatManager.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/conference/ConferenceChatManager.java
@@ -21,6 +21,7 @@ import java.util.*;
 import java.util.concurrent.*;
 
 import javax.swing.*;
+import javax.swing.SwingWorker;
 
 import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.main.chat.*;
@@ -35,7 +36,6 @@ import net.java.sip.communicator.service.protocol.globalstatus.*;
 import net.java.sip.communicator.util.*;
 import net.java.sip.communicator.util.Logger;
 
-import org.jdesktop.swingworker.SwingWorker;
 import org.jitsi.util.*;
 import org.osgi.framework.*;