summaryrefslogtreecommitdiff
path: root/utils/src
diff options
context:
space:
mode:
authorwbauer <wbauer@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>2009-03-13 10:58:21 (GMT)
committerwbauer <wbauer@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>2009-03-13 10:58:21 (GMT)
commit2f49ed7ea3649a51a9457b99004c8cb0ca443432 (patch)
tree79aa079428424d13bde34d9bb12fb3d4a8c12e43 /utils/src
parent2882e14d19cfa58ea382083434210aaf0cfea3e3 (diff)
downloadmocca-2f49ed7ea3649a51a9457b99004c8cb0ca443432.zip
mocca-2f49ed7ea3649a51a9457b99004c8cb0ca443432.tar.gz
mocca-2f49ed7ea3649a51a9457b99004c8cb0ca443432.tar.bz2
git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@321 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
Diffstat (limited to 'utils/src')
-rw-r--r--utils/src/main/java/at/gv/egiz/bku/local/ui/TrayIconDialog.java4
-rw-r--r--utils/src/main/java/at/gv/egiz/bku/utils/urldereferencer/URLDereferencer.java4
-rw-r--r--utils/src/test/java/at/gv/egiz/urldereferencer/FormDataTest.java16
3 files changed, 17 insertions, 7 deletions
diff --git a/utils/src/main/java/at/gv/egiz/bku/local/ui/TrayIconDialog.java b/utils/src/main/java/at/gv/egiz/bku/local/ui/TrayIconDialog.java
index c7aae21..fef113f 100644
--- a/utils/src/main/java/at/gv/egiz/bku/local/ui/TrayIconDialog.java
+++ b/utils/src/main/java/at/gv/egiz/bku/local/ui/TrayIconDialog.java
@@ -151,12 +151,12 @@ public class TrayIconDialog implements TrayIconDialogInterface {
public synchronized static TrayIconDialogInterface getInstance() {
ClassLoader cl = TrayIconDialog.class.getClassLoader();
if (instance == null) {
- if (cl.toString().startsWith("sun.")) {
+ if (cl.toString().equals(cl.getParent().toString())) {
instance = new TrayIconDialog();
return instance;
}
ClassLoader parent = cl;
- while (!parent.toString().startsWith("sun.")) {
+ while (!parent.toString().equals(cl.getParent().toString())) {
parent = parent.getParent();
}
try {
diff --git a/utils/src/main/java/at/gv/egiz/bku/utils/urldereferencer/URLDereferencer.java b/utils/src/main/java/at/gv/egiz/bku/utils/urldereferencer/URLDereferencer.java
index 8853a9c..7361ec2 100644
--- a/utils/src/main/java/at/gv/egiz/bku/utils/urldereferencer/URLDereferencer.java
+++ b/utils/src/main/java/at/gv/egiz/bku/utils/urldereferencer/URLDereferencer.java
@@ -54,7 +54,9 @@ public class URLDereferencer {
* must not be null
* @param aContext
* @throws MalformedURLException
- * if the protocol is not supported
+ * if the protocol is not supported
+ * @throws IOException if the url cannot be dereferenced (e.g. formdata not provided)
+ *
*/
public StreamData dereference(String aUrl, URLDereferencerContext aContext)
throws IOException {
diff --git a/utils/src/test/java/at/gv/egiz/urldereferencer/FormDataTest.java b/utils/src/test/java/at/gv/egiz/urldereferencer/FormDataTest.java
index 1e0ce91..ecd4c8f 100644
--- a/utils/src/test/java/at/gv/egiz/urldereferencer/FormDataTest.java
+++ b/utils/src/test/java/at/gv/egiz/urldereferencer/FormDataTest.java
@@ -77,12 +77,20 @@ public class FormDataTest implements FormDataURLSupplier {
@Test
public void testFormData() throws IOException {
paramName = "Müllcontainer";
+ testStream = new ByteArrayInputStream("HelloWorld".getBytes("UTF-8"));
String url = "formdata:"+paramName;
StreamData sd = URLDereferencer.getInstance().dereference(url, urlCtx);
- assertNull(sd);
- testStream = new ByteArrayInputStream("HelloWorld".getBytes("UTF-8"));
- sd = URLDereferencer.getInstance().dereference(url, urlCtx);
+ assertNotNull(sd);
String result = StreamUtil.asString(sd.getStream(), "UTF-8");
assertEquals("HelloWorld", result);
- }
+ }
+
+ @Test(expected=IOException.class)
+ public void testFormDataNotFound() throws IOException {
+ paramName = "Müllcontainer";
+ testStream = new ByteArrayInputStream("HelloWorld".getBytes("UTF-8"));
+ String url = "formdata:"+paramName+"2";
+ StreamData sd = URLDereferencer.getInstance().dereference(url, urlCtx);
+ }
+
}