xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Omaha #3075 updates for pydev 3.4.1

Browse source 
Change-Id: I2d7ed5e73f837f42dea3de35cdf79dd98c7586b1

Former-commit-id: bb32858c04 [formerly e6569b4a7d [formerly a038aea9bb25e31b29b054e8899c0b51bc183fef]]
Former-commit-id: e6569b4a7d
Former-commit-id: 5fcc126e57
This commit is contained in:
Nate Jensen 2014-05-09 16:43:06 -05:00
parent b6155d5482
commit 7e3a38d473
1 changed files with 27 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
cave/com.raytheon.uf.viz.localization.perspective/src/com/raytheon/uf/viz/localization/perspective/PydevSetup.java
View file

@ -21,6 +21,8 @@ package com.raytheon.uf.viz.localization.perspective;
import java.io.File;
import java.io.IOException;
import java.util.HashSet;
import java.util.Set;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
@ -28,13 +30,16 @@ import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.core.runtime.preferences.IEclipsePreferences;
import org.eclipse.core.runtime.preferences.InstanceScope;
import org.eclipse.jface.preference.IPreferenceStore;
import org.python.pydev.core.IInterpreterInfo;
import org.python.pydev.core.IInterpreterManager;
import org.python.pydev.core.docutils.StringUtils;
import org.python.pydev.editor.PydevShowBrowserMessage;
import org.python.pydev.plugin.PydevPlugin;
import org.python.pydev.plugin.preferences.PydevRootPrefs;
import org.python.pydev.runners.SimplePythonRunner;
import org.python.pydev.shared_core.string.StringUtils;
import org.python.pydev.shared_core.structure.Tuple;
import org.python.pydev.ui.pythonpathconf.InterpreterInfo;
@ -56,6 +61,7 @@ import com.raytheon.uf.common.util.FileUtil;
* ------------- -------- ----------- --------------------------
* May 01, 2013 1967 njensen Initial creation
* Oct 11, 2013 2441 bsteffen Make initialize async.
* May 09, 2014 3075 njensen Updates for pydev 3.4.1
*
* </pre>
*
@ -73,6 +79,7 @@ public class PydevSetup {
* annoyances as possible.
*/
public static void preparePydev() {
preventPydevEclipsePopup();
preventFundingPopup();
initializeInterpreterAsync();
}
@ -156,7 +163,9 @@ public class PydevSetup {
* at the time of this writing.
*/
monitor.beginTask("Examining python path.", 3832);
mgr.setInfos(infoList, null, monitor);
Set<String> interpretersToRestore = new HashSet<String>();
interpretersToRestore.add(pathToFile);
mgr.setInfos(infoList, interpretersToRestore, monitor);
} else {
if (retry) {
throw new Exception(
@ -200,12 +209,8 @@ public class PydevSetup {
base = stateLocation.toFile();
String additionalInfoInterpreter = info.getExecutableOrJar();
File file = new File(
base,
manager.getManagerRelatedName()
+ "_"
+ StringUtils
.getExeAsFileSystemValidPath(additionalInfoInterpreter));
File file = new File(base, manager.getManagerRelatedName() + "_v1_"
+ StringUtils.md5(additionalInfoInterpreter));
if (!file.exists()) {
file.mkdirs();
@ -233,4 +238,18 @@ public class PydevSetup {
"true");
}
/**
* Sets the preference values to prevent pydev from popping up a dialog
* about some settings for running python files in Eclipse. This only
* pertains to running python inside Eclipse, not viz, so we don't want the
* popup.
*/
public static void preventPydevEclipsePopup() {
PydevRootPrefs.setCheckPreferredPydevSettings(false);
IEclipsePreferences debug = InstanceScope.INSTANCE
.getNode("org.eclipse.debug.ui");
debug.put("org.eclipse.debug.ui.wait_for_build", "never");
debug.put("org.eclipse.debug.ui.build_before_launch", "false");
debug.put("org.eclipse.debug.ui.UseContextualLaunch", "");
}
}