aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorWerner Dittmann <wernerd@java.net>2010-04-09 13:11:06 +0000
committerWerner Dittmann <wernerd@java.net>2010-04-09 13:11:06 +0000
commit73cf690b0411b6b48d659c56c423bfd705751dbc (patch)
treeb316a041bf42d68ec4cd4905aa0e5877ca482fc0 /test
parentad827e67f6f897d78c43f3b4de534f97c99fed1e (diff)
downloadjitsi-73cf690b0411b6b48d659c56c423bfd705751dbc.zip
jitsi-73cf690b0411b6b48d659c56c423bfd705751dbc.tar.gz
jitsi-73cf690b0411b6b48d659c56c423bfd705751dbc.tar.bz2
Cleanup PropertyChangeEvent stuff
Use java.beans.PropertyChangeEvent instead of own implementation. This removes some classes from SC and removes ambiguities with respect to PropertyChangeEvent handling. Rename SC's own PropertyVetoException to ConfigPropertyVetoException to show the difference in usage and implementation. ConfigPropertyVetoException is a subclass of Runtime exception (intentionally) to simplify handling.
Diffstat (limited to 'test')
-rw-r--r--test/net/java/sip/communicator/slick/configuration/TestConfigurationService.java21
1 files changed, 10 insertions, 11 deletions
diff --git a/test/net/java/sip/communicator/slick/configuration/TestConfigurationService.java b/test/net/java/sip/communicator/slick/configuration/TestConfigurationService.java
index aa88af3..94b2b0e 100644
--- a/test/net/java/sip/communicator/slick/configuration/TestConfigurationService.java
+++ b/test/net/java/sip/communicator/slick/configuration/TestConfigurationService.java
@@ -7,11 +7,10 @@
package net.java.sip.communicator.slick.configuration;
import java.util.*;
+import java.beans.*;
import junit.framework.*;
import net.java.sip.communicator.service.configuration.*;
-import net.java.sip.communicator.service.configuration.event.*;
-import net.java.sip.communicator.util.*;
import org.osgi.framework.*;
@@ -299,7 +298,7 @@ public class TestConfigurationService extends TestCase
{
configurationService.setProperty(propertyName, propertyValue);
}
- catch (PropertyVetoException ex)
+ catch (ConfigPropertyVetoExceoption ex)
{
fail("A PropertyVetoException came from nowhere. Exc="
+ ex.getMessage());
@@ -324,7 +323,7 @@ public class TestConfigurationService extends TestCase
{
configurationService.setProperty(propertyName, propertyNewValue);
}
- catch (PropertyVetoException ex)
+ catch (ConfigPropertyVetoExceoption ex)
{
fail("A PropertyVetoException came from nowhere. Exc="
+ ex.getMessage());
@@ -349,7 +348,7 @@ public class TestConfigurationService extends TestCase
{
configurationService.setProperty(propertyName, propertyValue);
}
- catch (PropertyVetoException ex)
+ catch (ConfigPropertyVetoExceoption ex)
{
fail("A PropertyVetoException came from nowhere. Exc="
+ ex.getMessage());
@@ -376,7 +375,7 @@ public class TestConfigurationService extends TestCase
{
configurationService.setProperty(propertyName, propertyValue);
}
- catch (PropertyVetoException ex)
+ catch (ConfigPropertyVetoExceoption ex)
{
fail("A PropertyVetoException came from nowhere. Exc="
+ ex.getMessage());
@@ -400,7 +399,7 @@ public class TestConfigurationService extends TestCase
{
configurationService.setProperty(propertyName, propertyNewValue);
}
- catch (PropertyVetoException ex)
+ catch (ConfigPropertyVetoExceoption ex)
{
fail("A PropertyVetoException came from nowhere. Exc="
+ ex.getMessage());
@@ -426,7 +425,7 @@ public class TestConfigurationService extends TestCase
{
configurationService.setProperty(propertyName, propertyValue);
}
- catch (PropertyVetoException ex)
+ catch (ConfigPropertyVetoExceoption ex)
{
fail("A PropertyVetoException came from nowhere. Exc="
+ ex.getMessage());
@@ -446,12 +445,12 @@ public class TestConfigurationService extends TestCase
configurationService.addVetoableChangeListener(rudeVetoListener);
configurationService.addPropertyChangeListener(pListener);
- PropertyVetoException exception = null;
+ ConfigPropertyVetoExceoption exception = null;
try
{
configurationService.setProperty(propertyName, propertyValue);
}
- catch (PropertyVetoException ex)
+ catch (ConfigPropertyVetoExceoption ex)
{
exception = ex;
}
@@ -488,7 +487,7 @@ public class TestConfigurationService extends TestCase
{
configurationService.setProperty(propertyName, propertyNewValue);
}
- catch (PropertyVetoException ex1)
+ catch (ConfigPropertyVetoExceoption ex1)
{
ex1.printStackTrace();
fail("unexpected veto exception. message:" + ex1.getMessage());