diff options
author | mkersten | 2005-12-08 18:11:17 +0000 |
---|---|---|
committer | mkersten | 2005-12-08 18:11:17 +0000 |
commit | 604989236e0919d9c4822651e1379c55b43d341a (patch) | |
tree | 6f77a23c6223a3b6b0b56f88f67f11e06b18d6ec | |
parent | a4fc77c4e0f6d2812bd7cebaa0f4f13c0f187b09 (diff) | |
download | org.eclipse.mylyn.tasks-604989236e0919d9c4822651e1379c55b43d341a.tar.gz org.eclipse.mylyn.tasks-604989236e0919d9c4822651e1379c55b43d341a.tar.xz org.eclipse.mylyn.tasks-604989236e0919d9c4822651e1379c55b43d341a.zip |
Progress on: Bug 119372: workspace move breaks mylar paths
https://bugs.eclipse.org/bugs/show_bug.cgi?id=119372
7 files changed, 32 insertions, 31 deletions
diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasklist/tests/ChangeMainTaskDirTest.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasklist/tests/ChangeMainTaskDirTest.java index ff4777ad2..baac1dd7e 100644 --- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasklist/tests/ChangeMainTaskDirTest.java +++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasklist/tests/ChangeMainTaskDirTest.java @@ -28,10 +28,10 @@ public class ChangeMainTaskDirTest extends TestCase{ super.setUp(); //Get the original main data directory so that it can be reset later - originalMainDataDir = MylarPlugin.getDefault().getMylarDataDirectory(); + originalMainDataDir = MylarPlugin.getDefault().getDataDirectory(); //Create test main data directories to use - newMainDataDir = new File(MylarPlugin.getDefault().getMylarDataDirectory() + File.separator + "TestMainDir1"); + newMainDataDir = new File(MylarPlugin.getDefault().getDataDirectory() + File.separator + "TestMainDir1"); newMainDataDir.mkdir(); assertTrue(newMainDataDir.exists()); @@ -50,17 +50,17 @@ public class ChangeMainTaskDirTest extends TestCase{ switchMainTaskDirectory(newMainDataDir.getPath()); //Check that the main data dir task isn't in the list or the folder - File taskFile = new File(MylarPlugin.getDefault().getMylarDataDirectory() + File.separator + mainDataDirTask.getContextPath() + MylarTaskListPlugin.FILE_EXTENSION); + File taskFile = new File(MylarPlugin.getDefault().getDataDirectory() + File.separator + mainDataDirTask.getContextPath() + MylarTaskListPlugin.FILE_EXTENSION); assertFalse(taskFile.exists()); assertNull(manager.getTaskForHandle(mainDataDirTask.getHandleIdentifier(), false)); //Check that a newly created task appears in the right place (method will check) ITask newDataDirTask = createAndSaveTask("New Data Dir"); - taskFile = new File(MylarPlugin.getDefault().getMylarDataDirectory() + File.separator + newDataDirTask.getContextPath() + MylarTaskListPlugin.FILE_EXTENSION); + taskFile = new File(MylarPlugin.getDefault().getDataDirectory() + File.separator + newDataDirTask.getContextPath() + MylarTaskListPlugin.FILE_EXTENSION); assertTrue(taskFile.exists()); //Check for other the tasklist file in the new dir - File destTaskListFile = new File(MylarPlugin.getDefault().getMylarDataDirectory() + File.separator + MylarTaskListPlugin.DEFAULT_TASK_LIST_FILE); + File destTaskListFile = new File(MylarPlugin.getDefault().getDataDirectory() + File.separator + MylarTaskListPlugin.DEFAULT_TASK_LIST_FILE); assertTrue(destTaskListFile.exists()); //Switch back to the main task directory @@ -68,7 +68,7 @@ public class ChangeMainTaskDirTest extends TestCase{ //Check that the previously created main dir task is in the task list and its file exists assertNotNull(manager.getTaskForHandle(mainDataDirTask.getHandleIdentifier(), false)); - taskFile = new File(MylarPlugin.getDefault().getMylarDataDirectory() + File.separator + mainDataDirTask.getContextPath() + MylarTaskListPlugin.FILE_EXTENSION); + taskFile = new File(MylarPlugin.getDefault().getDataDirectory() + File.separator + mainDataDirTask.getContextPath() + MylarTaskListPlugin.FILE_EXTENSION); assertTrue(taskFile.exists()); } @@ -90,7 +90,7 @@ public class ChangeMainTaskDirTest extends TestCase{ //Save the context file and check that it exists MylarPlugin.getContextManager().saveContext(mockContext.getId(), newTask.getContextPath()); - File taskFile = new File(MylarPlugin.getDefault().getMylarDataDirectory() + File.separator + newTask.getContextPath() + MylarContextManager.FILE_EXTENSION); + File taskFile = new File(MylarPlugin.getDefault().getDataDirectory() + File.separator + newTask.getContextPath() + MylarContextManager.FILE_EXTENSION); assertTrue(MylarPlugin.getContextManager().hasContext(newTask.getContextPath())); assertTrue(taskFile.exists()); @@ -102,8 +102,8 @@ public class ChangeMainTaskDirTest extends TestCase{ protected void switchMainTaskDirectory(String newDir){ //Order matters: MylarTaskListPlugin.getDefault().getTaskListSaveManager().saveTaskListAndContexts(); - MylarPlugin.getDefault().getPreferenceStore().setValue(MylarPlugin.MYLAR_DIR, newDir); - MylarTaskListPlugin.getDefault().setDataDirectory(MylarPlugin.getDefault().getMylarDataDirectory()); + MylarPlugin.getDefault().getPreferenceStore().setValue(MylarPlugin.PREF_DATA_DIR, newDir); + MylarTaskListPlugin.getDefault().setDataDirectory(MylarPlugin.getDefault().getDataDirectory()); } protected void tearDown() throws Exception{ diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasklist/tests/TaskDataExportTest.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasklist/tests/TaskDataExportTest.java index f20906b48..8b9d87a4b 100644 --- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasklist/tests/TaskDataExportTest.java +++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasklist/tests/TaskDataExportTest.java @@ -40,7 +40,7 @@ public class TaskDataExportTest extends TestCase{ assertNotNull(wizardPage); //Create test export destination directory - destinationDir = new File(MylarPlugin.getDefault().getMylarDataDirectory() + File.separator + "TestDir"); + destinationDir = new File(MylarPlugin.getDefault().getDataDirectory() + File.separator + "TestDir"); destinationDir.mkdir(); assertTrue(destinationDir.exists()); @@ -54,7 +54,7 @@ public class TaskDataExportTest extends TestCase{ //Save the context file and check that it exists MylarPlugin.getContextManager().saveContext(mockContext.getId(), task1.getContextPath()); - File taskFile = new File(MylarPlugin.getDefault().getMylarDataDirectory() + File.separator + task1.getContextPath() + MylarContextManager.FILE_EXTENSION); + File taskFile = new File(MylarPlugin.getDefault().getDataDirectory() + File.separator + task1.getContextPath() + MylarContextManager.FILE_EXTENSION); assertTrue(MylarPlugin.getContextManager().hasContext(task1.getContextPath())); assertTrue(taskFile.exists()); } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/MylarTaskListPlugin.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/MylarTaskListPlugin.java index fdd42f989..f2ab69843 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/MylarTaskListPlugin.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/MylarTaskListPlugin.java @@ -286,7 +286,7 @@ public class MylarTaskListPlugin extends AbstractUIPlugin implements IStartup { taskListWriter = new TaskListWriter(); - String path = MylarPlugin.getDefault().getMylarDataDirectory() + File.separator + DEFAULT_TASK_LIST_FILE; + String path = MylarPlugin.getDefault().getDataDirectory() + File.separator + DEFAULT_TASK_LIST_FILE; File taskListFile = new File(path); // TODO: decouple from core diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/internal/TaskListSaveManager.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/internal/TaskListSaveManager.java index 096962c91..5827c592b 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/internal/TaskListSaveManager.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/internal/TaskListSaveManager.java @@ -58,7 +58,7 @@ public class TaskListSaveManager implements ITaskActivityListener, DisposeListen * the specified folder. Will overwrite. */ public void copyDataDirContentsTo(String targetFolderPath) { - File mainDataDir = new File(MylarPlugin.getDefault().getMylarDataDirectory()); + File mainDataDir = new File(MylarPlugin.getDefault().getDataDirectory()); for (File currFile : mainDataDir.listFiles()) { if (currFile.isFile()) { @@ -69,19 +69,19 @@ public class TaskListSaveManager implements ITaskActivityListener, DisposeListen } public void createTaskListBackupFile() { - String path = MylarPlugin.getDefault().getMylarDataDirectory() + File.separator + MylarTaskListPlugin.DEFAULT_TASK_LIST_FILE; + String path = MylarPlugin.getDefault().getDataDirectory() + File.separator + MylarTaskListPlugin.DEFAULT_TASK_LIST_FILE; File taskListFile = new File(path); String backup = path.substring(0, path.lastIndexOf('.')) + FILE_SUFFIX_BACKUP; copy(taskListFile, new File(backup)); } public String getBackupFilePath() { - String path = MylarPlugin.getDefault().getMylarDataDirectory() + File.separator + MylarTaskListPlugin.DEFAULT_TASK_LIST_FILE; + String path = MylarPlugin.getDefault().getDataDirectory() + File.separator + MylarTaskListPlugin.DEFAULT_TASK_LIST_FILE; return path.substring(0, path.lastIndexOf('.')) + FILE_SUFFIX_BACKUP; } public void reverseBackup() { - String path = MylarPlugin.getDefault().getMylarDataDirectory() + File.separator + MylarTaskListPlugin.DEFAULT_TASK_LIST_FILE; + String path = MylarPlugin.getDefault().getDataDirectory() + File.separator + MylarTaskListPlugin.DEFAULT_TASK_LIST_FILE; File taskListFile = new File(path); String backup = path.substring(0, path.lastIndexOf('.')) + FILE_SUFFIX_BACKUP; copy(new File(backup), taskListFile); diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/ui/TaskInfoEditor.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/ui/TaskInfoEditor.java index 4f508d80e..3b5efde92 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/ui/TaskInfoEditor.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/ui/TaskInfoEditor.java @@ -582,7 +582,7 @@ public class TaskInfoEditor extends EditorPart { String[] ext = { "*.xml" }; dialog.setFilterExtensions(ext); - String mylarDir = MylarPlugin.getDefault().getMylarDataDirectory() + "/"; + String mylarDir = MylarPlugin.getDefault().getDataDirectory() + "/"; mylarDir = mylarDir.replaceAll("\\\\", "/"); dialog.setFilterPath(mylarDir); diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/ui/preferences/MylarTaskListPreferencePage.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/ui/preferences/MylarTaskListPreferencePage.java index 2019a6c20..8cf3b4c28 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/ui/preferences/MylarTaskListPreferencePage.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/ui/preferences/MylarTaskListPreferencePage.java @@ -10,8 +10,6 @@ *******************************************************************************/ package org.eclipse.mylar.tasklist.ui.preferences; -import org.eclipse.core.resources.ResourcesPlugin; -import org.eclipse.core.runtime.IPath; import org.eclipse.jface.preference.PreferencePage; import org.eclipse.mylar.core.MylarPlugin; import org.eclipse.mylar.tasklist.MylarTaskListPlugin; @@ -109,14 +107,15 @@ public class MylarTaskListPreferencePage extends PreferencePage implements IWork public boolean performOk() { String taskDirectory = taskDirectoryText.getText(); taskDirectory = taskDirectory.replaceAll("\\\\", "/"); - if (!taskDirectory.equals(MylarPlugin.getDefault().getMylarDataDirectory())) { + if (!taskDirectory.equals(MylarPlugin.getDefault().getDataDirectory())) { //Order matters: MylarTaskListPlugin.getDefault().getTaskListSaveManager().saveTaskListAndContexts(); if (copyExistingDataCheckbox.getSelection()) { MylarTaskListPlugin.getDefault().getTaskListSaveManager().copyDataDirContentsTo(taskDirectory); } - getPreferenceStore().setValue(MylarPlugin.MYLAR_DIR, taskDirectory); - MylarTaskListPlugin.getDefault().setDataDirectory(MylarPlugin.getDefault().getMylarDataDirectory()); +// getPreferenceStore().setValue(MylarPlugin.PREF_DATA_DIR, taskDirectory); + MylarPlugin.getDefault().setDataDirectory(taskDirectory); + MylarTaskListPlugin.getDefault().setDataDirectory(MylarPlugin.getDefault().getDataDirectory()); } getPreferenceStore().setValue(MylarTaskListPlugin.COPY_TASK_DATA, copyExistingDataCheckbox.getSelection()); @@ -143,11 +142,11 @@ public class MylarTaskListPreferencePage extends PreferencePage implements IWork public void performDefaults() { super.performDefaults(); - IPath rootPath = ResourcesPlugin.getWorkspace().getRoot().getLocation(); - String taskDirectory = rootPath.toString() + "/" + MylarPlugin.MYLAR_DIR_NAME; - taskDirectoryText.setText(taskDirectory); +// IPath rootPath = ResourcesPlugin.getWorkspace().getRoot().getLocation(); +// String taskDirectory = rootPath.toString() + "/" + MylarPlugin.DATA_DIR_NAME; + taskDirectoryText.setText(MylarPlugin.getDefault().getDefaultDataDirectory()); - copyExistingDataCheckbox.setSelection(getPreferenceStore().getDefaultBoolean(MylarTaskListPlugin.COPY_TASK_DATA)); +// copyExistingDataCheckbox.setSelection(getPreferenceStore().getDefaultBoolean(MylarTaskListPlugin.COPY_TASK_DATA)); reportEditor.setSelection(getPreferenceStore().getDefaultBoolean(MylarTaskListPlugin.REPORT_OPEN_EDITOR)); reportInternal.setSelection(getPreferenceStore().getDefaultBoolean(MylarTaskListPlugin.REPORT_OPEN_INTERNAL)); // reportExternal.setSelection(getPreferenceStore().getDefaultBoolean(MylarTaskListPlugin.REPORT_OPEN_EXTERNAL)); @@ -168,10 +167,12 @@ public class MylarTaskListPreferencePage extends PreferencePage implements IWork private void createTaskDirectoryControl(Composite parent) { Group taskDirComposite = new Group(parent, SWT.SHADOW_ETCHED_IN); - taskDirComposite.setText("Task Directory"); + taskDirComposite.setText("Mylar Data Directory (task list and contexts)"); taskDirComposite.setLayout(new GridLayout(2, false)); taskDirComposite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); - String taskDirectory = getPreferenceStore().getString(MylarPlugin.MYLAR_DIR); + + String taskDirectory = MylarPlugin.getDefault().getDataDirectory(); +// String taskDirectory = getPreferenceStore().getString(MylarPlugin.PREF_DATA_DIR); taskDirectory = taskDirectory.replaceAll("\\\\", "/"); taskDirectoryText = new Text(taskDirComposite, SWT.BORDER); taskDirectoryText.setText(taskDirectory); diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/ui/wizards/TaskDataExportWizard.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/ui/wizards/TaskDataExportWizard.java index fec9f41a0..6dcbfa17d 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/ui/wizards/TaskDataExportWizard.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasklist/ui/wizards/TaskDataExportWizard.java @@ -212,7 +212,7 @@ public class TaskDataExportWizard extends Wizard implements IExportWizard { if (exportTaskList) { MylarTaskListPlugin.getTaskListManager().saveTaskList(); - String sourceTaskListPath = MylarPlugin.getDefault().getMylarDataDirectory() + File.separator + MylarTaskListPlugin.DEFAULT_TASK_LIST_FILE; + String sourceTaskListPath = MylarPlugin.getDefault().getDataDirectory() + File.separator + MylarTaskListPlugin.DEFAULT_TASK_LIST_FILE; File sourceTaskListFile = new File(sourceTaskListPath); if (zip) { @@ -228,7 +228,7 @@ public class TaskDataExportWizard extends Wizard implements IExportWizard { if (exportActivationHistory) { try { - File sourceActivationHistoryFile = new File(MylarPlugin.getDefault().getMylarDataDirectory() + File.separator + File sourceActivationHistoryFile = new File(MylarPlugin.getDefault().getDataDirectory() + File.separator + MylarContextManager.CONTEXT_HISTORY_FILE_NAME + MylarContextManager.FILE_EXTENSION); MylarPlugin.getContextManager().saveActivityHistoryContext(); @@ -255,7 +255,7 @@ public class TaskDataExportWizard extends Wizard implements IExportWizard { } File destTaskFile = new File(destinationDirectory + File.separator + task.getContextPath() + MylarContextManager.FILE_EXTENSION); - File sourceTaskFile = new File(MylarPlugin.getDefault().getMylarDataDirectory() + File.separator + task.getContextPath() + File sourceTaskFile = new File(MylarPlugin.getDefault().getDataDirectory() + File.separator + task.getContextPath() + MylarContextManager.FILE_EXTENSION); if (zip) { |