Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormkersten2007-06-07 22:29:54 -0400
committermkersten2007-06-07 22:29:54 -0400
commitc903b2a2c43c7964e6ec36fbbd4561dffba1b355 (patch)
treeea012610941840594bf77ce6321f89ba29d1bfdc
parentb661f3f4f0d88e2bf3ce94cca0508865e139c75d (diff)
downloadorg.eclipse.mylyn.tasks-c903b2a2c43c7964e6ec36fbbd4561dffba1b355.tar.gz
org.eclipse.mylyn.tasks-c903b2a2c43c7964e6ec36fbbd4561dffba1b355.tar.xz
org.eclipse.mylyn.tasks-c903b2a2c43c7964e6ec36fbbd4561dffba1b355.zip
NEW - bug 191406: rename Mylar project to Mylyn
https://bugs.eclipse.org/bugs/show_bug.cgi?id=191406
-rw-r--r--org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaStatus.java20
-rw-r--r--org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/AbstractBugzillaTest.java6
-rw-r--r--org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaProductParserTest.java6
-rw-r--r--org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaTestUtil.java4
-rw-r--r--org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/RepositoryEditorWizardTest.java6
-rw-r--r--org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/RepositoryReportFactoryTest.java6
-rw-r--r--org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/headless/BugzillaQueryTest.java8
-rw-r--r--org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/headless/BugzillaTaskHistoryTest.java6
-rw-r--r--org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/TasksMessages.java (renamed from org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/MylarMessages.java)6
-rw-r--r--org.eclipse.mylyn.tasks.tests/META-INF/MANIFEST.MF2
-rw-r--r--org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskTestUtil.java2
-rw-r--r--org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TasksTestsPlugin.java (renamed from org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/MylarTasksTestsPlugin.java)8
-rw-r--r--org.eclipse.mylyn.tasks.ui/plugin.xml8
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/OpenTasksUiPreferencesAction.java4
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/preferences/TaskFocusedUiPreferencePage.java (renamed from org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/preferences/MylarPreferencePage.java)2
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/preferences/TasksUiPreferencePage.java (renamed from org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/preferences/TasksPreferencePage.java)4
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/TaskUrlHyperlink.java (renamed from org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/MylarUrlHyperlink.java)4
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/TaskUrlHyperlinkDetector.java (renamed from org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/MylarUrlHyperlinkDetector.java)4
-rw-r--r--org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/AbstractTracClientRepositoryTest.java8
-rw-r--r--org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/AbstractTracClientTest.java8
-rw-r--r--org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/RepositorySearchQueryTest.java8
-rw-r--r--org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracAttachmentHandlerTest.java8
-rw-r--r--org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracClientFactoryTest.java8
-rw-r--r--org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracRepositoryConnectorTest.java8
-rw-r--r--org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracTaskDataHandlerTest.java8
-rw-r--r--org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracXmlRpcTest.java8
-rw-r--r--org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/support/TestCleanupUtil.java2
-rw-r--r--org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/support/TestFixture.java8
28 files changed, 90 insertions, 90 deletions
diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaStatus.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaStatus.java
index 68d5ab5bc..ac0e96888 100644
--- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaStatus.java
+++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaStatus.java
@@ -13,7 +13,7 @@ package org.eclipse.mylyn.internal.bugzilla.core;
import org.eclipse.core.runtime.Status;
import org.eclipse.mylyn.tasks.core.IMylarStatusConstants;
-import org.eclipse.mylyn.tasks.core.MylarMessages;
+import org.eclipse.mylyn.tasks.core.TasksMessages;
/**
* @author Rob Elves
@@ -59,12 +59,12 @@ public class BugzillaStatus extends Status implements IMylarStatusConstants {
switch (getCode()) {
case REPOSITORY_LOGIN_ERROR:
- return MylarMessages
- .bind(MylarMessages.repository_login_failure, this.getRepositoryUrl(), this.errorMessage);
+ return TasksMessages
+ .bind(TasksMessages.repository_login_failure, this.getRepositoryUrl(), this.errorMessage);
case REPOSITORY_NOT_FOUND:
- return MylarMessages.bind(MylarMessages.repository_not_found, this.errorMessage);
+ return TasksMessages.bind(TasksMessages.repository_not_found, this.errorMessage);
case REPOSITORY_ERROR:
- return MylarMessages.bind(MylarMessages.repository_error, this.getRepositoryUrl(), this.errorMessage);
+ return TasksMessages.bind(TasksMessages.repository_error, this.getRepositoryUrl(), this.errorMessage);
case IO_ERROR:
String string1 = "Unknown IO error occurred";
String string2 = "No message provided";
@@ -73,16 +73,16 @@ public class BugzillaStatus extends Status implements IMylarStatusConstants {
string2 = getException().getMessage();
}
Object[] strings = { getRepositoryUrl(), string1, string2 };
- return MylarMessages.bind(MylarMessages.io_error, strings);
+ return TasksMessages.bind(TasksMessages.io_error, strings);
case INTERNAL_ERROR:
- return MylarMessages.bind(MylarMessages.internal_error, this.errorMessage);
+ return TasksMessages.bind(TasksMessages.internal_error, this.errorMessage);
case OPERATION_CANCELLED:
- return MylarMessages.bind(MylarMessages.operation_cancelled, this.errorMessage);
+ return TasksMessages.bind(TasksMessages.operation_cancelled, this.errorMessage);
case REPOSITORY_COLLISION:
- return MylarMessages.bind(MylarMessages.repository_collision, this.errorMessage);
+ return TasksMessages.bind(TasksMessages.repository_collision, this.errorMessage);
case REPOSITORY_COMMENT_REQD:
if (errorMessage == null) {
- return MylarMessages.repository_comment_reqd;
+ return TasksMessages.repository_comment_reqd;
} else {
return errorMessage;
}
diff --git a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/AbstractBugzillaTest.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/AbstractBugzillaTest.java
index dc823b6b0..946e9cee5 100644
--- a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/AbstractBugzillaTest.java
+++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/AbstractBugzillaTest.java
@@ -17,8 +17,8 @@ import junit.framework.TestCase;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.mylyn.context.tests.support.MylarTestUtils;
-import org.eclipse.mylyn.context.tests.support.MylarTestUtils.Credentials;
+import org.eclipse.mylyn.context.tests.support.TestUtil;
+import org.eclipse.mylyn.context.tests.support.TestUtil.Credentials;
import org.eclipse.mylyn.internal.bugzilla.core.BugzillaCorePlugin;
import org.eclipse.mylyn.internal.bugzilla.core.BugzillaRepositoryConnector;
import org.eclipse.mylyn.internal.bugzilla.core.BugzillaTask;
@@ -90,7 +90,7 @@ public abstract class AbstractBugzillaTest extends TestCase {
protected void init(String url) {
repository = new TaskRepository(DEFAULT_KIND, url);
- Credentials credentials = MylarTestUtils.readCredentials();
+ Credentials credentials = TestUtil.readCredentials();
repository.setAuthenticationCredentials(credentials.username, credentials.password);
repository.setTimeZoneId("Canada/Eastern");
diff --git a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaProductParserTest.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaProductParserTest.java
index 19e1bfc3d..823aabbe1 100644
--- a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaProductParserTest.java
+++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaProductParserTest.java
@@ -15,8 +15,8 @@ import java.util.List;
import junit.framework.TestCase;
-import org.eclipse.mylyn.context.tests.support.MylarTestUtils;
-import org.eclipse.mylyn.context.tests.support.MylarTestUtils.Credentials;
+import org.eclipse.mylyn.context.tests.support.TestUtil;
+import org.eclipse.mylyn.context.tests.support.TestUtil.Credentials;
import org.eclipse.mylyn.internal.bugzilla.core.BugzillaCorePlugin;
import org.eclipse.mylyn.internal.bugzilla.core.IBugzillaConstants;
import org.eclipse.mylyn.tasks.core.TaskRepository;
@@ -51,7 +51,7 @@ public class BugzillaProductParserTest extends TestCase {
private TaskRepository setRepository(String url) {
repository = new TaskRepository(BugzillaCorePlugin.REPOSITORY_KIND, url);
- Credentials credentials = MylarTestUtils.readCredentials();
+ Credentials credentials = TestUtil.readCredentials();
repository.setAuthenticationCredentials(credentials.username, credentials.password);
return repository;
}
diff --git a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaTestUtil.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaTestUtil.java
index 7889174ec..982c17d74 100644
--- a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaTestUtil.java
+++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaTestUtil.java
@@ -20,7 +20,7 @@ import java.io.OutputStream;
import java.net.URL;
import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.mylyn.tasks.tests.MylarTasksTestsPlugin;
+import org.eclipse.mylyn.tasks.tests.TasksTestsPlugin;
/**
* @author Mik Kersten
@@ -29,7 +29,7 @@ public class BugzillaTestUtil {
public static File getLocalFile(String path) {
try {
- URL installURL = MylarTasksTestsPlugin.getDefault().getBundle().getEntry(path);
+ URL installURL = TasksTestsPlugin.getDefault().getBundle().getEntry(path);
URL localURL = FileLocator.toFileURL(installURL);
return new File(localURL.getFile());
} catch (IOException e) {
diff --git a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/RepositoryEditorWizardTest.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/RepositoryEditorWizardTest.java
index 916dd849d..e7e2644ab 100644
--- a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/RepositoryEditorWizardTest.java
+++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/RepositoryEditorWizardTest.java
@@ -17,8 +17,8 @@ import junit.framework.TestCase;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.mylyn.context.tests.support.MylarTestUtils;
-import org.eclipse.mylyn.context.tests.support.MylarTestUtils.Credentials;
+import org.eclipse.mylyn.context.tests.support.TestUtil;
+import org.eclipse.mylyn.context.tests.support.TestUtil.Credentials;
import org.eclipse.mylyn.core.net.WebClientUtil;
import org.eclipse.mylyn.internal.bugzilla.core.BugzillaClient;
import org.eclipse.mylyn.internal.bugzilla.core.BugzillaClientFactory;
@@ -46,7 +46,7 @@ public class RepositoryEditorWizardTest extends TestCase {
manager = TasksUiPlugin.getRepositoryManager();
manager.clearRepositories(TasksUiPlugin.getDefault().getRepositoriesFilePath());
repository = new TaskRepository(BugzillaCorePlugin.REPOSITORY_KIND, IBugzillaConstants.TEST_BUGZILLA_222_URL);
- Credentials credentials = MylarTestUtils.readCredentials();
+ Credentials credentials = TestUtil.readCredentials();
repository.setAuthenticationCredentials(credentials.username, credentials.password);
repository.setAnonymous(false);
TasksUiPlugin.getRepositoryManager().addRepository(repository,
diff --git a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/RepositoryReportFactoryTest.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/RepositoryReportFactoryTest.java
index d6af34224..7b868975f 100644
--- a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/RepositoryReportFactoryTest.java
+++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/RepositoryReportFactoryTest.java
@@ -15,8 +15,8 @@ import junit.framework.TestCase;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.mylyn.context.tests.support.MylarTestUtils;
-import org.eclipse.mylyn.context.tests.support.MylarTestUtils.Credentials;
+import org.eclipse.mylyn.context.tests.support.TestUtil;
+import org.eclipse.mylyn.context.tests.support.TestUtil.Credentials;
import org.eclipse.mylyn.internal.bugzilla.core.BugzillaAttributeFactory;
import org.eclipse.mylyn.internal.bugzilla.core.BugzillaClient;
import org.eclipse.mylyn.internal.bugzilla.core.BugzillaCorePlugin;
@@ -51,7 +51,7 @@ public class RepositoryReportFactoryTest extends TestCase {
connector = (BugzillaRepositoryConnector) TasksUiPlugin.getRepositoryManager().getRepositoryConnector(
BugzillaCorePlugin.REPOSITORY_KIND);
repository = new TaskRepository(kind, url);
- Credentials credentials = MylarTestUtils.readCredentials();
+ Credentials credentials = TestUtil.readCredentials();
repository.setAuthenticationCredentials(credentials.username, credentials.password);
return repository;
}
diff --git a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/headless/BugzillaQueryTest.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/headless/BugzillaQueryTest.java
index 9e4eb0eda..29c77f92d 100644
--- a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/headless/BugzillaQueryTest.java
+++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/headless/BugzillaQueryTest.java
@@ -14,8 +14,8 @@ package org.eclipse.mylyn.bugzilla.tests.headless;
import junit.framework.TestCase;
import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.mylyn.context.tests.support.MylarTestUtils;
-import org.eclipse.mylyn.context.tests.support.MylarTestUtils.Credentials;
+import org.eclipse.mylyn.context.tests.support.TestUtil;
+import org.eclipse.mylyn.context.tests.support.TestUtil.Credentials;
import org.eclipse.mylyn.internal.bugzilla.core.BugzillaCorePlugin;
import org.eclipse.mylyn.internal.bugzilla.core.BugzillaReportElement;
import org.eclipse.mylyn.internal.bugzilla.core.BugzillaRepositoryConnector;
@@ -57,7 +57,7 @@ public class BugzillaQueryTest extends TestCase {
connector.init(new TaskList());
handler = connector.getTaskDataHandler();
repository = new TaskRepository(BugzillaCorePlugin.REPOSITORY_KIND, IBugzillaConstants.TEST_BUGZILLA_222_URL);
- Credentials credentials = MylarTestUtils.readCredentials();
+ Credentials credentials = TestUtil.readCredentials();
repository.setAuthenticationCredentials(credentials.username, credentials.password);
}
@@ -67,7 +67,7 @@ public class BugzillaQueryTest extends TestCase {
*/
public void testAddCredentials() {
if (!repository.hasCredentials()) {
- Credentials credentials = MylarTestUtils.readCredentials();
+ Credentials credentials = TestUtil.readCredentials();
repository.setAuthenticationCredentials(credentials.username, credentials.password);
assertTrue(repository.hasCredentials());
diff --git a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/headless/BugzillaTaskHistoryTest.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/headless/BugzillaTaskHistoryTest.java
index 024b44fa2..055073c46 100644
--- a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/headless/BugzillaTaskHistoryTest.java
+++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/headless/BugzillaTaskHistoryTest.java
@@ -19,8 +19,8 @@ import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import org.eclipse.mylyn.bugzilla.tests.AbstractBugzillaTest;
-import org.eclipse.mylyn.context.tests.support.MylarTestUtils;
-import org.eclipse.mylyn.context.tests.support.MylarTestUtils.Credentials;
+import org.eclipse.mylyn.context.tests.support.TestUtil;
+import org.eclipse.mylyn.context.tests.support.TestUtil.Credentials;
import org.eclipse.mylyn.internal.bugzilla.core.BugzillaClient;
import org.eclipse.mylyn.internal.bugzilla.core.BugzillaCorePlugin;
import org.eclipse.mylyn.internal.bugzilla.core.BugzillaRepositoryConnector;
@@ -48,7 +48,7 @@ public class BugzillaTaskHistoryTest extends AbstractBugzillaTest {
connector.init(new TaskList());
repository = new TaskRepository(BugzillaCorePlugin.REPOSITORY_KIND, IBugzillaConstants.TEST_BUGZILLA_222_URL);
- Credentials credentials = MylarTestUtils.readCredentials();
+ Credentials credentials = TestUtil.readCredentials();
repository.setAuthenticationCredentials(credentials.username, credentials.password);
}
diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/MylarMessages.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/TasksMessages.java
index eb914b94e..7a1bf7727 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/MylarMessages.java
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/TasksMessages.java
@@ -16,15 +16,15 @@ import org.eclipse.osgi.util.NLS;
/**
* @author Rob Elves
*/
-public class MylarMessages extends NLS {
+public class TasksMessages extends NLS {
private static final String BUNDLE_NAME = "org.eclipse.mylyn.tasks.core.MylarMessages";//$NON-NLS-1$
static {
- NLS.initializeMessages(BUNDLE_NAME, MylarMessages.class);
+ NLS.initializeMessages(BUNDLE_NAME, TasksMessages.class);
}
- private MylarMessages() {
+ private TasksMessages() {
// Do not instantiate
}
diff --git a/org.eclipse.mylyn.tasks.tests/META-INF/MANIFEST.MF b/org.eclipse.mylyn.tasks.tests/META-INF/MANIFEST.MF
index d9ad4cc19..3168a4260 100644
--- a/org.eclipse.mylyn.tasks.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.tasks.tests/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: Mylar Tasks Tests Plug-in
Bundle-SymbolicName: org.eclipse.mylyn.tasks.tests;singleton:=true
Bundle-Version: 0.0.0
-Bundle-Activator: org.eclipse.mylyn.tasks.tests.MylarTasksTestsPlugin
+Bundle-Activator: org.eclipse.mylyn.tasks.tests.TasksTestsPlugin
Bundle-Vendor: Eclipse.org
Require-Bundle: org.eclipse.core.runtime,
org.junit,
diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskTestUtil.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskTestUtil.java
index 228af2150..7aecde6db 100644
--- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskTestUtil.java
+++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskTestUtil.java
@@ -28,7 +28,7 @@ public class TaskTestUtil {
public static File getLocalFile(String path) {
try {
- URL installURL = MylarTasksTestsPlugin.getDefault().getBundle().getEntry(path);
+ URL installURL = TasksTestsPlugin.getDefault().getBundle().getEntry(path);
URL localURL = FileLocator.toFileURL(installURL);
return new File(localURL.getFile());
} catch (IOException e) {
diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/MylarTasksTestsPlugin.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TasksTestsPlugin.java
index 046a27fde..bb353b9bd 100644
--- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/MylarTasksTestsPlugin.java
+++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TasksTestsPlugin.java
@@ -16,14 +16,14 @@ import org.osgi.framework.BundleContext;
/**
* The main plugin class to be used in the desktop.
*/
-public class MylarTasksTestsPlugin extends Plugin {
+public class TasksTestsPlugin extends Plugin {
// The shared instance.
- private static MylarTasksTestsPlugin plugin;
+ private static TasksTestsPlugin plugin;
/**
* The constructor.
*/
- public MylarTasksTestsPlugin() {
+ public TasksTestsPlugin() {
super();
plugin = this;
}
@@ -42,7 +42,7 @@ public class MylarTasksTestsPlugin extends Plugin {
/**
* Returns the shared instance.
*/
- public static MylarTasksTestsPlugin getDefault() {
+ public static TasksTestsPlugin getDefault() {
return plugin;
}
diff --git a/org.eclipse.mylyn.tasks.ui/plugin.xml b/org.eclipse.mylyn.tasks.ui/plugin.xml
index 6308dc39e..b4d0099a9 100644
--- a/org.eclipse.mylyn.tasks.ui/plugin.xml
+++ b/org.eclipse.mylyn.tasks.ui/plugin.xml
@@ -432,13 +432,13 @@
<extension point="org.eclipse.ui.preferencePages">
<page
name="Task-Focused UI"
- class="org.eclipse.mylyn.internal.tasks.ui.preferences.MylarPreferencePage"
+ class="org.eclipse.mylyn.internal.tasks.ui.preferences.TaskFocusedUiPreferencePage"
id="org.eclipse.mylyn.ui.preferences">
<keywordReference id="org.eclipse.mylyn.tasks.keywords"/>
</page>
<page
name="Task List"
- class="org.eclipse.mylyn.internal.tasks.ui.preferences.TasksPreferencePage"
+ class="org.eclipse.mylyn.internal.tasks.ui.preferences.TasksUiPreferencePage"
id="org.eclipse.mylyn.tasks.ui.preferences"
category="org.eclipse.mylyn.ui.preferences">
<keywordReference id="org.eclipse.mylyn.tasks.ui.keywords"/>
@@ -594,7 +594,7 @@
<extension
point="org.eclipse.mylyn.tasks.ui.editors">
<hyperlinkDetector
- class="org.eclipse.mylyn.tasks.ui.editors.MylarUrlHyperlinkDetector"
+ class="org.eclipse.mylyn.tasks.ui.editors.TaskUrlHyperlinkDetector"
id="org.eclipse.mylyn.tasks.ui.hyperlink.detector.url"/>
</extension>
@@ -782,7 +782,7 @@
targetId="org.eclipse.ui.DefaultTextEditor">
</hyperlinkDetector>
<hyperlinkDetector
- class="org.eclipse.mylyn.tasks.ui.editors.MylarUrlHyperlinkDetector"
+ class="org.eclipse.mylyn.tasks.ui.editors.TaskUrlHyperlinkDetector"
description="Mylyn enabled URL hyperlink detector"
id="org.eclipse.mylyn.tasks.ui.hyperlinks.detectors.url"
name="Mylyn URLs"
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/OpenTasksUiPreferencesAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/OpenTasksUiPreferencesAction.java
index 9ca7c0556..be4adf2b9 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/OpenTasksUiPreferencesAction.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/OpenTasksUiPreferencesAction.java
@@ -9,7 +9,7 @@
package org.eclipse.mylyn.internal.tasks.ui.actions;
import org.eclipse.jface.action.Action;
-import org.eclipse.mylyn.internal.tasks.ui.preferences.TasksPreferencePage;
+import org.eclipse.mylyn.internal.tasks.ui.preferences.TasksUiPreferencePage;
import org.eclipse.mylyn.tasks.ui.TasksUiUtil;
/**
@@ -29,6 +29,6 @@ public class OpenTasksUiPreferencesAction extends Action {
@Override
public void run() {
- TasksUiUtil.showPreferencePage(TasksPreferencePage.ID, new TasksPreferencePage());
+ TasksUiUtil.showPreferencePage(TasksUiPreferencePage.ID, new TasksUiPreferencePage());
}
}
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/preferences/MylarPreferencePage.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/preferences/TaskFocusedUiPreferencePage.java
index fe1f03fe0..6f35fd630 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/preferences/MylarPreferencePage.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/preferences/TaskFocusedUiPreferencePage.java
@@ -20,7 +20,7 @@ import org.eclipse.ui.IWorkbenchPreferencePage;
/**
* @author Mik Kersten
*/
-public class MylarPreferencePage extends PreferencePage implements IWorkbenchPreferencePage {
+public class TaskFocusedUiPreferencePage extends PreferencePage implements IWorkbenchPreferencePage {
@Override
protected Control createContents(Composite parent) {
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/preferences/TasksPreferencePage.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/preferences/TasksUiPreferencePage.java
index 63a86b661..de0f70dc8 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/preferences/TasksPreferencePage.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/preferences/TasksUiPreferencePage.java
@@ -47,7 +47,7 @@ import org.eclipse.ui.preferences.IWorkbenchPreferenceContainer;
* @author Mik Kersten
* @author Rob Elves
*/
-public class TasksPreferencePage extends PreferencePage implements IWorkbenchPreferencePage {
+public class TasksUiPreferencePage extends PreferencePage implements IWorkbenchPreferencePage {
public static final String ID = "org.eclipse.mylyn.tasks.ui.preferences";
@@ -103,7 +103,7 @@ public class TasksPreferencePage extends PreferencePage implements IWorkbenchPre
private int taskDataDirectoryAction = -1;
- public TasksPreferencePage() {
+ public TasksUiPreferencePage() {
super();
setPreferenceStore(TasksUiPlugin.getDefault().getPreferenceStore());
}
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/MylarUrlHyperlink.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/TaskUrlHyperlink.java
index b40e3a135..e1d07b37b 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/MylarUrlHyperlink.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/TaskUrlHyperlink.java
@@ -15,9 +15,9 @@ import org.eclipse.mylyn.tasks.ui.TasksUiUtil;
/**
* @author Rob Elves
*/
-public class MylarUrlHyperlink extends URLHyperlink {
+public class TaskUrlHyperlink extends URLHyperlink {
- public MylarUrlHyperlink(IRegion region, String urlString) {
+ public TaskUrlHyperlink(IRegion region, String urlString) {
super(region, urlString);
}
@Override
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/MylarUrlHyperlinkDetector.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/TaskUrlHyperlinkDetector.java
index 2fd22a259..46261ff35 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/MylarUrlHyperlinkDetector.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/TaskUrlHyperlinkDetector.java
@@ -25,7 +25,7 @@ import org.eclipse.jface.text.hyperlink.IHyperlink;
*
* @author Rob Elves
*/
-public class MylarUrlHyperlinkDetector extends AbstractHyperlinkDetector {
+public class TaskUrlHyperlinkDetector extends AbstractHyperlinkDetector {
public IHyperlink[] detectHyperlinks(ITextViewer textViewer, IRegion region, boolean canShowMultipleHyperlinks) {
if (region == null || textViewer == null)
@@ -109,6 +109,6 @@ public class MylarUrlHyperlinkDetector extends AbstractHyperlinkDetector {
}
IRegion urlRegion = new Region(lineInfo.getOffset() + urlOffsetInLine, urlLength);
- return new IHyperlink[] { new MylarUrlHyperlink(urlRegion, urlString) };
+ return new IHyperlink[] { new TaskUrlHyperlink(urlRegion, urlString) };
}
}
diff --git a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/AbstractTracClientRepositoryTest.java b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/AbstractTracClientRepositoryTest.java
index b49f85d23..9c326640b 100644
--- a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/AbstractTracClientRepositoryTest.java
+++ b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/AbstractTracClientRepositoryTest.java
@@ -15,9 +15,9 @@ import java.net.InetSocketAddress;
import java.net.Proxy;
import java.net.Proxy.Type;
-import org.eclipse.mylyn.context.tests.support.MylarTestUtils;
-import org.eclipse.mylyn.context.tests.support.MylarTestUtils.Credentials;
-import org.eclipse.mylyn.context.tests.support.MylarTestUtils.PrivilegeLevel;
+import org.eclipse.mylyn.context.tests.support.TestUtil;
+import org.eclipse.mylyn.context.tests.support.TestUtil.Credentials;
+import org.eclipse.mylyn.context.tests.support.TestUtil.PrivilegeLevel;
import org.eclipse.mylyn.internal.trac.core.ITracClient;
import org.eclipse.mylyn.internal.trac.core.TracException;
import org.eclipse.mylyn.internal.trac.core.TracLoginException;
@@ -51,7 +51,7 @@ public class AbstractTracClientRepositoryTest extends AbstractTracClientTest {
}
protected void validate(String url) throws Exception {
- Credentials credentials = MylarTestUtils.readCredentials(PrivilegeLevel.USER);
+ Credentials credentials = TestUtil.readCredentials(PrivilegeLevel.USER);
// standard connect
connect(url);
diff --git a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/AbstractTracClientTest.java b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/AbstractTracClientTest.java
index 55d588513..bff6383aa 100644
--- a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/AbstractTracClientTest.java
+++ b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/AbstractTracClientTest.java
@@ -15,9 +15,9 @@ import java.net.Proxy;
import junit.framework.TestCase;
-import org.eclipse.mylyn.context.tests.support.MylarTestUtils;
-import org.eclipse.mylyn.context.tests.support.MylarTestUtils.Credentials;
-import org.eclipse.mylyn.context.tests.support.MylarTestUtils.PrivilegeLevel;
+import org.eclipse.mylyn.context.tests.support.TestUtil;
+import org.eclipse.mylyn.context.tests.support.TestUtil.Credentials;
+import org.eclipse.mylyn.context.tests.support.TestUtil.PrivilegeLevel;
import org.eclipse.mylyn.internal.trac.core.ITracClient;
import org.eclipse.mylyn.internal.trac.core.TracClientFactory;
import org.eclipse.mylyn.internal.trac.core.ITracClient.Version;
@@ -75,7 +75,7 @@ public abstract class AbstractTracClientTest extends TestCase {
}
public ITracClient connect(String url, Proxy proxy) throws Exception {
- Credentials credentials = MylarTestUtils.readCredentials(level);
+ Credentials credentials = TestUtil.readCredentials(level);
return connect(url, credentials.username, credentials.password, proxy);
}
diff --git a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/RepositorySearchQueryTest.java b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/RepositorySearchQueryTest.java
index b9f5574f5..3c9df42f6 100644
--- a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/RepositorySearchQueryTest.java
+++ b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/RepositorySearchQueryTest.java
@@ -14,9 +14,9 @@ package org.eclipse.mylyn.trac.tests;
import junit.framework.TestCase;
import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.mylyn.context.tests.support.MylarTestUtils;
-import org.eclipse.mylyn.context.tests.support.MylarTestUtils.Credentials;
-import org.eclipse.mylyn.context.tests.support.MylarTestUtils.PrivilegeLevel;
+import org.eclipse.mylyn.context.tests.support.TestUtil;
+import org.eclipse.mylyn.context.tests.support.TestUtil.Credentials;
+import org.eclipse.mylyn.context.tests.support.TestUtil.PrivilegeLevel;
import org.eclipse.mylyn.internal.trac.core.ITracClient;
import org.eclipse.mylyn.internal.trac.core.TracCorePlugin;
import org.eclipse.mylyn.internal.trac.core.TracRepositoryQuery;
@@ -60,7 +60,7 @@ public class RepositorySearchQueryTest extends TestCase {
}
protected void init(String url, Version version) {
- Credentials credentials = MylarTestUtils.readCredentials(PrivilegeLevel.USER);
+ Credentials credentials = TestUtil.readCredentials(PrivilegeLevel.USER);
repository = new TaskRepository(TracCorePlugin.REPOSITORY_KIND, url);
repository.setAuthenticationCredentials(credentials.username, credentials.password);
diff --git a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracAttachmentHandlerTest.java b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracAttachmentHandlerTest.java
index 63cfe4bf5..ffbfd1b68 100644
--- a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracAttachmentHandlerTest.java
+++ b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracAttachmentHandlerTest.java
@@ -21,9 +21,9 @@ import junit.framework.TestCase;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.mylyn.context.tests.support.MylarTestUtils;
-import org.eclipse.mylyn.context.tests.support.MylarTestUtils.Credentials;
-import org.eclipse.mylyn.context.tests.support.MylarTestUtils.PrivilegeLevel;
+import org.eclipse.mylyn.context.tests.support.TestUtil;
+import org.eclipse.mylyn.context.tests.support.TestUtil.Credentials;
+import org.eclipse.mylyn.context.tests.support.TestUtil.PrivilegeLevel;
import org.eclipse.mylyn.internal.trac.core.ITracClient;
import org.eclipse.mylyn.internal.trac.core.TracCorePlugin;
import org.eclipse.mylyn.internal.trac.core.TracRepositoryConnector;
@@ -70,7 +70,7 @@ public class TracAttachmentHandlerTest extends TestCase {
protected void init(String url, Version version) {
String kind = TracCorePlugin.REPOSITORY_KIND;
- Credentials credentials = MylarTestUtils.readCredentials(PrivilegeLevel.USER);
+ Credentials credentials = TestUtil.readCredentials(PrivilegeLevel.USER);
repository = new TaskRepository(kind, url);
repository.setAuthenticationCredentials(credentials.username, credentials.password);
diff --git a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracClientFactoryTest.java b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracClientFactoryTest.java
index b90a42305..5d943a9bb 100644
--- a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracClientFactoryTest.java
+++ b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracClientFactoryTest.java
@@ -15,9 +15,9 @@ import java.net.Proxy;
import junit.framework.TestCase;
-import org.eclipse.mylyn.context.tests.support.MylarTestUtils;
-import org.eclipse.mylyn.context.tests.support.MylarTestUtils.Credentials;
-import org.eclipse.mylyn.context.tests.support.MylarTestUtils.PrivilegeLevel;
+import org.eclipse.mylyn.context.tests.support.TestUtil;
+import org.eclipse.mylyn.context.tests.support.TestUtil.Credentials;
+import org.eclipse.mylyn.context.tests.support.TestUtil.PrivilegeLevel;
import org.eclipse.mylyn.internal.trac.core.ITracClient;
import org.eclipse.mylyn.internal.trac.core.TracWebClient;
import org.eclipse.mylyn.internal.trac.core.TracClientFactory;
@@ -65,7 +65,7 @@ public class TracClientFactoryTest extends TestCase {
}
protected void probeClient(String url, boolean xmlrpcInstalled) throws Exception {
- Credentials credentials = MylarTestUtils.readCredentials(PrivilegeLevel.USER);
+ Credentials credentials = TestUtil.readCredentials(PrivilegeLevel.USER);
Version version = TracClientFactory.probeClient(url, credentials.username, credentials.password, Proxy.NO_PROXY);
if (xmlrpcInstalled) {
assertEquals(Version.XML_RPC, version);
diff --git a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracRepositoryConnectorTest.java b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracRepositoryConnectorTest.java
index 3fd4f3864..9e4ad4f68 100644
--- a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracRepositoryConnectorTest.java
+++ b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracRepositoryConnectorTest.java
@@ -25,9 +25,9 @@ import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.jface.wizard.WizardDialog;
import org.eclipse.mylyn.context.core.ContextCorePlugin;
-import org.eclipse.mylyn.context.tests.support.MylarTestUtils;
-import org.eclipse.mylyn.context.tests.support.MylarTestUtils.Credentials;
-import org.eclipse.mylyn.context.tests.support.MylarTestUtils.PrivilegeLevel;
+import org.eclipse.mylyn.context.tests.support.TestUtil;
+import org.eclipse.mylyn.context.tests.support.TestUtil.Credentials;
+import org.eclipse.mylyn.context.tests.support.TestUtil.PrivilegeLevel;
import org.eclipse.mylyn.internal.tasks.ui.wizards.EditRepositoryWizard;
import org.eclipse.mylyn.internal.trac.core.ITracClient;
import org.eclipse.mylyn.internal.trac.core.InvalidTicketException;
@@ -88,7 +88,7 @@ public class TracRepositoryConnectorTest extends TestCase {
protected void init(String url, Version version) {
String kind = TracCorePlugin.REPOSITORY_KIND;
- Credentials credentials = MylarTestUtils.readCredentials(PrivilegeLevel.USER);
+ Credentials credentials = TestUtil.readCredentials(PrivilegeLevel.USER);
repository = new TaskRepository(kind, url);
repository.setAuthenticationCredentials(credentials.username, credentials.password);
diff --git a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracTaskDataHandlerTest.java b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracTaskDataHandlerTest.java
index 04aef35b8..f9935ef44 100644
--- a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracTaskDataHandlerTest.java
+++ b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracTaskDataHandlerTest.java
@@ -18,9 +18,9 @@ import junit.framework.TestCase;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.mylyn.context.tests.support.MylarTestUtils;
-import org.eclipse.mylyn.context.tests.support.MylarTestUtils.Credentials;
-import org.eclipse.mylyn.context.tests.support.MylarTestUtils.PrivilegeLevel;
+import org.eclipse.mylyn.context.tests.support.TestUtil;
+import org.eclipse.mylyn.context.tests.support.TestUtil.Credentials;
+import org.eclipse.mylyn.context.tests.support.TestUtil.PrivilegeLevel;
import org.eclipse.mylyn.internal.trac.core.ITracClient;
import org.eclipse.mylyn.internal.trac.core.TracCorePlugin;
import org.eclipse.mylyn.internal.trac.core.TracRepositoryConnector;
@@ -66,7 +66,7 @@ public class TracTaskDataHandlerTest extends TestCase {
}
protected void init(String url, Version version) {
- Credentials credentials = MylarTestUtils.readCredentials(PrivilegeLevel.USER);
+ Credentials credentials = TestUtil.readCredentials(PrivilegeLevel.USER);
repository = new TaskRepository(TracCorePlugin.REPOSITORY_KIND, url);
repository.setAuthenticationCredentials(credentials.username, credentials.password);
diff --git a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracXmlRpcTest.java b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracXmlRpcTest.java
index c9052369a..db3459681 100644
--- a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracXmlRpcTest.java
+++ b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracXmlRpcTest.java
@@ -25,9 +25,9 @@ import junit.framework.TestCase;
import org.apache.xmlrpc.XmlRpcException;
import org.apache.xmlrpc.client.XmlRpcClient;
import org.apache.xmlrpc.client.XmlRpcClientConfigImpl;
-import org.eclipse.mylyn.context.tests.support.MylarTestUtils;
-import org.eclipse.mylyn.context.tests.support.MylarTestUtils.Credentials;
-import org.eclipse.mylyn.context.tests.support.MylarTestUtils.PrivilegeLevel;
+import org.eclipse.mylyn.context.tests.support.TestUtil;
+import org.eclipse.mylyn.context.tests.support.TestUtil.Credentials;
+import org.eclipse.mylyn.context.tests.support.TestUtil.PrivilegeLevel;
import org.eclipse.mylyn.internal.trac.core.util.TracHttpClientTransportFactory;
/**
@@ -61,7 +61,7 @@ public class TracXmlRpcTest extends TestCase {
random = new Random();
- Credentials credentials = MylarTestUtils.readCredentials(PrivilegeLevel.ADMIN);
+ Credentials credentials = TestUtil.readCredentials(PrivilegeLevel.ADMIN);
createConnection(new URL(Constants.TEST_TRAC_010_URL + XMLRPC_URL), credentials.username, credentials.password);
tickets = new ArrayList<Integer>();
diff --git a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/support/TestCleanupUtil.java b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/support/TestCleanupUtil.java
index 3a10b63c5..a862fa7b2 100644
--- a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/support/TestCleanupUtil.java
+++ b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/support/TestCleanupUtil.java
@@ -1,6 +1,6 @@
package org.eclipse.mylyn.trac.tests.support;
-import org.eclipse.mylyn.context.tests.support.MylarTestUtils.PrivilegeLevel;
+import org.eclipse.mylyn.context.tests.support.TestUtil.PrivilegeLevel;
import org.eclipse.mylyn.internal.trac.core.TracException;
import org.eclipse.mylyn.internal.trac.core.ITracClient.Version;
import org.eclipse.mylyn.internal.trac.core.model.TracAttachment;
diff --git a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/support/TestFixture.java b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/support/TestFixture.java
index 1b11737d0..fde931bed 100644
--- a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/support/TestFixture.java
+++ b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/support/TestFixture.java
@@ -11,9 +11,9 @@
package org.eclipse.mylyn.trac.tests.support;
-import org.eclipse.mylyn.context.tests.support.MylarTestUtils;
-import org.eclipse.mylyn.context.tests.support.MylarTestUtils.Credentials;
-import org.eclipse.mylyn.context.tests.support.MylarTestUtils.PrivilegeLevel;
+import org.eclipse.mylyn.context.tests.support.TestUtil;
+import org.eclipse.mylyn.context.tests.support.TestUtil.Credentials;
+import org.eclipse.mylyn.context.tests.support.TestUtil.PrivilegeLevel;
import org.eclipse.mylyn.trac.tests.Constants;
/**
@@ -79,7 +79,7 @@ public class TestFixture {
public static XmlRpcServer.TestData init010() throws Exception {
if (data010 == null) {
- Credentials credentials = MylarTestUtils.readCredentials(PrivilegeLevel.USER);
+ Credentials credentials = TestUtil.readCredentials(PrivilegeLevel.USER);
XmlRpcServer server = new XmlRpcServer(Constants.TEST_TRAC_010_URL, credentials.username,
credentials.password);

Back to the top