editor/tools/plugins/com.google.dart.tools.update.core/src/com/google/dart/tools/update/core/internal/UpdateUtils.java - Issue 10660016: Update manager fixes to handle update check failures.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: editor/tools/plugins/com.google.dart.tools.update.core/src/com/google/dart/tools/update/core/internal/UpdateUtils.java

Issue 10660016: Update manager fixes to handle update check failures. (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/

Patch Set: Created 8 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « editor/tools/plugins/com.google.dart.tools.update.core/src/com/google/dart/tools/update/core/internal/UpdateModel.java ('k') | editor/tools/plugins/com.google.dart.tools.update.core/src/com/google/dart/tools/update/core/internal/jobs/CheckForUpdatesJob.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: editor/tools/plugins/com.google.dart.tools.update.core/src/com/google/dart/tools/update/core/internal/UpdateUtils.java

===================================================================

--- editor/tools/plugins/com.google.dart.tools.update.core/src/com/google/dart/tools/update/core/internal/UpdateUtils.java (revision 9083)

+++ editor/tools/plugins/com.google.dart.tools.update.core/src/com/google/dart/tools/update/core/internal/UpdateUtils.java (working copy)

@@ -16,10 +16,8 @@

import com.google.dart.tools.update.core.Revision;

import com.google.dart.tools.update.core.UpdateCore;

-import org.eclipse.core.runtime.FileLocator;

import org.eclipse.core.runtime.IPath;

import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.core.runtime.Path;

import org.eclipse.jface.util.Util;

import org.eclipse.swt.internal.Library;

@@ -253,17 +251,6 @@

public static File getUpdateInstallDir() {

- try {

- URL url = FileLocator.find(UpdateCore.getInstance().getBundle(), Path.EMPTY, null);

- if (url != null) {

- File bundle = new File(FileLocator.resolve(url).toURI());

- //dart/plugins/XXXX.jar

- return bundle.getParentFile().getParentFile();

- }

- } catch (Exception e) {

- return null;

- }

if (UpdateCore.DEBUGGING_IN_RUNTIME_WS) {

//TODO (pquitslund): for local testing

return new File(getUpdateTempDir().getParentFile(), "install");