mirror/Spark
3
0
Fork 0
mirror of https://github.com/igniterealtime/Spark.git synced 2025-12-01 12:27:58 +00:00
Code Issues Projects Releases Wiki Activity

SPARK-1304, after a week of using, seems to work fine

Browse Source 
patch by M.Carasel


SPARK-LANG
updated localization
checkbox.conference.tab.setting = Show conference service in tab (requires restart)


git-svn-id: http://svn.igniterealtime.org/svn/repos/spark/trunk@12413 b35dd754-fafc-0310-a699-88a17e54d16e
This commit is contained in:
Wolf Posdorfer
2011-05-23 14:52:31 +00:00
committed by wolf.posdorfer
parent 5e4a58776f
commit e5e5096b80
8 changed files with 71 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/java/org/jivesoftware/spark/PluginManager.java
View File

@ -19,6 +19,7 @@
*/
package org.jivesoftware.spark;
import java.awt.Component;
import java.awt.EventQueue;
import java.io.File;
import java.io.FileOutputStream;
@ -39,12 +40,17 @@ import java.util.jar.JarEntry;
import java.util.jar.JarFile;
import java.util.zip.ZipFile;
import javax.swing.JPanel;
import org.dom4j.Document;
import org.dom4j.DocumentException;
import org.dom4j.Element;
import org.dom4j.io.SAXReader;
import org.jivesoftware.MainWindowListener;
import org.jivesoftware.Spark;
import org.jivesoftware.resource.Res;
import org.jivesoftware.resource.SparkRes;
import org.jivesoftware.spark.component.tabbedPane.SparkTabbedPane;
import org.jivesoftware.spark.plugin.Plugin;
import org.jivesoftware.spark.plugin.PluginClassLoader;
import org.jivesoftware.spark.plugin.PluginDependency;
@ -594,6 +600,17 @@ public class PluginManager implements MainWindowListener {
long end = System.currentTimeMillis();
Log.debug("Took " + (end - start) + " ms. to load " + plugin1);
}
//We need to wait for all plugins to be initialized to determine if we need to display tabs or not
//because plugins also can add tabs (not spark only: transport or conference tab)
//When there is no tab added by plugins or spark (transport or conference tab) we will
//clean the workspace and display the contact list without tabs
SparkTabbedPane workspacePane = SparkManager.getWorkspace().getWorkspacePane();
JPanel contactListPanel = workspacePane.getContactListPanel();
int tabNumber = workspacePane.getTabCount();
if (tabNumber == 1) {
workspacePane.removeAll();
workspacePane.add(contactListPanel);
}
}
});
}