From a04a51022daddef66b2df8a56458b4d12e0862f9 Mon Sep 17 00:00:00 2001
From: jurgen <serge-rider@users.noreply.github.com>
Date: Thu, 13 Aug 2015 16:07:32 +0000
Subject: [PATCH] Eclipse 4.5 (Mars) build. Mongo 3.0 fixes.

Former-commit-id: a286e4447ac93e79b36cc1f1e51e36594e563c78
---
 features/org.jkiss.dbeaver.rcp/feature.xml    | 21 +++++++++++++++++++
 .../dbeaver/ui/dialogs/ResourceInfoPage.java  |  3 +--
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/features/org.jkiss.dbeaver.rcp/feature.xml b/features/org.jkiss.dbeaver.rcp/feature.xml
index b6f2ad8165..55b80baa51 100644
--- a/features/org.jkiss.dbeaver.rcp/feature.xml
+++ b/features/org.jkiss.dbeaver.rcp/feature.xml
@@ -258,6 +258,13 @@
             version="0.0.0"
             unpack="false"/>
 
+    <plugin
+            id="org.eclipse.e4.core.di.annotations"
+            download-size="0"
+            install-size="0"
+            version="0.0.0"
+            unpack="false"/>
+
     <plugin
             id="org.eclipse.e4.core.di.extensions"
             download-size="0"
@@ -386,6 +393,13 @@
             version="0.0.0"
             unpack="false"/>
 
+    <plugin
+            id="org.eclipse.e4.emf.xpath"
+            download-size="0"
+            install-size="0"
+            version="0.0.0"
+            unpack="false"/>
+
     <plugin
             id="org.eclipse.equinox.app"
             download-size="0"
@@ -750,6 +764,13 @@
             version="0.0.0"
             unpack="false"/>
 
+    <plugin
+            id="org.apache.commons.jxpath"
+            download-size="0"
+            install-size="0"
+            version="0.0.0"
+            unpack="false"/>
+
     <plugin
             id="org.objectweb.asm"
             download-size="0"
diff --git a/plugins/org.jkiss.dbeaver.core.application/src/org/jkiss/dbeaver/ui/dialogs/ResourceInfoPage.java b/plugins/org.jkiss.dbeaver.core.application/src/org/jkiss/dbeaver/ui/dialogs/ResourceInfoPage.java
index a5db1d6fa2..d3e8ae8acc 100644
--- a/plugins/org.jkiss.dbeaver.core.application/src/org/jkiss/dbeaver/ui/dialogs/ResourceInfoPage.java
+++ b/plugins/org.jkiss.dbeaver.core.application/src/org/jkiss/dbeaver/ui/dialogs/ResourceInfoPage.java
@@ -502,8 +502,7 @@ public class ResourceInfoPage extends PropertyPage {
             if (resource instanceof IFile) {
                 String contentType = getContentTypeString(description);
                 if (contentType != null) {
-                    return MessageFormat.format(FILE_TYPE_FORMAT,
-                        new String[]{contentType});
+                    return MessageFormat.format(FILE_TYPE_FORMAT, contentType);
                 }
             }
             return FILE_LABEL;
-- 
GitLab