Fix Bicycle Refactoring that did not work due to pyDev Update

(Version 1.2.2)

pyUML_feature/feature.xml

@@ -2,7 +2,7 @@
 <feature
       id="pyUML"
       label="PyUML Feature"
-      version="1.2.1"
+      version="1.2.2"
       provider-name="Freie University Berlin, Germany, Martin Dittmar">
 
    <description url="http://www.example.com/description">
@@ -128,7 +128,7 @@ This Agreement is governed by the laws of the State of New York and the intellec
          id="pyUml"
          download-size="541"
          install-size="0"
-         version="1.2.1"
+         version="0.0.0"
          unpack="false"/>
 
 </feature>

pyUml/.classpath

@@ -5,5 +5,6 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="lib" path="lib/refactoring.jar"/>
+	<classpathentry kind="lib" path="/pydev"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

pyUml/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: PyUML
 Bundle-SymbolicName: pyUml;singleton:=true
-Bundle-Version: 1.2.1
+Bundle-Version: 1.2.2
 Bundle-Activator: pyUML.plugin.Activator
 Eclipse-LazyStart: true
 Bundle-ClassPath: lib/refactoring.jar,

pyUml/src/pyUML/refactoring/BicycleRefactoring.java

@@ -9,13 +9,16 @@ import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.python.copiedfromeclipsesrc.JDTNotAvailableException;
 import org.python.pydev.core.IPythonNature;
+import org.python.pydev.core.IPythonPathNature;
 import org.python.pydev.core.MisconfigurationException;
 import org.python.pydev.core.PythonNatureWithoutProjectException;
 import org.python.pydev.core.REF;
 import org.python.pydev.editor.codecompletion.shell.AbstractShell;
+import org.python.pydev.editor.codecompletion.shell.PythonShell;
 import org.python.pydev.editor.refactoring.AbstractPyRefactoring;
 import org.python.pydev.editor.refactoring.IPyRefactoring;
 import org.python.pydev.plugin.nature.PythonNature;
+import org.python.pydev.plugin.nature.PythonPathNature;
 
 
 import pyUML.exceptions.PyUMLSynchronizeCodeException;
@@ -47,7 +50,8 @@ public class BicycleRefactoring {
     			AbstractShell pytonShell = AbstractShell.getServerShell(pythonNature, AbstractShell.OTHERS_SHELL);
     			String output = "";
         		try{
-	 		        pytonShell.changePythonPath(pythonNature.getPythonPathNature().getCompleteProjectPythonPath(null, null)); //default
+        			IPythonPathNature n = pythonNature.getPythonPathNature();
+	 		        pytonShell.changePythonPath(pythonNature.getPythonPathNature().getCompleteProjectPythonPath(pythonNature.getProjectInterpreter(), null)); //default
 		            pytonShell.write(refactorCommand);
 		            output = URLDecoder.decode(pytonShell.read((IProgressMonitor)null), "UTF-8");
     	        } catch (Exception e) {

pyUml_updatesite/.project

@@ -3,6 +3,8 @@
 	<name>pyUml_updatesite</name>
 	<comment></comment>
 	<projects>
+		<project>pyUml</project>
+		<project>pyUML_feature</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>

pyUml_updatesite/artifacts.xml

@@ -3,20 +3,14 @@
 <repository name='file:/home/didi/workspace/pyUml_updatesite/ - artifacts' type='org.eclipse.equinox.p2.artifact.repository.simpleRepository' version='1.0.0'>
   <properties size='2'>
     <property name='p2.compressed' value='false'/>
-    <property name='p2.timestamp' value='1244465812509'/>
+    <property name='p2.timestamp' value='1244719259775'/>
   </properties>
   <mappings size='3'>
     <rule filter='(&amp; (classifier=osgi.bundle))' output='${repoUrl}/plugins/${id}_${version}.jar'/>
     <rule filter='(&amp; (classifier=binary))' output='${repoUrl}/binary/${id}_${version}'/>
     <rule filter='(&amp; (classifier=org.eclipse.update.feature))' output='${repoUrl}/features/${id}_${version}.jar'/>
   </mappings>
-  <artifacts size='7'>
+  <artifacts size='9'>
-    <artifact classifier='org.eclipse.update.feature' id='pyUML' version='1.2.1'>
-      <properties size='2'>
-        <property name='artifact.size' value='4963'/>
-        <property name='download.size' value='4963'/>
-      </properties>
-    </artifact>
     <artifact classifier='osgi.bundle' id='pyUml' version='1.2.0'>
       <properties size='3'>
         <property name='artifact.size' value='554276'/>
@@ -24,6 +18,12 @@
         <property name='download.contentType' value='application/zip'/>
       </properties>
     </artifact>
+    <artifact classifier='org.eclipse.update.feature' id='pyUML' version='1.2.1'>
+      <properties size='2'>
+        <property name='artifact.size' value='4963'/>
+        <property name='download.size' value='4963'/>
+      </properties>
+    </artifact>
     <artifact classifier='org.eclipse.update.feature' id='pyUML' version='1.2.1'>
       <properties size='2'>
         <property name='artifact.size' value='900'/>
@@ -50,11 +50,24 @@
         <property name='download.contentType' value='application/zip'/>
       </properties>
     </artifact>
+    <artifact classifier='org.eclipse.update.feature' id='pyUML' version='1.2.2'>
+      <properties size='2'>
+        <property name='artifact.size' value='4980'/>
+        <property name='download.size' value='4980'/>
+      </properties>
+    </artifact>
     <artifact classifier='org.eclipse.update.feature' id='pyUML' version='1.2.1'>
       <properties size='2'>
         <property name='artifact.size' value='4980'/>
         <property name='download.size' value='4980'/>
       </properties>
     </artifact>
+    <artifact classifier='osgi.bundle' id='pyUml' version='1.2.2'>
+      <properties size='3'>
+        <property name='artifact.size' value='555052'/>
+        <property name='download.size' value='555052'/>
+        <property name='download.contentType' value='application/zip'/>
+      </properties>
+    </artifact>
   </artifacts>
 </repository>

pyUml_updatesite/site.xml

@@ -9,6 +9,9 @@
    <feature url="features/pyUML_1.2.1.jar" id="pyUML" version="1.2.1">
       <category name="Eclipse PyUML"/>
    </feature>
+   <feature url="features/pyUML_1.2.2.jar" id="pyUML" version="1.2.2">
+      <category name="Eclipse PyUML"/>
+   </feature>
    <category-def name="Eclipse PyUML" label="Eclipse PyUML">
       <description>
          A UML Roundtrip Tool for Python