diff --git a/src/java/org/jivesoftware/LoginSettingDialog.java b/src/java/org/jivesoftware/LoginSettingDialog.java
index c7c36cba..b14a6312 100644
--- a/src/java/org/jivesoftware/LoginSettingDialog.java
+++ b/src/java/org/jivesoftware/LoginSettingDialog.java
@@ -473,21 +473,21 @@ public class LoginSettingDialog implements PropertyChangeListener {
if(Default.getString("PROXY_PROTOCOL").length()>0)
{
protocolBox.setSelectedItem(Default.getString("PROXY_PROTOCOL"));
- protocolBox.disable();
+ protocolBox.setEnabled(false);
useProxyBox.setSelected(true);
useProxyBox.setVisible(false);
}
if(Default.getString("PROXY_HOST").length()>0)
{
hostField.setText(Default.getString("PROXY_HOST"));
- hostField.disable();
+ hostField.setEnabled(false);
useProxyBox.setSelected(true);
useProxyBox.setVisible(false);
}
if(Default.getString("PROXY_PORT").length()>0)
{
portField.setText(Default.getString("PROXY_PORT"));
- portField.disable();
+ portField.setEnabled(false);
}
}
diff --git a/src/java/org/jivesoftware/spark/plugin/PluginClassLoader.java b/src/java/org/jivesoftware/spark/plugin/PluginClassLoader.java
index e42f6ec6..4a79345b 100644
--- a/src/java/org/jivesoftware/spark/plugin/PluginClassLoader.java
+++ b/src/java/org/jivesoftware/spark/plugin/PluginClassLoader.java
@@ -90,7 +90,7 @@ public class PluginClassLoader extends URLClassLoader {
for (File jar : jars) {
if (jar.isFile()) {
- final URL url = jar.toURL();
+ final URL url = jar.toURI().toURL();
addURL(url);
try {
checkForSmackProviders(url);
diff --git a/src/java/org/jivesoftware/spark/ui/ContactGroupListener.java b/src/java/org/jivesoftware/spark/ui/ContactGroupListener.java
index 3036d9f6..4c28bcfe 100644
--- a/src/java/org/jivesoftware/spark/ui/ContactGroupListener.java
+++ b/src/java/org/jivesoftware/spark/ui/ContactGroupListener.java
@@ -22,6 +22,8 @@ package org.jivesoftware.spark.ui;
import java.awt.event.MouseEvent;
import java.util.Collection;
+import org.jivesoftware.spark.plugin.ContextMenuListener;
+
/**
* The ContactGroupListener interface is one of the interfaces extension writers use to add functionality to Spark.
*
@@ -63,7 +65,7 @@ public interface ContactGroupListener {
*
* @param e the MouseEvent that triggered the event.
* @param item the ContactItem clicked within the ContactGroup.
- * @deprecated see ContextMenuListener
+ * @deprecated see {@link ContextMenuListener}
*/
public void showPopup(MouseEvent e, ContactItem item);
diff --git a/src/java/org/jivesoftware/sparkimpl/plugin/layout/LayoutSettingsManager.java b/src/java/org/jivesoftware/sparkimpl/plugin/layout/LayoutSettingsManager.java
index 29a1f4f5..1db26972 100644
--- a/src/java/org/jivesoftware/sparkimpl/plugin/layout/LayoutSettingsManager.java
+++ b/src/java/org/jivesoftware/sparkimpl/plugin/layout/LayoutSettingsManager.java
@@ -242,5 +242,39 @@ public class LayoutSettingsManager {
return false;
}
+
+ /**
+ * converts a Rectangle to a String
+ * @param r
+ * @return
+ */
+ public static String rectangleToString(Rectangle r) {
+ return r.x + "," + r.y + "," + r.width + "," + r.height;
+ }
+
+ /**
+ * converts a String to a Rectangle
+ * @param s
+ * @return
+ */
+ public static Rectangle stringToRectangle(String s) {
+
+ if(s == null)
+ {
+ return new Rectangle(0,0,0,0);
+ }
+
+ if (!s.matches("[0-9]*,[0-9]*,[0-9]*,[0-9]*")) {
+ return new Rectangle(0,0,0,0);
+ } else {
+ String[] arr = s.split(",");
+
+
+ return new Rectangle(Integer.parseInt(arr[0]),
+ Integer.parseInt(arr[1]), Integer.parseInt(arr[2]),
+ Integer.parseInt(arr[3]));
+ }
+
+ }
}
diff --git a/src/plugins/sip/src/java/net/java/sipmack/sip/CallProcessing.java b/src/plugins/sip/src/java/net/java/sipmack/sip/CallProcessing.java
index 0c471c70..b7024373 100644
--- a/src/plugins/sip/src/java/net/java/sipmack/sip/CallProcessing.java
+++ b/src/plugins/sip/src/java/net/java/sipmack/sip/CallProcessing.java
@@ -671,7 +671,7 @@ public class CallProcessing {
// CSeq
CSeqHeader cSeqHeader;
try {
- cSeqHeader = sipManCallback.headerFactory.createCSeqHeader(1,
+ cSeqHeader = sipManCallback.headerFactory.createCSeqHeader(1L,
Request.INVITE);
}
catch (ParseException ex) {
diff --git a/src/plugins/sip/src/java/net/java/sipmack/sip/SipManager.java b/src/plugins/sip/src/java/net/java/sipmack/sip/SipManager.java
index a8837d7c..f9959559 100644
--- a/src/plugins/sip/src/java/net/java/sipmack/sip/SipManager.java
+++ b/src/plugins/sip/src/java/net/java/sipmack/sip/SipManager.java
@@ -1005,7 +1005,7 @@ public class SipManager implements SipListener {
*/
public ArrayList getLocalViaHeaders() throws CommunicationsException {
- ListeningPoint lp = sipProvider.getListeningPoint();
+ ListeningPoint lp = sipProvider.getListeningPoints()[0];
viaHeaders = new ArrayList();
try {
diff --git a/src/plugins/sip/src/java/net/java/sipmack/sip/TransferProcessing.java b/src/plugins/sip/src/java/net/java/sipmack/sip/TransferProcessing.java
index fbf0fca0..e10bad79 100644
--- a/src/plugins/sip/src/java/net/java/sipmack/sip/TransferProcessing.java
+++ b/src/plugins/sip/src/java/net/java/sipmack/sip/TransferProcessing.java
@@ -70,7 +70,7 @@ public class TransferProcessing {
Log.error("hold", e);
}
- int cseq = ((CSeq) (refer.getHeader(CSeq.NAME)))
+ long cseq = ((CSeq) (refer.getHeader(CSeq.NAME)))
.getSequenceNumber() + 1;
refer.removeHeader(CSeq.NAME);
try {
diff --git a/src/plugins/sip/src/java/net/java/sipmack/sip/simple/MessageProcessing.java b/src/plugins/sip/src/java/net/java/sipmack/sip/simple/MessageProcessing.java
index ef75c012..be2f31de 100644
--- a/src/plugins/sip/src/java/net/java/sipmack/sip/simple/MessageProcessing.java
+++ b/src/plugins/sip/src/java/net/java/sipmack/sip/simple/MessageProcessing.java
@@ -173,7 +173,7 @@ public class MessageProcessing {
// CSeq
CSeqHeader cSeqHeader;
try {
- cSeqHeader = sipManCallback.headerFactory.createCSeqHeader(1,
+ cSeqHeader = sipManCallback.headerFactory.createCSeqHeader(1L,
Request.MESSAGE);
}
catch (Exception ex) {
@@ -361,7 +361,7 @@ public class MessageProcessing {
// CSeq
CSeqHeader cSeqHeader;
try {
- cSeqHeader = sipManCallback.headerFactory.createCSeqHeader(1,
+ cSeqHeader = sipManCallback.headerFactory.createCSeqHeader(1L,
Request.MESSAGE);
}
catch (Exception ex) {
diff --git a/src/plugins/sip/src/java/org/jivesoftware/sparkplugin/calllog/LogManagerImpl.java b/src/plugins/sip/src/java/org/jivesoftware/sparkplugin/calllog/LogManagerImpl.java
index 33b7bfae..c59619ff 100755
--- a/src/plugins/sip/src/java/org/jivesoftware/sparkplugin/calllog/LogManagerImpl.java
+++ b/src/plugins/sip/src/java/org/jivesoftware/sparkplugin/calllog/LogManagerImpl.java
@@ -27,6 +27,7 @@ import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.OutputStreamWriter;
+import java.text.DateFormat;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Date;
@@ -137,8 +138,8 @@ public class LogManagerImpl implements SoftPhoneListener, LogManager {
e.setValue("numB", numB);
e.setValue("duration", String
.valueOf(call.getElapsedTime()));
- e.setValue("datetime", new Date().toGMTString());
+ e.setValue("datetime",DateFormat.getInstance().format(new Date()));
e.setValue("type", type.name());
LogPacket.logEvent(SparkManager.getConnection(), e);
diff --git a/src/plugins/sip/src/java/org/jivesoftware/sparkplugin/ui/components/RoundLabel.java b/src/plugins/sip/src/java/org/jivesoftware/sparkplugin/ui/components/RoundLabel.java
index 05c53e0c..7aa177b0 100644
--- a/src/plugins/sip/src/java/org/jivesoftware/sparkplugin/ui/components/RoundLabel.java
+++ b/src/plugins/sip/src/java/org/jivesoftware/sparkplugin/ui/components/RoundLabel.java
@@ -161,7 +161,7 @@ public class RoundLabel extends JPanel {
vFrame.add(label, new GridBagConstraints(0, 1, 1, 1, 1.0, 0.0, GridBagConstraints.WEST, GridBagConstraints.HORIZONTAL, new Insets(5, 5, 5, 5), 0, 10));
vFrame.setTitle("Aqua Button");
- vFrame.show();
+ vFrame.setVisible(true);
}
}