diff options
| author | Oleg Besedin | 2012-05-31 17:41:46 +0000 |
|---|---|---|
| committer | Oleg Besedin | 2012-05-31 17:42:52 +0000 |
| commit | d1494db7a485ba7222a4f04f12aafe782a3388ab (patch) | |
| tree | f81ed2f0f6f987139ba192d95ff6371467686be4 /bundles/org.eclipse.e4.ui.workbench | |
| parent | c9ab4d551a9ea588b6ada2df97364c2d0ce9dd50 (diff) | |
| download | eclipse.platform.ui-d1494db7a485ba7222a4f04f12aafe782a3388ab.tar.gz eclipse.platform.ui-d1494db7a485ba7222a4f04f12aafe782a3388ab.tar.xz eclipse.platform.ui-d1494db7a485ba7222a4f04f12aafe782a3388ab.zip | |
Bug 381219 - Remove timestamp check for the base application modelv20120531-1742I20120604-1900I20120603-1910I20120602-1900I20120601-1900I20120531-1500
Diffstat (limited to 'bundles/org.eclipse.e4.ui.workbench')
| -rw-r--r-- | bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/internal/workbench/ResourceHandler.java | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/internal/workbench/ResourceHandler.java b/bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/internal/workbench/ResourceHandler.java index b794be7e98e..2cccdc4e326 100644 --- a/bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/internal/workbench/ResourceHandler.java +++ b/bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/internal/workbench/ResourceHandler.java @@ -192,9 +192,10 @@ public class ResourceHandler implements IModelResourceHandler { long restoreLastModified = restoreLocation == null ? 0L : new File( restoreLocation.toFileString()).lastModified(); - long lastApplicationModification = getLastApplicationModification(); - - boolean restore = restoreLastModified > lastApplicationModification; + // See bug 380663, bug 381219 + // long lastApplicationModification = getLastApplicationModification(); + // boolean restore = restoreLastModified > lastApplicationModification; + boolean restore = restoreLastModified > 0; resource = null; if (restore && saveAndRestore) { @@ -251,7 +252,7 @@ public class ResourceHandler implements IModelResourceHandler { return resource; } - private long getLastApplicationModification() { + protected long getLastApplicationModification() { long appLastModified = 0L; ResourceSetImpl resourceSetImpl = new ResourceSetImpl(); |