Data search in Eclipse plugin

Former-commit-id: fd79510b

plugins/org.jkiss.dbeaver.core.eclipse/plugin.xml

@@ -83,22 +83,36 @@
     <extension
           point="org.eclipse.search.searchPages">
        <page
-             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="Database Metadata">
+            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">
        </page>
+        <page
+            class="org.jkiss.dbeaver.core.eclipse.search.impl.data.SearchDataPageAdapter"
+            enabled="true"
+            icon="icons/metadata.png"
+            id="org.jkiss.dbeaver.core.eclipse.search.impl.data.SearchDataPageAdapter"
+            label="DB Full-Text">
+        </page>
     </extension>
     <extension
           point="org.eclipse.search.searchResultViewPages">
-       <viewPage
-             class="org.jkiss.dbeaver.core.eclipse.search.impl.metadata.SearchMetadataResultPageAdapter"
-             icon="icons/metadata.png"
-             id="org.jkiss.dbeaver.core.eclipse.search.impl.metadata.SearchMetadataResultPageAdapter"
-             label="Database Metadata Search Result"
-             searchResultClass="org.jkiss.dbeaver.core.eclipse.search.SearchResultAdapter">
-       </viewPage>
+        <viewPage
+            class="org.jkiss.dbeaver.core.eclipse.search.impl.metadata.SearchMetadataResultPageAdapter"
+            icon="icons/metadata.png"
+            id="org.jkiss.dbeaver.core.eclipse.search.impl.metadata.SearchMetadataResultPageAdapter"
+            label="Database Metadata Search Result"
+            searchResultClass="org.jkiss.dbeaver.core.eclipse.search.SearchResultAdapter">
+        </viewPage>
+        <viewPage
+            class="org.jkiss.dbeaver.core.eclipse.search.impl.data.SearchDataResultPageAdapter"
+            icon="icons/metadata.png"
+            id="org.jkiss.dbeaver.core.eclipse.search.impl.data.SearchDataResultPageAdapter"
+            label="Database Full-Text Search Result"
+            searchResultClass="org.jkiss.dbeaver.core.eclipse.search.SearchResultAdapter">
+        </viewPage>
     </extension>
 
 </plugin>

plugins/org.jkiss.dbeaver.core.eclipse/src/org/jkiss/dbeaver/core/eclipse/search/impl/metadata/SearchMetadataResultPageAdapter.java

 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());
     }
 
 }

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,

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"/>
         <searchProvider
                 id="database_data"
                 label="Full-text"

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/search/metadata/SearchMetadataResultsPage.java → plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/search/metadata/SearchDataResultsPage.java

@@ -21,9 +21,9 @@ package org.jkiss.dbeaver.ui.search.metadata;
 import org.jkiss.dbeaver.model.navigator.DBNNode;
 import org.jkiss.dbeaver.ui.search.AbstractSearchResultsPage;
 
-public class SearchMetadataResultsPage extends AbstractSearchResultsPage<DBNNode> {
+public class SearchDataResultsPage extends AbstractSearchResultsPage<DBNNode> {
 
-    public SearchMetadataResultsPage() {
+    public SearchDataResultsPage() {
     }
 
     @Override