Removed redundant Files.exists/isDirectory checks

[simantics/platform.git] / bundles / org.simantics.fileimport / src / org / simantics / fileimport / Activator.java

diff --git a/bundles/org.simantics.fileimport/src/org/simantics/fileimport/Activator.java b/bundles/org.simantics.fileimport/src/org/simantics/fileimport/Activator.java
index 605e50347babec4e4fd0c29fd6a0344b0c7c9613..391f7ed912a07579ffba1603441e56946d73589a 100644 (file)
--- a/bundles/org.simantics.fileimport/src/org/simantics/fileimport/Activator.java
+++ b/bundles/org.simantics.fileimport/src/org/simantics/fileimport/Activator.java
@@ -1,52 +1,60 @@
-package org.simantics.fileimport;\r
-\r
-import java.io.IOException;\r
-import java.nio.file.Files;\r
-import java.nio.file.Path;\r
-import java.nio.file.Paths;\r
-\r
-import org.eclipse.core.runtime.IPath;\r
-import org.eclipse.core.runtime.Platform;\r
-import org.osgi.framework.BundleActivator;\r
-import org.osgi.framework.BundleContext;\r
-import org.simantics.fileimport.dropins.FileImportDropins;\r
-\r
-public class Activator implements BundleActivator {\r
-\r
-       private static BundleContext context;\r
-       \r
-       private static Path dropinsFolder = null;\r
-\r
-       static BundleContext getContext() {\r
-               return context;\r
-       }\r
-\r
-       /*\r
-        * (non-Javadoc)\r
-        * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)\r
-        */\r
-       public void start(BundleContext bundleContext) throws Exception {\r
-               Activator.context = bundleContext;\r
-               FileImportDropins.watchDropinsFolder();\r
-       }\r
-\r
-       /*\r
-        * (non-Javadoc)\r
-        * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)\r
-        */\r
-       public void stop(BundleContext bundleContext) throws Exception {\r
-               Activator.context = null;\r
-               FileImportDropins.unwatchDropinsFolder();\r
-       }\r
-       \r
-       public static Path getDropinsFolder() throws IOException {\r
-           if (dropinsFolder == null) {\r
-               IPath state = Platform.getStateLocation(context.getBundle());\r
-               dropinsFolder = Paths.get(state.append("dropins").toOSString());\r
-               if (!Files.exists(dropinsFolder))\r
-                   Files.createDirectories(dropinsFolder);\r
-           }\r
-           return dropinsFolder;\r
-       }\r
-\r
-}\r
+package org.simantics.fileimport;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.Platform;
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+import org.simantics.fileimport.dropins.FileImportDropins;
+
+public class Activator implements BundleActivator {
+
+    private static BundleContext context;
+       
+    private static Path modelsFolder = null;
+       private static Path dropinsFolder = null;
+
+       static BundleContext getContext() {
+               return context;
+       }
+
+       /*
+        * (non-Javadoc)
+        * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)
+        */
+       public void start(BundleContext bundleContext) throws Exception {
+               Activator.context = bundleContext;
+       }
+
+       /*
+        * (non-Javadoc)
+        * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
+        */
+       public void stop(BundleContext bundleContext) throws Exception {
+               Activator.context = null;
+               FileImportDropins.unwatchDropinsFolder();
+       }
+       
+       public static Path getDropinsFolder() throws IOException {
+           if (dropinsFolder == null) {
+               IPath state = Platform.getStateLocation(context.getBundle());
+               dropinsFolder = Paths.get(state.append("dropins").toOSString());
+               Files.createDirectories(dropinsFolder);
+           }
+           return dropinsFolder;
+       }
+
+    public static Path getModelsFolder() throws IOException {
+        if (modelsFolder == null) {
+            IPath state = Platform.getStateLocation(context.getBundle());
+            modelsFolder = Paths.get(state.append("models").toOSString());
+            Files.createDirectories(modelsFolder);
+        }
+        return modelsFolder;
+    }
+
+}