[Esbox-commits] r1936 - in branches/work_Ed: org.maemo.esbox.help/html/images/proj_wiz org.maemo.esbox.help/html/tasks org.maemo.esbox.tests/META-INF org.maemo.esbox.tests/src/org/maemo/esbox/internal/tests org.maemo.esbox.tests/src/org/maemo/esbox/tests/python

[eswartz at garage.maemo.org]

Author: eswartz
Date: 2009-08-04 15:54:04 +0300 (Tue, 04 Aug 2009)
New Revision: 1936

Added:
   branches/work_Ed/org.maemo.esbox.help/html/images/proj_wiz/wiz-python-project-interpreter-conf.png
Modified:
   branches/work_Ed/org.maemo.esbox.help/html/images/proj_wiz/wiz-python-project-template.png
   branches/work_Ed/org.maemo.esbox.help/html/images/proj_wiz/wiz-python-project-variables.png
   branches/work_Ed/org.maemo.esbox.help/html/tasks/CreatingPythonProject.html
   branches/work_Ed/org.maemo.esbox.tests/META-INF/MANIFEST.MF
   branches/work_Ed/org.maemo.esbox.tests/src/org/maemo/esbox/internal/tests/ESboxMicaTestSuite.java
   branches/work_Ed/org.maemo.esbox.tests/src/org/maemo/esbox/tests/python/ManualTestPyDevInterpreterConfigurator.java
Log:
Merged revs 1925:1935 from trunk

Copied: branches/work_Ed/org.maemo.esbox.help/html/images/proj_wiz/wiz-python-project-interpreter-conf.png (from rev 1935, trunk/org.maemo.esbox.help/html/images/proj_wiz/wiz-python-project-interpreter-conf.png)
===================================================================
(Binary files differ)

Modified: branches/work_Ed/org.maemo.esbox.help/html/images/proj_wiz/wiz-python-project-template.png
===================================================================
(Binary files differ)

Modified: branches/work_Ed/org.maemo.esbox.help/html/images/proj_wiz/wiz-python-project-variables.png
===================================================================
(Binary files differ)

Modified: branches/work_Ed/org.maemo.esbox.help/html/tasks/CreatingPythonProject.html
===================================================================
--- branches/work_Ed/org.maemo.esbox.help/html/tasks/CreatingPythonProject.html	2009-08-04 00:28:00 UTC (rev 1935)
+++ branches/work_Ed/org.maemo.esbox.help/html/tasks/CreatingPythonProject.html	2009-08-04 12:54:04 UTC (rev 1936)
@@ -46,6 +46,12 @@
     <p/>
       <img src="../images/proj_wiz/wiz-python-project-variables.png" alt="variables">
     </li>
+    
+    <li>Click <strong>Next</strong> to set python interpreter and grammar configurations.
+    <p/>
+      <img src="../images/proj_wiz/wiz-python-project-interpreter-conf.png" alt="python interpreter conf">
+    </li>
+    
 	<li> Click <strong>Finish</strong>.
 	You will be asked if you want to <a href="../tasks/ValidatingPackages.html">validate the build and runtime packages
 	for the project</a>.

Modified: branches/work_Ed/org.maemo.esbox.tests/META-INF/MANIFEST.MF
===================================================================
--- branches/work_Ed/org.maemo.esbox.tests/META-INF/MANIFEST.MF	2009-08-04 00:28:00 UTC (rev 1935)
+++ branches/work_Ed/org.maemo.esbox.tests/META-INF/MANIFEST.MF	2009-08-04 12:54:04 UTC (rev 1936)
@@ -30,8 +30,8 @@
  org.eclipse.cdt.core;bundle-version="5.0.2",
  org.maemo.mica.python.interpreter;bundle-version="2.0.0",
  org.maemo.mica.python.project.core;bundle-version="2.0.0",
