diff options
author | mkersten | 2006-06-30 00:19:30 +0000 |
---|---|---|
committer | mkersten | 2006-06-30 00:19:30 +0000 |
commit | 2e9d2c2368f00668682105b2639a7cd39427c0a6 (patch) | |
tree | 4ea04f4c3c75ef7ffa88a26ea5f3d10b05b4f164 | |
parent | 2a08f25a677b8b4c8f0f430ce1b68e19b7e1d310 (diff) | |
download | org.eclipse.mylyn.tasks-2e9d2c2368f00668682105b2639a7cd39427c0a6.tar.gz org.eclipse.mylyn.tasks-2e9d2c2368f00668682105b2639a7cd39427c0a6.tar.xz org.eclipse.mylyn.tasks-2e9d2c2368f00668682105b2639a7cd39427c0a6.zip |
3.1 merge
-rw-r--r-- | org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/search/BugzillaSearchPage.java | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/search/BugzillaSearchPage.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/search/BugzillaSearchPage.java index 014f90e96..b55b9a989 100644 --- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/search/BugzillaSearchPage.java +++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/search/BugzillaSearchPage.java @@ -977,6 +977,10 @@ public class BugzillaSearchPage extends AbstractBugzillaQueryPage implements ISe repositoryCombo.setText(selectRepo); repository = MylarTaskListPlugin.getRepositoryManager().getRepository( BugzillaPlugin.REPOSITORY_KIND, repositoryCombo.getText()); + if (repository == null) { + repository = MylarTaskListPlugin.getRepositoryManager().getDefaultRepository( + BugzillaPlugin.REPOSITORY_KIND); + } } else { repositoryCombo.select(indexToSelect); } @@ -1020,12 +1024,15 @@ public class BugzillaSearchPage extends AbstractBugzillaQueryPage implements ISe * attributes so the component/version/milestone lists have the * proper values, then we can restore all the widget selections. */ - IDialogSettings settings = getDialogSettings(); - String repoId = "." + repository.getUrl(); - if (getWizard() == null && restoreQueryOptions && settings.getArray(STORE_PRODUCT_ID + repoId) != null && product != null) { - product.setSelection(nonNullArray(settings, STORE_PRODUCT_ID + repoId)); - updateAttributesFromRepository(repository.getUrl(), product.getSelection(), false); - restoreWidgetValues(); + if (repository != null) { + IDialogSettings settings = getDialogSettings(); + String repoId = "." + repository.getUrl(); + if (getWizard() == null && restoreQueryOptions && settings.getArray(STORE_PRODUCT_ID + repoId) != null + && product != null) { + product.setSelection(nonNullArray(settings, STORE_PRODUCT_ID + repoId)); + updateAttributesFromRepository(repository.getUrl(), product.getSelection(), false); + restoreWidgetValues(); + } } if (scontainer != null) { |