Updating Spark for JNIWrapper support.

git-svn-id: http://svn.igniterealtime.org/svn/repos/spark/trunk@6461 b35dd754-fafc-0310-a699-88a17e54d16e

src/java/org/jivesoftware/Spark.java

@@ -10,25 +10,24 @@
 
 package org.jivesoftware;
 
-import de.javasoft.plaf.synthetica.SyntheticaStandardLookAndFeel;
 import org.jivesoftware.resource.Default;
 import org.jivesoftware.resource.SparkRes;
 import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smackx.debugger.EnhancedDebuggerWindow;
 import org.jivesoftware.spark.util.log.Log;
 
-import javax.swing.BorderFactory;
-import javax.swing.JFrame;
-import javax.swing.JOptionPane;
-import javax.swing.SwingUtilities;
-import javax.swing.UIManager;
-
 import java.awt.Color;
 import java.awt.Font;
 import java.awt.Insets;
 import java.io.File;
 import java.io.IOException;
 
+import javax.swing.BorderFactory;
+import javax.swing.JFrame;
+import javax.swing.JOptionPane;
+import javax.swing.SwingUtilities;
+import javax.swing.UIManager;
+
 /**
  * In many cases, you will need to know the structure of the Spark installation, such as the directory structures, what
  * type of system Spark is running on, and also the arguments which were passed into Spark on startup. The <code>Spark</code>
@@ -114,13 +113,7 @@ public final class Spark {
             String classname = UIManager.getSystemLookAndFeelClassName();
 
             if (classname.indexOf("Windows") != -1) {
-
-                JFrame.setDefaultLookAndFeelDecorated(true);
-
-                // finally set the Skin Look And Feel
                 UIManager.setLookAndFeel(new com.jgoodies.looks.windows.WindowsLookAndFeel());
-                UIManager.setLookAndFeel(new SyntheticaStandardLookAndFeel());
-
 
             }
             else if (classname.indexOf("mac") != -1 || classname.indexOf("apple") != -1) {

src/java/org/jivesoftware/spark/SessionManager.java

@@ -46,7 +46,7 @@ public final class SessionManager implements ConnectionListener {
 
     private String JID;
 
-    private List presenceListeners = new ArrayList();
+    private List<PresenceListener> presenceListeners = new ArrayList<PresenceListener>();
 
     private String userBareAddress;
     private DiscoverItems discoverItems;

src/java/org/jivesoftware/spark/ui/themes/ThemeManager.java

@@ -16,8 +16,8 @@ import org.jdesktop.jdic.browser.IBrowserEngine;
 import org.jivesoftware.Spark;
 import org.jivesoftware.spark.SparkManager;
 import org.jivesoftware.spark.util.StringUtils;
-import org.jivesoftware.spark.util.URLFileSystem;
 import org.jivesoftware.spark.util.SwingWorker;
+import org.jivesoftware.spark.util.URLFileSystem;
 import org.jivesoftware.spark.util.log.Log;
 import org.jivesoftware.sparkimpl.plugin.emoticons.EmoticonManager;
 import org.jivesoftware.sparkimpl.settings.local.LocalPreferences;
@@ -114,7 +114,12 @@ public class ThemeManager {
 
         // File mozilla = new File(Spark.getBinDirectory(), "mozilla");
         // be.setEnginePath(mozilla.getAbsolutePath());
-        THEMES_DIRECTORY = new File(Spark.getBinDirectory().getParent(), "xtra/themes").getAbsoluteFile();
+        try {
+            THEMES_DIRECTORY = new File(Spark.getBinDirectory().getParent(), "xtra/themes").getCanonicalFile();
+        }
+        catch (IOException e) {
+            Log.error(e);
+        }
 
         // For Testing
         //THEMES_DIRECTORY = new File("c:\\xtra\\themes");
@@ -152,8 +157,8 @@ public class ThemeManager {
         SparkManager.getPreferenceManager().addPreference(new ThemePreference());
 
 
-        SwingWorker worker = new SwingWorker(){
+        SwingWorker worker = new SwingWorker() {
-            public Object construct(){
+            public Object construct() {
                 return BrowserFactory.spawnMozilla();
             }
         };

src/java/org/jivesoftware/spark/util/SwingWorker.java

@@ -73,9 +73,6 @@ public abstract class SwingWorker {
      * after the <code>construct</code> method has returned.
      */
     public void finished() {
-        if (invokable != null) {
-            invokable.invoke(null);
-        }
     }
 
     /**

src/resources/jniwrap.lic

@@ -0,0 +1,11 @@
+Thu Oct 19 14:56:36 EEST 2006
+
+Jive Software
+NEVER
+Runtime
+Not for development
+win32/x86
+5lwtbvc0j4copm5e2qnjhgfv33h0nqbesyx4lfr2479w4lp4j2grqi4378utxg8t1h5rjgboe1fwxmx0
+55yhidf684qsae1pqf8pphen1gqnspw0mrygd2z10589rng339noyvxigs6e98jwql3kl59v8xr0h3en
+Version: 3.x
+Product: JNIWrapper