Hardcoded demo model path to workaround gatekeeper issues on macos si…

…erra.
Repast · Sep 30, 2016 · a6c5fc1 · a6c5fc1
1 parent fb6aaa1
commit a6c5fc1
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/repast.simphony.eclipse/src/repast/simphony/eclipse/ide/Constants.java b/repast.simphony.eclipse/src/repast/simphony/eclipse/ide/Constants.java
@@ -0,0 +1,9 @@
+package repast.simphony.eclipse.ide;
+
+import repast.simphony.eclipse.RepastSimphonyPlugin;
+
+public interface Constants {
+
+  String OS_MODELS_PATH = "/Applications/Repast Simphony " + RepastSimphonyPlugin.REPAST_SIMPHONY_PLUGIN_VERSION + "/models";
+
+}
diff --git a/repast.simphony.eclipse/src/repast/simphony/eclipse/ide/ImportSampleModelsWizard.java b/repast.simphony.eclipse/src/repast/simphony/eclipse/ide/ImportSampleModelsWizard.java
@@ -27,8 +27,7 @@ public class ImportSampleModelsWizard extends Wizard implements IImportWizard, I
   public ImportSampleModelsWizard() {
     IPath eclipseHome = JavaCore.getClasspathVariable("ECLIPSE_HOME");
     String eclipseHomeString = eclipseHome.toOSString();
-    String modelsPath = Platform.getOS().equals(Platform.OS_MACOSX) ?  eclipseHomeString + File.separator + "../../.."
-        + File.separator + "models" : eclipseHomeString + File.separator + ".." + File.separator + "models";
+    String modelsPath = Platform.getOS().equals(Platform.OS_MACOSX) ?  Constants.OS_MODELS_PATH : eclipseHomeString + File.separator + ".." + File.separator + "models";
     this.wizard = new ExternalProjectImportWizard(modelsPath);
   }
 

diff --git a/repast.simphony.eclipse/src/repast/simphony/eclipse/ide/ImportSampleModelsWizard2.java b/repast.simphony.eclipse/src/repast/simphony/eclipse/ide/ImportSampleModelsWizard2.java
@@ -29,8 +29,7 @@ public class ImportSampleModelsWizard2 extends ExternalProjectImportWizard {
    * 
    */
   public ImportSampleModelsWizard2() {
-    super(Platform.getOS().equals(Platform.OS_MACOSX) ?  JavaCore.getClasspathVariable("ECLIPSE_HOME").toOSString() + File.separator + "../../.."
-        + File.separator + "models" : JavaCore.getClasspathVariable("ECLIPSE_HOME").toOSString() + File.separator + ".."
+    super(Platform.getOS().equals(Platform.OS_MACOSX) ?  Constants.OS_MODELS_PATH : JavaCore.getClasspathVariable("ECLIPSE_HOME").toOSString() + File.separator + ".."
         + File.separator + "models");
   }