Schema and resource

1 files changed, 9 insertions, 30 deletions

diff --git a/source/com/c2kernel/utils/Resource.java b/source/com/c2kernel/utils/Resource.java
index 361549d..ba2f71a 100644
--- a/source/com/c2kernel/utils/Resource.java
+++ b/source/com/c2kernel/utils/Resource.java
@@ -3,6 +3,7 @@ package com.c2kernel.utils;
 //Java

 import java.net.MalformedURLException;

 import java.net.URL;

+import java.util.ArrayList;

 import java.util.Hashtable;

 

 import javax.swing.ImageIcon;

@@ -17,13 +18,9 @@ import com.c2kernel.common.ObjectNotFoundException;
 public class Resource {

     static private Hashtable<String, String> txtCache = new Hashtable<String, String>();

     static private Hashtable<String, ImageIcon> imgCache = new Hashtable<String, ImageIcon>();

-    static private URL baseURL = null;

-    static private URL domainBaseURL = null;

-    static private URL importURL = null;

+    static private URL baseURL = getURLorResURL("com/c2kernel/utils/resources/");

+    static private ArrayList<URL> domainBaseURL = new ArrayList<URL>();

     static public ImageIcon nullImg = new ImageIcon(new byte[] { 0 });

-    static {

-        setKernelBaseURL("com/c2kernel/utils/resources/");

-    }

 

     /*

      * Kernel Resource URL section

@@ -32,10 +29,6 @@ public class Resource {
         baseURL = getURLorResURL(newBaseURL);

     }

 

-    public static void setKernelBaseURL(URL newBaseURL) {

-        baseURL = newBaseURL;

-    }

-

     public static URL getKernelBaseURL() {

         return baseURL;

     }

@@ -43,19 +36,20 @@ public class Resource {
     static public URL getKernelResourceURL(String resName) throws MalformedURLException {

         return new URL(baseURL, resName);

     }

+    

     /*

      * Domain Resource URL section

      */

 

-    public static void setDomainBaseURL(URL newBaseURL) {

-        domainBaseURL = newBaseURL;

+    public static void addDomainBaseURL(URL newBaseURL) {

+        domainBaseURL.add(newBaseURL);

     }

 

-    public static void setDomainBaseURL(String newBaseURL) {

-        domainBaseURL = getURLorResURL(newBaseURL);

+    public static void addDomainBaseURL(String newBaseURL) {

+    	addDomainBaseURL(getURLorResURL(newBaseURL));

     }

 

-    public static URL getDomainBaseURL() {

+    public static ArrayList<URL> getDomainBaseURL() {

         return domainBaseURL;

     }

 

@@ -153,21 +147,6 @@ public class Resource {
             return newImg;

     }

 

-

-    /**

-     * Retrieves the stored import URL

-     * @return

-     */

-    public static URL getImportURL() {

-        return importURL;

-    }

-

-    /**

-     * @param url

-     */

-    public static void setImportURL(URL url) {

-        importURL = url;

-    }

     static public String getDomainVersion() {

 		try {

 			return FileStringUtility.url2String(getDomainResourceURL("version.txt"));