Permalink
Browse files

synchronize if not building + use proper preferences

  • Loading branch information...
1 parent 91fe441 commit 765f5f79a492b63e5c9b55ad65ad6ae2b509b2e1 @JPMoresmau committed Nov 6, 2012
@@ -15,6 +15,7 @@
import org.eclipse.core.resources.IMarker;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
@@ -131,7 +132,10 @@ public static BWFacade createFacade(IProject p,String cabalPath,Writer outStream
f.setOutStream(outStream);
facades.put(p, f);
// why? build will do that for us
- //new JobFacade(f).synchronize(false);
+ // well if we don't build automatically we DO need it!
+ if (!ResourcesPlugin.getWorkspace().isAutoBuilding()){
+ new JobFacade(f).synchronize(false);
+ }
return f;
}
return null;
@@ -6,7 +6,6 @@
import net.sf.eclipsefp.haskell.util.FileUtil;
import net.sf.eclipsefp.haskell.util.PlatformUtil;
import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
-import org.eclipse.core.runtime.preferences.DefaultScope;
import org.eclipse.core.runtime.preferences.IEclipsePreferences;
@@ -19,7 +18,7 @@
implements ICorePreferenceNames {
@Override
public void initializeDefaultPreferences() {
- IEclipsePreferences coreNode = DefaultScope.INSTANCE.getNode( HaskellCorePlugin.getPluginId() );
+ IEclipsePreferences coreNode = HaskellCorePlugin.instanceScopedPreferences();
coreNode.put( SELECTED_COMPILER, "ghcCompiler" ); //$NON-NLS-1$
coreNode.put( FOLDERS_SRC, FileUtil.DEFAULT_FOLDER_SRC );
// coreNode.put( FOLDERS_DOC, FileUtil.DEFAULT_FOLDER_DOC );
@@ -83,7 +83,7 @@
/** Haskell console high water mark */
private int hConHighWater;
- private final static String MINIMUM_BUILDWRAPPER="0.6.2";
+ private final static String MINIMUM_BUILDWRAPPER="0.6.3";
private final static String MINIMUM_SCIONBROWSER="0.2.12";
public ScionManager() {

0 comments on commit 765f5f7

Please sign in to comment.