Changeset 1540 for MDService2/branches/MDService_simple3/src/eu/clarin/cmdi/mdservice/model/WorkspaceProfile.java

Timestamp:

09/19/11 10:39:55 (13 years ago)

Author:

gaba

Message:

Utils.java in place of Helpers and Admin
Diagnostics changes in GenericAction?
code arrangement, comments

File:

• MDService2/branches/MDService_simple3/src/eu/clarin/cmdi/mdservice/model/WorkspaceProfile.java (modified) (7 diffs)

MDService2/branches/MDService_simple3/src/eu/clarin/cmdi/mdservice/model/WorkspaceProfile.java

@@ -11 +11 @@
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
-import eu.clarin.cmdi.mdservice.internal.Admin;
-import eu.clarin.cmdi.mdservice.action.GenericProxyAction;
-import eu.clarin.cmdi.mdservice.internal.Helpers;
 import eu.clarin.cmdi.mdservice.internal.MDTransformer;
+import eu.clarin.cmdi.mdservice.internal.Utils;
 import eu.clarin.cmdi.mdservice.action.WorkspaceAction;
 import eu.clarin.cmdi.mdservice.internal.NoStylesheetException;
@@ -220 +218 @@
 
         public static JSONArray createRepositories() throws IOException, InterruptedException, TransformerException, NoStylesheetException{
-                String path = Admin.getConfig().getProperty("workspaceprofile.path") + WorkspaceAction.WORKSPACE_FILENAME;//PROFILENAME_SERVER;
+                String path = Utils.getConfig().getProperty("workspaceprofile.path") + WorkspaceAction.WORKSPACE_FILENAME;//PROFILENAME_SERVER;
                 File file=new File(path);
                 InputStream in  = new BufferedInputStream( new FileInputStream(path));;
@@ -229 +227 @@
                 InputStream jsonstream = transformer.transformXML(in);
                 
-                JSONObject json = JSONObject.fromObject(Helpers.convertStreamToString(jsonstream));
+                JSONObject json = JSONObject.fromObject(Utils.streamToString(jsonstream));
                 JSONArray wparray = json.getJSONObject("Profiles").getJSONArray("WorkspaceProfiles");
                 JSONArray array = null;
@@ -254 +252 @@
         
         public static JSONObject createOptions() throws IOException, InterruptedException, TransformerException, NoStylesheetException{
-                String path = Admin.getConfig().getProperty("workspaceprofile.path") + WorkspaceAction.WORKSPACE_FILENAME;//PROFILENAME_SERVER;
+                String path = Utils.getConfig().getProperty("workspaceprofile.path") + WorkspaceAction.WORKSPACE_FILENAME;//PROFILENAME_SERVER;
                 File file=new File(path);
                 InputStream in  = new BufferedInputStream( new FileInputStream(path));;
@@ -263 +261 @@
                 InputStream jsonstream = transformer.transformXML(in);
                 
-                JSONObject json = JSONObject.fromObject(Helpers.convertStreamToString(jsonstream));
+                JSONObject json = JSONObject.fromObject(Utils.streamToString(jsonstream));
                 JSONArray wparray = json.getJSONObject("Profiles").getJSONArray("WorkspaceProfiles");
                 JSONObject obj = null;
@@ -306 +304 @@
         
         public static JSONArray createTermsets() throws IOException, InterruptedException, TransformerException, NoStylesheetException{
-                String path = Admin.getConfig().getProperty("workspaceprofile.path") + WorkspaceAction.WORKSPACE_FILENAME;//PROFILENAME_SERVER;
+                String path = Utils.getConfig().getProperty("workspaceprofile.path") + WorkspaceAction.WORKSPACE_FILENAME;//PROFILENAME_SERVER;
                 File file=new File(path);
                 InputStream in  = new BufferedInputStream( new FileInputStream(path));;
@@ -315 +313 @@
                 InputStream jsonstream = transformer.transformXML(in);
                 
-                JSONObject json = JSONObject.fromObject(Helpers.convertStreamToString(jsonstream));
+                JSONObject json = JSONObject.fromObject(Utils.streamToString(jsonstream));
                 JSONArray wparray = json.getJSONObject("Profiles").getJSONArray("WorkspaceProfiles");
                 JSONArray array = null;