From f7dfdb3f1da56b753290e3d08438f2203b5754f7 Mon Sep 17 00:00:00 2001 From: Steffen Pingel Date: Wed, 12 Jun 2013 21:36:29 +0200 Subject: 410062: [api] settings page constructor should not rely on overridden methods Change-Id: I8f167f7e10cbe903a9a62f5e1e7273031effbde9 Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=410062 --- .../mylyn/tasks/ui/wizards/AbstractRepositorySettingsPage.java | 4 ++++ .../eclipse/mylyn/tasks/ui/wizards/AbstractTaskRepositoryPage.java | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/wizards/AbstractRepositorySettingsPage.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/wizards/AbstractRepositorySettingsPage.java index c9c4dabb2..df1fd6776 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/wizards/AbstractRepositorySettingsPage.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/wizards/AbstractRepositorySettingsPage.java @@ -255,6 +255,10 @@ public abstract class AbstractRepositorySettingsPage extends AbstractTaskReposit connector = TasksUi.getRepositoryManager().getRepositoryConnector(getConnectorKind()); } this.connector = connector; + if (repository != null && !repository.getConnectorKind().equals(getConnectorKind())) { + throw new IllegalArgumentException( + "connectorKind of repository does not match connectorKind of page, expected '" + getConnectorKind() + "', got '" + repository.getConnectorKind() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + } setNeedsAnonymousLogin(false); setNeedsEncoding(true); setNeedsTimeZone(true); diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/wizards/AbstractTaskRepositoryPage.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/wizards/AbstractTaskRepositoryPage.java index 67878e03d..6dfb357ec 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/wizards/AbstractTaskRepositoryPage.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/wizards/AbstractTaskRepositoryPage.java @@ -88,10 +88,6 @@ public abstract class AbstractTaskRepositoryPage extends WizardPage implements I */ public AbstractTaskRepositoryPage(String title, String description, TaskRepository repository) { super(title); - if (repository != null && !repository.getConnectorKind().equals(getConnectorKind())) { - throw new IllegalArgumentException( - "connectorKind of repository does not match connectorKind of page, expected '" + getConnectorKind() + "', got '" + repository.getConnectorKind() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - } this.repository = repository; this.contributions = new ArrayList(); setTitle(title); -- cgit v1.2.3