- org.python.pydev;bundle-version="1.4.4",
- org.python.pydev.core;bundle-version="1.4.4",
- org.maemo.esbox.scratchbox.tests;bundle-version="2.0.0"
+ org.maemo.esbox.scratchbox.tests;bundle-version="2.0.0",
+ org.python.pydev;bundle-version="1.4.7",
+ org.python.pydev.core;bundle-version="1.4.7"
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ActivationPolicy: lazy

Modified: branches/work_Ed/org.maemo.esbox.tests/src/org/maemo/esbox/internal/tests/ESboxMicaTestSuite.java
===================================================================
--- branches/work_Ed/org.maemo.esbox.tests/src/org/maemo/esbox/internal/tests/ESboxMicaTestSuite.java	2009-08-04 00:28:00 UTC (rev 1935)
+++ branches/work_Ed/org.maemo.esbox.tests/src/org/maemo/esbox/internal/tests/ESboxMicaTestSuite.java	2009-08-04 12:54:04 UTC (rev 1936)
@@ -51,10 +51,11 @@
 		suite.addTest(new JUnit4TestAdapter(TestCppBuildConfigProjectConverter.class));
 		suite.addTest(new JUnit4TestAdapter(TestCppBuildConfigProjectCreator.class));
 		suite.addTest(new JUnit4TestAdapter(TestDebianStructureGenerator4CppProject.class));
-		suite.addTest(new JUnit4TestAdapter(TestFremantleAptBuildPackageMapping.class));
+		suite.addTest(new JUnit4TestAdapter(TestFremantleAptBuildPackageMapping.class));		
+		suite.addTest(new JUnit4TestAdapter(TestPythonProjectProperties.class));
+		
 		suite.addTest(new JUnit4TestAdapter(TestPythonProjectConverter.class));
 		suite.addTest(new JUnit4TestAdapter(TestPythonProjectCreator.class));
-		suite.addTest(new JUnit4TestAdapter(TestPythonProjectProperties.class));
 		
 		return suite;
 	}

Modified: branches/work_Ed/org.maemo.esbox.tests/src/org/maemo/esbox/tests/python/ManualTestPyDevInterpreterConfigurator.java
===================================================================
--- branches/work_Ed/org.maemo.esbox.tests/src/org/maemo/esbox/tests/python/ManualTestPyDevInterpreterConfigurator.java	2009-08-04 00:28:00 UTC (rev 1935)
+++ branches/work_Ed/org.maemo.esbox.tests/src/org/maemo/esbox/tests/python/ManualTestPyDevInterpreterConfigurator.java	2009-08-04 12:54:04 UTC (rev 1936)
@@ -28,7 +28,6 @@
 import org.maemo.mica.internal.api.python.interpreter.PyDevInterpreterConfigurator;
 import org.maemo.mica.python.project.core.IMicaPythonProjectType;
 import org.python.pydev.core.IInterpreterInfo;
-import org.python.pydev.core.Interpreter;
 import org.python.pydev.plugin.nature.PythonNature;
 /**
  * @author Fabrício S Epaminondas (UFCG) 
@@ -73,14 +72,14 @@
 
 		assertFalse(configurator.isInterpreterSubscribed(nature));
 		String pythonPath = "my/crazy/path";
-		Interpreter defaultInterpreter = new Interpreter("Default Test Interpreter", "Default Test Interpreter", pythonPath);
 		
+		String defaultInterpreter = "Default Test Interpreter";
 		assertNull(configurator.addInterpreterManager(nature, defaultInterpreter));
 		assertFalse(configurator.isInterpreterSubscribed(nature));
 		
 		//TODO FIX: the test will fail if could not found the expected python location on local machine		
 		assertFalse(configurator.isInterpreterSubscribed(nature));		
-		defaultInterpreter = configurator.getSDKTargetInterpreter(theSB1SDKTarget);
+		defaultInterpreter = configurator.getSDKTargetInterpreterName(theSB1SDKTarget);
 		IInterpreterInfo interpreterInfo = configurator.addInterpreterManager(nature, defaultInterpreter); 
 		assertNotNull(interpreterInfo);
 		nature.getRelatedInterpreterManager().addInterpreterInfo(interpreterInfo);