Eclipse 4.7 compatibility fix

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/navigator/database/DatabaseNavigatorTree.java

@@ -263,12 +263,15 @@ public class DatabaseNavigatorTree extends Composite implements INavigatorListen
                 UIUtils.runInProgressService(runnable);
                 if (runnable.getResult() != null) {
                     showNode(runnable.getResult());
-                    // TODO: it is a bug in Eclipse.
+                    treeViewer.expandToLevel(runnable.getResult(), 1);
+/*
+                    // TODO: it is a bug in Eclipse Photon.
                     try {
                         treeViewer.expandToLevel(runnable.getResult(), 1, true);
                     } catch (Throwable e) {
                         treeViewer.expandToLevel(runnable.getResult(), 1);
                     }
+*/
                 }
             } catch (InvocationTargetException e) {
                 log.error("Can't expand node", e.getTargetException());

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/preferences/PrefPageSQLEditor.java

@@ -125,11 +125,11 @@ public class PrefPageSQLEditor extends TargetPrefPage
             UIUtils.installContentProposal(
                     scriptTitlePattern,
                     new TextContentAdapter(),
-                    new SimpleContentProposalProvider(
+                    new SimpleContentProposalProvider(new String[] {
                         GeneralUtils.variablePattern(SQLEditor.VAR_CONNECTION_NAME),
                         GeneralUtils.variablePattern(SQLEditor.VAR_DRIVER_NAME),
                         GeneralUtils.variablePattern(SQLEditor.VAR_FILE_NAME),
-                        GeneralUtils.variablePattern(SQLEditor.VAR_FILE_EXT)));
+                        GeneralUtils.variablePattern(SQLEditor.VAR_FILE_EXT)}));
             UIUtils.setContentProposalToolTip(scriptTitlePattern, "Output file name patterns",
                     SQLEditor.VAR_CONNECTION_NAME, SQLEditor.VAR_DRIVER_NAME, SQLEditor.VAR_FILE_NAME, SQLEditor.VAR_FILE_EXT);
         }

plugins/org.jkiss.dbeaver.data.transfer/src/org/jkiss/dbeaver/tools/transfer/stream/page/StreamConsumerPageOutput.java

@@ -106,14 +106,15 @@ public class StreamConsumerPageOutput extends ActiveWizardPage<DataTransferWizar
             UIUtils.installContentProposal(
                 fileNameText,
                 new TextContentAdapter(),
-                new SimpleContentProposalProvider(
+                new SimpleContentProposalProvider(new String[] {
                     GeneralUtils.variablePattern(StreamTransferConsumer.VARIABLE_DATASOURCE),
                     GeneralUtils.variablePattern(StreamTransferConsumer.VARIABLE_CATALOG),
                     GeneralUtils.variablePattern(StreamTransferConsumer.VARIABLE_SCHEMA),
                     GeneralUtils.variablePattern(StreamTransferConsumer.VARIABLE_TABLE),
                     GeneralUtils.variablePattern(StreamTransferConsumer.VARIABLE_TIMESTAMP),
                     GeneralUtils.variablePattern(StreamTransferConsumer.VARIABLE_DATE),
-                    GeneralUtils.variablePattern(StreamTransferConsumer.VARIABLE_PROJECT)));
+                    GeneralUtils.variablePattern(StreamTransferConsumer.VARIABLE_PROJECT)
+                }));
 
             {
                 UIUtils.createControlLabel(generalSettings, DTMessages.data_transfer_wizard_output_label_encoding);
@@ -185,12 +186,12 @@ public class StreamConsumerPageOutput extends ActiveWizardPage<DataTransferWizar
             UIUtils.installContentProposal(
                 execProcessText,
                 new TextContentAdapter(),
-                new SimpleContentProposalProvider(
+                new SimpleContentProposalProvider(new String[] {
                     GeneralUtils.variablePattern(StreamTransferConsumer.VARIABLE_TABLE),
                     GeneralUtils.variablePattern(StreamTransferConsumer.VARIABLE_TIMESTAMP),
                     GeneralUtils.variablePattern(StreamTransferConsumer.VARIABLE_DATE),
                     GeneralUtils.variablePattern(StreamTransferConsumer.VARIABLE_PROJECT),
-                    GeneralUtils.variablePattern(StreamTransferConsumer.VARIABLE_FILE)));
+                    GeneralUtils.variablePattern(StreamTransferConsumer.VARIABLE_FILE)}));
 
             showFinalMessageCheckbox = UIUtils.createCheckbox(resultsSettings, "Show finish message", null, getWizard().getSettings().isShowFinalMessage(), 4);
             showFinalMessageCheckbox.addSelectionListener(new SelectionAdapter() {