mirror of https://github.com/sipwise/jitsi.git
Integrate the second big patch for OTR. With this patch all the required GSoC functions are available.
Werner Dittmann
16 years ago
parent
d45dd664c9
commit
fc523c0794
Binary file not shown.
|
Before Width: | Height: | Size: 769 B After Width: | Height: | Size: 769 B |
|
After Width: | Height: | Size: 1.1 KiB |
|
After Width: | Height: | Size: 677 B |
|
After Width: | Height: | Size: 1.1 KiB |
|
After Width: | Height: | Size: 938 B |
|
Before Width: | Height: | Size: 739 B After Width: | Height: | Size: 739 B |
|
After Width: | Height: | Size: 1.0 KiB |
File diff suppressed because it is too large
Load Diff
@ -1,62 +0,0 @@
|
||||
package net.java.sip.communicator.impl.protocol.icq;
|
||||
|
||||
import java.util.*;
|
||||
import net.java.sip.communicator.service.protocol.*;
|
||||
|
||||
public class OperationSetInstantMessageTransformIcqImpl
|
||||
implements OperationSetInstantMessageTransform
|
||||
{
|
||||
public final Map<Integer, Vector<TransformLayer>> transformLayers =
|
||||
new Hashtable<Integer, Vector<TransformLayer>>();
|
||||
|
||||
private final int defaultPriority = 1;
|
||||
|
||||
// @Override
|
||||
public void addTransformLayer(TransformLayer transformLayer)
|
||||
{
|
||||
this.addTransformLayer(defaultPriority, transformLayer);
|
||||
}
|
||||
|
||||
// @Override
|
||||
public void addTransformLayer(int priority, TransformLayer transformLayer)
|
||||
{
|
||||
synchronized (transformLayers)
|
||||
{
|
||||
if (!transformLayers.containsKey(defaultPriority))
|
||||
transformLayers.put(defaultPriority,
|
||||
new Vector<TransformLayer>());
|
||||
|
||||
transformLayers.get(defaultPriority).add(transformLayer);
|
||||
}
|
||||
}
|
||||
|
||||
// @Override
|
||||
public boolean containsLayer(TransformLayer layer)
|
||||
{
|
||||
synchronized (transformLayers)
|
||||
{
|
||||
for (Map.Entry<Integer, Vector<TransformLayer>> entry : transformLayers
|
||||
.entrySet())
|
||||
{
|
||||
if (entry.getValue().contains(layer))
|
||||
return true;
|
||||
}
|
||||
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
// @Override
|
||||
public void removeTransformLayer(TransformLayer transformLayer)
|
||||
{
|
||||
synchronized (transformLayers)
|
||||
{
|
||||
for (Map.Entry<Integer, Vector<TransformLayer>> entry : transformLayers
|
||||
.entrySet())
|
||||
{
|
||||
entry.getValue().remove(transformLayer);
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1,62 +0,0 @@
|
||||
package net.java.sip.communicator.impl.protocol.jabber;
|
||||
|
||||
import java.util.*;
|
||||
import net.java.sip.communicator.service.protocol.*;
|
||||
|
||||
public class OperationSetInstantMessageTransformJabberImpl
|
||||
implements OperationSetInstantMessageTransform
|
||||
{
|
||||
public final Map<Integer, Vector<TransformLayer>> transformLayers =
|
||||
new Hashtable<Integer, Vector<TransformLayer>>();
|
||||
|
||||
private final int defaultPriority = 1;
|
||||
|
||||
// @Override
|
||||
public void addTransformLayer(TransformLayer transformLayer)
|
||||
{
|
||||
this.addTransformLayer(defaultPriority, transformLayer);
|
||||
}
|
||||
|
||||
// @Override
|
||||
public void addTransformLayer(int priority, TransformLayer transformLayer)
|
||||
{
|
||||
synchronized (transformLayers)
|
||||
{
|
||||
if (!transformLayers.containsKey(defaultPriority))
|
||||
transformLayers.put(defaultPriority,
|
||||
new Vector<TransformLayer>());
|
||||
|
||||
transformLayers.get(defaultPriority).add(transformLayer);
|
||||
}
|
||||
}
|
||||
|
||||
// @Override
|
||||
public boolean containsLayer(TransformLayer layer)
|
||||
{
|
||||
synchronized (transformLayers)
|
||||
{
|
||||
for (Map.Entry<Integer, Vector<TransformLayer>> entry : transformLayers
|
||||
.entrySet())
|
||||
{
|
||||
if (entry.getValue().contains(layer))
|
||||
return true;
|
||||
}
|
||||
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
// @Override
|
||||
public void removeTransformLayer(TransformLayer transformLayer)
|
||||
{
|
||||
synchronized (transformLayers)
|
||||
{
|
||||
for (Map.Entry<Integer, Vector<TransformLayer>> entry : transformLayers
|
||||
.entrySet())
|
||||
{
|
||||
entry.getValue().remove(transformLayer);
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1,62 +0,0 @@
|
||||
package net.java.sip.communicator.impl.protocol.msn;
|
||||
|
||||
import java.util.*;
|
||||
import net.java.sip.communicator.service.protocol.*;
|
||||
|
||||
public class OperationSetInstantMessageTransformMsnImpl
|
||||
implements OperationSetInstantMessageTransform
|
||||
{
|
||||
public final Map<Integer, Vector<TransformLayer>> transformLayers =
|
||||
new Hashtable<Integer, Vector<TransformLayer>>();
|
||||
|
||||
private final int defaultPriority = 1;
|
||||
|
||||
// @Override
|
||||
public void addTransformLayer(TransformLayer transformLayer)
|
||||
{
|
||||
this.addTransformLayer(defaultPriority, transformLayer);
|
||||
}
|
||||
|
||||
// @Override
|
||||
public void addTransformLayer(int priority, TransformLayer transformLayer)
|
||||
{
|
||||
synchronized (transformLayers)
|
||||
{
|
||||
if (!transformLayers.containsKey(defaultPriority))
|
||||
transformLayers.put(defaultPriority,
|
||||
new Vector<TransformLayer>());
|
||||
|
||||
transformLayers.get(defaultPriority).add(transformLayer);
|
||||
}
|
||||
}
|
||||
|
||||
// @Override
|
||||
public boolean containsLayer(TransformLayer layer)
|
||||
{
|
||||
synchronized (transformLayers)
|
||||
{
|
||||
for (Map.Entry<Integer, Vector<TransformLayer>> entry : transformLayers
|
||||
.entrySet())
|
||||
{
|
||||
if (entry.getValue().contains(layer))
|
||||
return true;
|
||||
}
|
||||
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
// @Override
|
||||
public void removeTransformLayer(TransformLayer transformLayer)
|
||||
{
|
||||
synchronized (transformLayers)
|
||||
{
|
||||
for (Map.Entry<Integer, Vector<TransformLayer>> entry : transformLayers
|
||||
.entrySet())
|
||||
{
|
||||
entry.getValue().remove(transformLayer);
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1,62 +0,0 @@
|
||||
package net.java.sip.communicator.impl.protocol.yahoo;
|
||||
|
||||
import java.util.*;
|
||||
import net.java.sip.communicator.service.protocol.*;
|
||||
|
||||
public class OperationSetInstantMessageTransformYahooImpl
|
||||
implements OperationSetInstantMessageTransform
|
||||
{
|
||||
public final Map<Integer, Vector<TransformLayer>> transformLayers =
|
||||
new Hashtable<Integer, Vector<TransformLayer>>();
|
||||
|
||||
private final int defaultPriority = 1;
|
||||
|
||||
// @Override
|
||||
public void addTransformLayer(TransformLayer transformLayer)
|
||||
{
|
||||
this.addTransformLayer(defaultPriority, transformLayer);
|
||||
}
|
||||
|
||||
// @Override
|
||||
public void addTransformLayer(int priority, TransformLayer transformLayer)
|
||||
{
|
||||
synchronized (transformLayers)
|
||||
{
|
||||
if (!transformLayers.containsKey(defaultPriority))
|
||||
transformLayers.put(defaultPriority,
|
||||
new Vector<TransformLayer>());
|
||||
|
||||
transformLayers.get(defaultPriority).add(transformLayer);
|
||||
}
|
||||
}
|
||||
|
||||
// @Override
|
||||
public boolean containsLayer(TransformLayer layer)
|
||||
{
|
||||
synchronized (transformLayers)
|
||||
{
|
||||
for (Map.Entry<Integer, Vector<TransformLayer>> entry : transformLayers
|
||||
.entrySet())
|
||||
{
|
||||
if (entry.getValue().contains(layer))
|
||||
return true;
|
||||
}
|
||||
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
// @Override
|
||||
public void removeTransformLayer(TransformLayer transformLayer)
|
||||
{
|
||||
synchronized (transformLayers)
|
||||
{
|
||||
for (Map.Entry<Integer, Vector<TransformLayer>> entry : transformLayers
|
||||
.entrySet())
|
||||
{
|
||||
entry.getValue().remove(transformLayer);
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1,93 +0,0 @@
|
||||
package net.java.sip.communicator.plugin.otr;
|
||||
|
||||
import java.awt.Component;
|
||||
import java.awt.event.*;
|
||||
|
||||
import javax.swing.*;
|
||||
|
||||
import net.java.sip.communicator.service.contactlist.*;
|
||||
import net.java.sip.communicator.service.gui.*;
|
||||
import net.java.sip.communicator.service.resources.*;
|
||||
|
||||
@SuppressWarnings("serial")
|
||||
public class OtrMenu
|
||||
extends JMenu
|
||||
implements PluginComponent, ActionListener
|
||||
{
|
||||
private static final String imageID = "plugin.otr.DECRYPTED_ICON";
|
||||
|
||||
private ResourceManagementService resourceService;
|
||||
|
||||
public OtrMenu(ResourceManagementService resourceService)
|
||||
{
|
||||
super("Encryption");
|
||||
this.setToolTipText("Options for OTR Encryption");
|
||||
|
||||
if (resourceService != null)
|
||||
this.setIcon(resourceService.getImage(imageID));
|
||||
|
||||
// TODO Internationalize Strings...
|
||||
JMenuItem mitmStartOtr = new JMenuItem("Start Private Conversation");
|
||||
JMenuItem mitmEndOtr = new JMenuItem("End Private Conversation");
|
||||
JMenuItem mitmRefreshOtr =
|
||||
new JMenuItem("Refresh Private Conversation");
|
||||
JMenuItem mitmAuthenticateBuddy = new JMenuItem("Authenticate Buddy");
|
||||
JMenuItem mitmWhatsThis = new JMenuItem("What's this?");
|
||||
|
||||
// Shown if we don't have an OTR session.
|
||||
this.add(mitmStartOtr);
|
||||
// Shown if we have an OTR session.
|
||||
this.add(mitmEndOtr);
|
||||
this.add(mitmRefreshOtr);
|
||||
this.add(mitmAuthenticateBuddy);
|
||||
this.add(mitmWhatsThis);
|
||||
}
|
||||
|
||||
// @Override
|
||||
public String getConstraints()
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
public Component getComponent()
|
||||
{
|
||||
return this;
|
||||
}
|
||||
|
||||
// @Override
|
||||
public Container getContainer()
|
||||
{
|
||||
return Container.CONTAINER_CONTACT_RIGHT_BUTTON_MENU;
|
||||
}
|
||||
|
||||
// @Override
|
||||
public int getPositionIndex()
|
||||
{
|
||||
return -1;
|
||||
}
|
||||
|
||||
// @Override
|
||||
public boolean isNativeComponent()
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
private MetaContact metaContact;
|
||||
|
||||
// @Override
|
||||
public void setCurrentContact(MetaContact metaContact)
|
||||
{
|
||||
this.metaContact = metaContact;
|
||||
}
|
||||
|
||||
// @Override
|
||||
public void setCurrentContactGroup(MetaContactGroup metaGroup)
|
||||
{
|
||||
}
|
||||
|
||||
// @Override
|
||||
public void actionPerformed(ActionEvent e)
|
||||
{
|
||||
}
|
||||
|
||||
}
|
||||
Loading…
Reference in new issue