Changeset 411 for gssim_ui/branches

Timestamp:

08/18/12 00:46:11 (13 years ago)

Author:

mcichenski

Message:

 

Location:

gssim_ui/branches/vine/gssimstudio/src/web/ui/flex/java/gssim/gssimstudio/flex/app/editor

Files:

• DatabaseHelper.java (modified) (1 diff)
• GSSimStudio.java (modified) (2 diffs)

gssim_ui/branches/vine/gssimstudio/src/web/ui/flex/java/gssim/gssimstudio/flex/app/editor/DatabaseHelper.java

@@ -60 +60 @@
          * Properties input data location
          */
-        protected String pInputLocation = "$INPUT";
+        protected String pInputLocation = "$input";
 }

gssim_ui/branches/vine/gssimstudio/src/web/ui/flex/java/gssim/gssimstudio/flex/app/editor/GSSimStudio.java

@@ -251 +251 @@
             copyFile(gssimInput + "/" + destFileName, destination);
             if (workload != null && !workload.isEmpty()) {
-                copyFile(gssimInput + "/workloads/" + workload, destination);
+                copyFile(fileManager, gssimInput + "/workloads/" + workload, destination);
             }
             if (resources != null && !resources.isEmpty()) {
-                copyFile(gssimInput + "/resources/" + resources, destination);
+                copyFile(fileManager, gssimInput + "/resources/" + resources, destination);
             }
             if (topology != null && !topology.isEmpty()) {
-                copyFile(gssimInput + "/topologies/" + topology, destination);
+                copyFile(fileManager, gssimInput + "/topologies/" + topology, destination);
             }
                         
@@ -297 +297 @@
         }
     
-    private void copyFile(String src, String dest) throws MalformedURLException {
-        ServiceContext serviceContext = VineFlexUtilClass.getServiceContext();
-        FileResourceManager fileResourceManager = getFileResourceManager(serviceContext);
+    private void copyFile(FileManager fileManager, String src, String dest) throws MalformedURLException {
         FileLocation sourceLocation = new FileLocation(src);
         FileLocation destinationLocation = new FileLocation(dest);
-        FileManager fileManager = fileResourceManager.createFileManager(sourceLocation);
         TaskMonitor taskMonitor = fileManager.copy(sourceLocation, destinationLocation, TaskOptions.block());
         if (taskMonitor.completed()) {