Changeset 1039 for DCWoRMS/branches/coolemall/src/simulator

Timestamp:

03/28/13 15:41:15 (12 years ago)

Author:

wojtekp

Message:

 

File:

• DCWoRMS/branches/coolemall/src/simulator/reader/ResourceReader.java (modified) (2 diffs)

DCWoRMS/branches/coolemall/src/simulator/reader/ResourceReader.java

@@ -50 +50 @@
 public class ResourceReader {
         
+        private static String COOLEMALL_RESDESC_PREFIX = "dcworms";
         protected String resDescFileName;
 
@@ -72 +73 @@
 
                 File file = new File(resDescFileName);
-                Environment env = Environment.unmarshal(new FileReader(file));
+                
+                Environment env;
+                try{
+                        env = Environment.unmarshal(new FileReader(file));
+                } catch (Exception e){  
+                        File dcwormsFile = new File(file.getParent() + "/" + COOLEMALL_RESDESC_PREFIX + "_" + file.getName());
+                        env = Environment.unmarshal(new FileReader(dcwormsFile));
+                }
                 
                 System.out.println("started creating environment description");