diff --git a/plugins/org.jkiss.dbeaver.core.eclipse/plugin.xml b/plugins/org.jkiss.dbeaver.core.eclipse/plugin.xml index 5a7d18adde1a08c8c132b99ba17a6a81d72d8b32..3e3750b29c7e2bea67642beaeec2964e493464d4 100644 --- a/plugins/org.jkiss.dbeaver.core.eclipse/plugin.xml +++ b/plugins/org.jkiss.dbeaver.core.eclipse/plugin.xml @@ -83,22 +83,36 @@ + class="org.jkiss.dbeaver.core.eclipse.search.impl.metadata.SearchMetadataPageAdapter" + enabled="true" + icon="icons/metadata.png" + id="org.jkiss.dbeaver.core.eclipse.search.impl.metadata.SearchMetadataPageAdapter" + label="DB Metadata"> + + - - + + + + diff --git a/plugins/org.jkiss.dbeaver.core.eclipse/src/org/jkiss/dbeaver/core/eclipse/search/impl/metadata/SearchMetadataResultPageAdapter.java b/plugins/org.jkiss.dbeaver.core.eclipse/src/org/jkiss/dbeaver/core/eclipse/search/impl/metadata/SearchMetadataResultPageAdapter.java index 0dc8ea084c98e7102b50b0710c3c42785db0aea1..9cb1ad8e61df3221250b2ad8c4dcf643de252693 100644 --- a/plugins/org.jkiss.dbeaver.core.eclipse/src/org/jkiss/dbeaver/core/eclipse/search/impl/metadata/SearchMetadataResultPageAdapter.java +++ b/plugins/org.jkiss.dbeaver.core.eclipse/src/org/jkiss/dbeaver/core/eclipse/search/impl/metadata/SearchMetadataResultPageAdapter.java @@ -1,7 +1,7 @@ package org.jkiss.dbeaver.core.eclipse.search.impl.metadata; import org.jkiss.dbeaver.core.eclipse.search.SearchResultPageAdapter; -import org.jkiss.dbeaver.ui.search.metadata.SearchMetadataResultsPage; +import org.jkiss.dbeaver.ui.search.metadata.SearchDataResultsPage; /** * Metadata search page adapter @@ -10,7 +10,7 @@ public class SearchMetadataResultPageAdapter extends SearchResultPageAdapter { public SearchMetadataResultPageAdapter() { - super(new SearchMetadataResultsPage()); + super(new SearchDataResultsPage()); } } diff --git a/plugins/org.jkiss.dbeaver.core/META-INF/MANIFEST.MF b/plugins/org.jkiss.dbeaver.core/META-INF/MANIFEST.MF index 0c90f0d89b522cdeab7d80e4516b94116945c579..ebd74901e83a0069583815a3e2bb75f173c87eac 100644 --- a/plugins/org.jkiss.dbeaver.core/META-INF/MANIFEST.MF +++ b/plugins/org.jkiss.dbeaver.core/META-INF/MANIFEST.MF @@ -34,9 +34,9 @@ Export-Package: org.apache.commons.logging, org.jkiss.dbeaver.model.impl.jdbc, org.jkiss.dbeaver.model.impl.jdbc.cache, org.jkiss.dbeaver.model.impl.jdbc.data, - org.jkiss.dbeaver.model.impl.jdbc.exec, org.jkiss.dbeaver.model.impl.jdbc.edit, org.jkiss.dbeaver.model.impl.jdbc.edit.struct, + org.jkiss.dbeaver.model.impl.jdbc.exec, org.jkiss.dbeaver.model.impl.jdbc.struct, org.jkiss.dbeaver.model.impl.resources, org.jkiss.dbeaver.model.impl.sql, @@ -110,6 +110,7 @@ Export-Package: org.apache.commons.logging, org.jkiss.dbeaver.ui.properties, org.jkiss.dbeaver.ui.properties.tabbed, org.jkiss.dbeaver.ui.search, + org.jkiss.dbeaver.ui.search.data, org.jkiss.dbeaver.ui.search.metadata, org.jkiss.dbeaver.ui.views, org.jkiss.dbeaver.ui.views.navigator.database, diff --git a/plugins/org.jkiss.dbeaver.core/plugin.xml b/plugins/org.jkiss.dbeaver.core/plugin.xml index f162128ec1234a9ff2b4703b7b6d5e1f726c2252..74bfc9efac4b4fe44574d9ef6a9e82173de9a76a 100644 --- a/plugins/org.jkiss.dbeaver.core/plugin.xml +++ b/plugins/org.jkiss.dbeaver.core/plugin.xml @@ -2335,7 +2335,7 @@ description="Search database metadata objects (tables, columns, etc)" icon="icons/tree/table.png" pageClass="org.jkiss.dbeaver.ui.search.metadata.SearchMetadataPage" - resultsClass="org.jkiss.dbeaver.ui.search.metadata.SearchMetadataResultsPage"/> + resultsClass="org.jkiss.dbeaver.ui.search.metadata.SearchDataResultsPage"/> { +public class SearchDataResultsPage extends AbstractSearchResultsPage { - public SearchMetadataResultsPage() { + public SearchDataResultsPage() { } @Override