sipwise
/
jitsi
mirror of https://github.com/sipwise/jitsi.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Speeds up the painting of the table of plug-ins in .pluginmanager i.e. the Plug-ins ConfigurationForm by reusing the displayed ImageIcon instances instead of loading a new one on each cell paint. Though now there's a cache of a few elements retained, it shouldn't too much of a concern because it has a few elements and I plan to look into the option of not retaining ConfigurationForm UI in general anyway.

Browse Source
cusax-fix
Lyubomir Marinov 18 years ago
parent 89e81b89ec
commit 0a6567b8d3
5 changed files with 77 additions and 56 deletions
Show Stats Download Patch File Download Diff File

1
src/net/java/sip/communicator/impl/media/CallSessionImpl.java
Unescape View File

@ -23,7 +23,6 @@
import net.java.sip.communicator.impl.media.codec.*;
import net.java.sip.communicator.impl.media.keyshare.*;
import net.java.sip.communicator.impl.media.transform.*;
import net.java.sip.communicator.impl.media.transform.srtp.*;
import net.java.sip.communicator.impl.media.transform.zrtp.*;
import net.java.sip.communicator.service.media.*;
import net.java.sip.communicator.service.media.MediaException;

107
src/net/java/sip/communicator/plugin/pluginmanager/PluginListCellRenderer.java
Unescape View File

@ -4,14 +4,16 @@
* Distributable under LGPL license.
* See terms of license at gnu.org.
*/
package net.java.sip.communicator.plugin.pluginmanager;
import java.awt.*;
import java.util.*;
import javax.swing.*;
import javax.swing.table.*;
import net.java.sip.communicator.util.swing.*;
import org.osgi.framework.*;
/**
@ -22,7 +24,8 @@
*
* @author Yana Stamcheva
*/
public class PluginListCellRenderer extends JPanel
public class PluginListCellRenderer
extends JPanel
implements TableCellRenderer
{
/**
@ -37,8 +40,6 @@ public class PluginListCellRenderer extends JPanel
private static final Color SELECTED_END_COLOR
= new Color(Resources.getColor("service.gui.GRADIENT_LIGHT_COLOR"));
private JPanel mainPanel = new JPanel(new BorderLayout());
private JPanel nameVersionPanel = new JPanel(new FlowLayout(FlowLayout.LEFT));
private JLabel nameLabel = new JLabel();
@ -56,7 +57,14 @@ public class PluginListCellRenderer extends JPanel
private boolean isSelected = false;
private String direction;
/**
* The cache of the <code>ImageIcon</code> values returned by
* {@link #getStateIcon(int)} because the method in question is called
* whenever a table cell is painted and reading the image data out of a file
* and loading it into a new <code>ImageIcon</code> at such a time
* noticeably affects execution the speed.
*/
private final ImageIcon[] stateIconCache = new ImageIcon[5];
/**
* Initialize the panel containing the node.
@ -65,13 +73,15 @@ public PluginListCellRenderer()
{
super(new BorderLayout(8, 8));
JPanel mainPanel = new JPanel(new BorderLayout());
this.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
this.setBackground(Color.WHITE);
this.setOpaque(true);
this.mainPanel.setOpaque(false);
mainPanel.setOpaque(false);
this.nameVersionPanel.setOpaque(false);
this.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
@ -84,8 +94,8 @@ public PluginListCellRenderer()
this.nameVersionPanel.add(nameLabel);
this.nameVersionPanel.add(versionLabel);
this.mainPanel.add(nameVersionPanel, BorderLayout.NORTH);
this.mainPanel.add(descriptionLabel, BorderLayout.CENTER);
mainPanel.add(nameVersionPanel, BorderLayout.NORTH);
mainPanel.add(descriptionLabel, BorderLayout.CENTER);
this.add(iconLabel, BorderLayout.WEST);
@ -104,14 +114,11 @@ public Component getTableCellRendererComponent(JTable table, Object value,
{
Bundle bundle = (Bundle) value;
Object bundleName
= bundle.getHeaders().get(Constants.BUNDLE_NAME);
Object bundleVersion
= bundle.getHeaders().get(Constants.BUNDLE_VERSION);
Object bundleDescription
= bundle.getHeaders().get(Constants.BUNDLE_DESCRIPTION);
Dictionary headers = bundle.getHeaders();
Object bundleName = headers.get(Constants.BUNDLE_NAME);
Object bundleVersion = headers.get(Constants.BUNDLE_VERSION);
Object bundleDescription = headers.get(Constants.BUNDLE_DESCRIPTION);
Object bundleIconPath = bundle.getHeaders().get("Bundle-Icon-Path");
Icon stateIcon = getStateIcon(bundle.getState());
if(bundleName != null)
@ -144,25 +151,38 @@ public Component getTableCellRendererComponent(JTable table, Object value,
private ImageIcon getStateIcon(int state)
{
int cacheIndex;
String imageID;
switch (state)
{
case Bundle.INSTALLED:
return Resources.getResources()
.getImage("plugin.pluginmanager.INSTALLED_STATE");
cacheIndex = 0;
imageID = "plugin.pluginmanager.INSTALLED_STATE";
break;
case Bundle.RESOLVED:
return Resources.getResources()
.getImage("plugin.pluginmanager.DEACTIVATED_STATE");
cacheIndex = 1;
imageID = "plugin.pluginmanager.DEACTIVATED_STATE";
break;
case Bundle.STARTING:
return Resources.getResources()
.getImage("plugin.pluginmanager.STARTING_STATE");
case Bundle.ACTIVE:
return Resources.getResources()
.getImage("plugin.pluginmanager.ACTIVATE_STATE");
cacheIndex = 2;
imageID = "plugin.pluginmanager.STARTING_STATE";
break;
case Bundle.STOPPING:
return Resources.getResources()
.getImage("plugin.pluginmanager.STOPPING_STATE");
cacheIndex = 3;
imageID = "plugin.pluginmanager.STOPPING_STATE";
break;
case Bundle.ACTIVE:
cacheIndex = 4;
imageID = "plugin.pluginmanager.ACTIVATE_STATE";
break;
default:
return null;
}
return null;
ImageIcon stateIcon = stateIconCache[cacheIndex];
if (stateIcon == null)
stateIconCache[cacheIndex] =
stateIcon = Resources.getResources().getImage(imageID);
return stateIcon;
}
/**
@ -172,25 +192,36 @@ private ImageIcon getStateIcon(int state)
public void paintComponent(Graphics g) {
super.paintComponent(g);
Graphics2D g2 = (Graphics2D) g;
g = g.create();
try
{
internalPaintComponent(g);
}
finally
{
g.dispose();
}
}
private void internalPaintComponent(Graphics g)
{
AntialiasingManager.activateAntialiasing(g);
g2.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
RenderingHints.VALUE_ANTIALIAS_ON);
Graphics2D g2 = (Graphics2D) g;
int width = getWidth();
int height = getHeight();
if (this.isSelected)
{
GradientPaint p = new GradientPaint(this.getWidth()/2, 0,
SELECTED_START_COLOR,
this.getWidth()/2,
this.getHeight(),
SELECTED_END_COLOR);
GradientPaint p =
new GradientPaint(width / 2, 0, SELECTED_START_COLOR,
width / 2, height, SELECTED_END_COLOR);
g2.setPaint(p);
g2.fillRoundRect(1, 1, this.getWidth(), this.getHeight() - 1, 7, 7);
g2.fillRoundRect(1, 1, width, height - 1, 7, 7);
}
g2.setColor(SELECTED_START_COLOR);
g2.drawLine(0, this.getHeight() - 1,
this.getWidth(), this.getHeight() - 1);
g2.drawLine(0, height - 1, width, height - 1);
}
}

6
src/net/java/sip/communicator/plugin/pluginmanager/PluginManagerActivator.java
Unescape View File

@ -3,7 +3,6 @@
*
* Distributable under LGPL license. See terms of license at gnu.org.
*/
package net.java.sip.communicator.plugin.pluginmanager;
import net.java.sip.communicator.service.configuration.*;
@ -111,9 +110,6 @@ public static boolean isSystemBundle(Bundle bundle)
Object sysBundleProp = bundle.getHeaders().get("System-Bundle");
//ignore if this is a system bundle
if(sysBundleProp != null && sysBundleProp.equals("yes"))
return true;
return false;
return (sysBundleProp != null && sysBundleProp.equals("yes"));
}
}

