Changeset 445 for gssim_ui/branches

Timestamp:

09/06/12 14:52:38 (13 years ago)

Author:

mcichenski

Message:

 

Location:

gssim_ui/branches/vine/gssimstudio/src/web/ui/flex

Files:

• app/gssim/gssimstudio/editor/views/WorkloadEditor.mxml (modified) (1 diff)
• java/gssim/gssimstudio/flex/app/editor/GSSimStudio.java (modified) (7 diffs)

gssim_ui/branches/vine/gssimstudio/src/web/ui/flex/app/gssim/gssimstudio/editor/views/WorkloadEditor.mxml

@@ -129 +129 @@
                                                         <mx:HBox>
                                                                 <mx:Label text="{resourceManager.getString('WorkloadEditor', 'WorkloadFileName')}" width="150"/>
-                                                                <mx:TextInput text="{workloadFileName}" />
+                                                                <mx:TextInput id="workloadFileNameInput" change="{workloadFileName = workloadFileNameInput.text}"/>
                                                         </mx:HBox>
                                                         <mx:HBox>
                                                                 <mx:Label text="{resourceManager.getString('WorkloadEditor', 'ResourceDescription')}"/>
-                                                                <mx:ComboBox text="{resourcesFileName}" id="resourceDescriptionFile" labelField="fileName" dataProvider="{parentApplication.experimentEditor.workspaceResourcesFileList}" width="250"/>
+                                                                <mx:ComboBox change="{resourcesFileName = resourceDescriptionFile.text}" id="resourceDescriptionFile" labelField="fileName" dataProvider="{parentApplication.experimentEditor.workspaceResourcesFileList}" width="250"/>
                                                         </mx:HBox>
                                                         <mx:HBox>

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

@@ -1947 +1947 @@
     }
         
-    public GSSimStudioModel uploadTextFile(String destFileName, String destFolder, String fileContent) throws IOException {
+    public GSSimStudioModel uploadTextFile(String destFileName, String destFolder, String fileContent, FileManager manager) throws IOException {
 
         log.debug("FILELISTCOM all files uploaded");
@@ -1965 +1965 @@
         FileResourceManager fileResourceManager = getFileResourceManager(serviceContext);
         Location resourceLocation = new Location((String) fileListComModel.getCurrentLocationItem().get("url"));
-        FileManager fileManager = fileResourceManager.createFileManager(resourceLocation);
+        FileManager fileManager = manager;
+        if (fileManager == null) fileManager = fileResourceManager.createFileManager(resourceLocation);
         fileManager.changeDirectory((String) fileListComModel.getCurrentLocationItem().get("real_path"));
 
@@ -2055 +2056 @@
         @BlazeDsMethod()
     public GSSimStudioModel uploadPropertyFile(String destFileName, String fileContent) throws IOException {
-                return uploadTextFile(destFileName, "", fileContent);
+                return uploadTextFile(destFileName, "", fileContent, null);
     }
         
         @BlazeDsMethod()
     public GSSimStudioModel uploadNetworkTopologyFile(String destFileName, String fileContent) throws IOException {
-                return uploadTextFile(destFileName, "topologies/", fileContent);
+                return uploadTextFile(destFileName, "topologies/", fileContent, null);
     }
         
         @BlazeDsMethod()
     public GSSimStudioModel uploadResourceFile(String destFileName, String fileContent) throws IOException {
-                return uploadTextFile(destFileName, "resources/", fileContent);
+                return uploadTextFile(destFileName, "resources/", fileContent, null);
     }
         
@@ -2074 +2075 @@
                 String gssimInput = null;
                 Connection connection = null;
+                FileManager fileManager = null;
                 try {
                         connection = factory().createDBConnection(dbAddress, dbUser,
@@ -2088 +2090 @@
             FileResourceManager fileResourceManager = getFileResourceManager(serviceContext);
             FileLocation parentLocation = new FileLocation(gssimInput + "?filetype=directory");
-            FileManager fileManager = fileResourceManager.createFileManager(parentLocation);
+            fileManager = fileResourceManager.createFileManager(parentLocation);
             TaskMonitor taskMonitor = fileManager.makeDirectory(uniqueFolderName, TaskOptions.block());
             if (taskMonitor.completed()) {
@@ -2114 +2116 @@
                 }
                 
-                model = uploadTextFile("generator.xml", "generator/" + uniqueFolderName, fileContent);
+                model = uploadTextFile("generator.xml", "generator/" + uniqueFolderName, fileContent, fileManager);
                 String properties = "resdesc=../../resources/" + resourceFileName + "\n";
                 properties += "createscenario.tasksdesc=generator.xml\n";
@@ -2120 +2122 @@
                 properties += "createscenario.workloadfilename=" + workloadFileName + "\n";
                 properties += "createscenario.overwrite_files=true\n";
-                model = uploadTextFile("generator.properties", "generator/" + uniqueFolderName, properties);
+                model = uploadTextFile("generator.properties", "generator/" + uniqueFolderName, properties, fileManager);
                 model.setMessageCode("GenerateWorkloadSucces");
                 return model;