18
src/net/java/sip/communicator/plugin/pluginmanager/PluginTableModel.java
Unescape View File

@ -14,20 +14,21 @@
/**
* The <tt>TableModel</tt> of the table containing all plug-ins.
*
*
* @author Yana Stamcheva
*/
public class PluginTableModel extends AbstractTableModel
public class PluginTableModel
extends AbstractTableModel
{
private BundleContext bundleContext = PluginManagerActivator.bundleContext;
private boolean showSystemBundles;
private Object showSystemBundlesSync = new Object();
private final Object showSystemBundlesSync = new Object();
private Bundle[] bundles = null;
private BundleComparator bundleComparator = new BundleComparator();
private final BundleComparator bundleComparator = new BundleComparator();
/**
* Create an instance of <tt>PluginTableModel</tt>
@ -37,7 +38,6 @@ public PluginTableModel()
refreshSortedBundlesList();
}
/**
* Returns the count of table rows.
* @return int the count of table rows
@ -93,12 +93,8 @@ public boolean contains(Bundle bundle)
if(b.equals(bundle))
{
if(showSystem)
return true;
else
{
return (!PluginManagerActivator.isSystemBundle(bundle));
}
return showSystem
|| !PluginManagerActivator.isSystemBundle(bundle);
}
}

1
src/net/java/sip/communicator/plugin/yahooaccregwizz/FirstWizardPage.java
Unescape View File

@ -6,7 +6,6 @@
package net.java.sip.communicator.plugin.yahooaccregwizz;
import java.awt.*;
import java.util.*;
import javax.swing.*;
import javax.swing.event.*;

Write Preview
Loading…
Cancel
Save