Release 3.7.4.201709040350

juliuskunze · Oct 19, 2017 · b9c27ea · b9c27ea
1 parent 6c477e5
commit b9c27ea
Show file tree

Hide file tree

Showing 86 changed files with 288 additions and 178 deletions.
diff --git a/bundles/org.xmind.cathy.fonts/META-INF/MANIFEST.MF b/bundles/org.xmind.cathy.fonts/META-INF/MANIFEST.MF
@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.xmind.cathy.fonts
-Bundle-Version: 3.7.3.qualifier
+Bundle-Version: 3.7.4.qualifier
 Bundle-Vendor: %Bundle-Vendor
diff --git a/bundles/org.xmind.cathy.fonts/pom.xml b/bundles/org.xmind.cathy.fonts/pom.xml
@@ -5,12 +5,12 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.xmind.cathy.plugins</groupId>
     <artifactId>org.xmind.cathy.fonts</artifactId>
-    <version>3.7.3-SNAPSHOT</version>
+    <version>3.7.4-SNAPSHOT</version>
     <packaging>eclipse-plugin</packaging>
     <parent>
         <groupId>org.xmind.releng</groupId>
         <artifactId>org.xmind.cathy.releng</artifactId>
-        <version>3.7.3-SNAPSHOT</version>
+        <version>3.7.4-SNAPSHOT</version>
         <relativePath>../../</relativePath>
     </parent>
 </project>
diff --git a/bundles/org.xmind.cathy.win32/META-INF/MANIFEST.MF b/bundles/org.xmind.cathy.win32/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.xmind.cathy.win32;singleton:=true
-Bundle-Version: 3.7.3.qualifier
+Bundle-Version: 3.7.4.qualifier
 Bundle-Vendor: %providerName
 Fragment-Host: org.xmind.cathy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6

diff --git a/bundles/org.xmind.cathy.win32/pom.xml b/bundles/org.xmind.cathy.win32/pom.xml
@@ -5,12 +5,12 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.xmind.cathy.plugins</groupId>
     <artifactId>org.xmind.cathy.win32</artifactId>
-    <version>3.7.3-SNAPSHOT</version>
+    <version>3.7.4-SNAPSHOT</version>
     <packaging>eclipse-plugin</packaging>
     <parent>
         <groupId>org.xmind.releng</groupId>
         <artifactId>org.xmind.cathy.releng</artifactId>
-        <version>3.7.3-SNAPSHOT</version>
+        <version>3.7.4-SNAPSHOT</version>
         <relativePath>../../</relativePath>
     </parent>
 

diff --git a/bundles/org.xmind.cathy/META-INF/MANIFEST.MF b/bundles/org.xmind.cathy/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@ Manifest-Version: 1.0
 Bundle-SymbolicName: org.xmind.cathy;singleton:=true
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.ui,
- org.xmind.ui;bundle-version="[3.7.3,3.8.0)",
- org.xmind.ui.imports;bundle-version="[3.7.3,3.8.0)",
- org.xmind.ui.toolkit;bundle-version="[3.7.3,3.8.0)",
- org.xmind.core.command;bundle-version="[3.7.3,3.8.0)",
- org.xmind.core.command.remote;bundle-version="[3.7.3,3.8.0)",
+ org.xmind.ui;bundle-version="[3.7.4,3.8.0)",
+ org.xmind.ui.imports;bundle-version="[3.7.4,3.8.0)",
+ org.xmind.ui.toolkit;bundle-version="[3.7.4,3.8.0)",
+ org.xmind.core.command;bundle-version="[3.7.4,3.8.0)",
+ org.xmind.core.command.remote;bundle-version="[3.7.4,3.8.0)",
  org.eclipse.e4.ui.workbench,
  org.eclipse.ui.themes,
  org.eclipse.e4.ui.model.workbench,
@@ -27,12 +27,12 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.core.expressions,
  org.eclipse.e4.core.commands,
  org.xmind.ui.dashboard,
- org.xmind.core.usagedata;bundle-version="[3.7.3,3.8.0)",
+ org.xmind.core.usagedata;bundle-version="[3.7.4,3.8.0)",
  org.json,
- org.xmind.ui.browser;bundle-version="[3.7.3,3.8.0)",
- org.xmind.core.licensing;bundle-version="[3.7.3,3.8.0)",
+ org.xmind.ui.browser;bundle-version="[3.7.4,3.8.0)",
+ org.xmind.core.licensing;bundle-version="[3.7.4,3.8.0)",
  org.eclipse.e4.ui.workbench.addons.swt,
- org.xmind.ui.mindmap;bundle-version="3.7.3",
+ org.xmind.ui.mindmap;bundle-version="3.7.4",
  org.eclipse.ui.net;bundle-version="1.3.0",
  org.eclipse.emf.ecore.xmi
 Bundle-ManifestVersion: 2
@@ -49,5 +49,5 @@ Export-Package: org.xmind.cathy.internal;x-internal:=true,org.xmind.ca
  l.renderer;x-internal:=true,org.xmind.ui.internal.e4handlers;x-intern
  al:=true
 Bundle-Name: %pluginName
-Bundle-Version: 3.7.3.qualifier
+Bundle-Version: 3.7.4.qualifier
 Bundle-Activator: org.xmind.cathy.internal.CathyPlugin
diff --git a/bundles/org.xmind.cathy/plugin.xml b/bundles/org.xmind.cathy/plugin.xml
@@ -1226,6 +1226,18 @@
             </with>
          </activeWhen>
       </handler>
+      <handler
+            class="org.xmind.cathy.internal.EmptyHandler"
+            commandId="org.eclipse.ui.window.splitEditor">
+         <activeWhen>
+            <with
+                  variable="activeWorkbenchWindow">
+               <instanceof
+                     value="org.eclipse.ui.IWorkbenchWindow">
+               </instanceof>
+            </with>
+         </activeWhen>
+      </handler>
    </extension>
    <extension
          point="org.xmind.ui.toolkit.preferencePageSections">

diff --git a/bundles/org.xmind.cathy/pom.xml b/bundles/org.xmind.cathy/pom.xml
@@ -5,12 +5,12 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.xmind.cathy.plugins</groupId>
     <artifactId>org.xmind.cathy</artifactId>
-    <version>3.7.3-SNAPSHOT</version>
+    <version>3.7.4-SNAPSHOT</version>
     <packaging>eclipse-plugin</packaging>
     <parent>
         <groupId>org.xmind.releng</groupId>
         <artifactId>org.xmind.cathy.releng</artifactId>
-        <version>3.7.3-SNAPSHOT</version>
+        <version>3.7.4-SNAPSHOT</version>
         <relativePath>../../</relativePath>
     </parent>
 </project>
diff --git a/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/CathyPlugin.java b/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/CathyPlugin.java
@@ -18,6 +18,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.net.Authenticator;
 import java.net.URL;
 import java.util.Enumeration;
 import java.util.Properties;
@@ -290,6 +291,8 @@ public void activateNetworkSettings() {
             try {
                 networkPlugin
                         .loadClass("org.eclipse.core.internal.net.Activator"); //$NON-NLS-1$
+                /// cancel show AuthenticationDialog when return 401
+                Authenticator.setDefault(null);
             } catch (ClassNotFoundException e) {
                 getLog().log(new Status(IStatus.WARNING, PLUGIN_ID,
                         "Failed to activate plugin 'org.eclipse.core.net'.", //$NON-NLS-1$

diff --git a/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/EmptyHandler.java b/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/EmptyHandler.java
@@ -0,0 +1,14 @@
+package org.xmind.cathy.internal;
+
+import org.eclipse.core.commands.AbstractHandler;
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+
+public class EmptyHandler extends AbstractHandler {
+
+    @Override
+    public Object execute(ExecutionEvent event) throws ExecutionException {
+        return null;
+    }
+
+}
diff --git a/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/renderer/XWBWRenderer.java b/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/renderer/XWBWRenderer.java
@@ -1,5 +1,7 @@
 package org.xmind.cathy.internal.renderer;
 
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Field;
 import java.util.List;
 
 import javax.inject.Inject;
@@ -48,9 +50,77 @@ public Object createWidget(MUIElement element, Object parent) {
             recreateLayout(element, (Shell) widget);
         }
 
+        // modify dnd manager's dropAgents & dragAgents for widget
+        // (drop: remove SplitDropAgent2 & DetachedDropAgent & TrimDropAgent;  drag: remove IBFDragAgent)
+        if (widget instanceof Shell && !((Shell) widget).isDisposed()) {
+            Shell shell = (Shell) widget;
+            Object theManager = shell.getData("DnDManager"); //$NON-NLS-1$
+            if (theManager == null) {
+                theManager = createDnDManager((MWindow) element);
+            }
+
+            if (theManager != null) {
+                trimDndManager(theManager);
+                shell.setData("DnDManager", theManager); //$NON-NLS-1$
+            }
+        }
+
         return widget;
     }
 
+    private Object createDnDManager(MWindow window) {
+        try {
+            Class managerClass = Class.forName(
+                    "org.eclipse.e4.ui.workbench.addons.dndaddon.DnDManager"); //$NON-NLS-1$
+            Constructor constructor = (managerClass
+                    .getDeclaredConstructors())[0];
+            constructor.setAccessible(true);
+            Object dndManager = constructor.newInstance(window);
+
+            return dndManager;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+
+    private void trimDndManager(Object theManager) {
+        try {
+            Class managerClass = theManager.getClass();
+
+            //trim dropAgents
+            Field dropField = managerClass.getDeclaredField("dropAgents"); //$NON-NLS-1$
+
+            dropField.setAccessible(true);
+            @SuppressWarnings("unchecked")
+            List<Object> dropAgents = (List<Object>) dropField.get(theManager);
+            // remove SplitDropAgent2 & DetachedDropAgent & TrimDropAgent
+            if (dropAgents.size() == 4) {
+                dropAgents.remove(1);
+                dropAgents.remove(1);
+                dropAgents.remove(1);
+            }
+
+            dropField.set(theManager, dropAgents);
+
+            //trim dragAgents
+            Field dragField = managerClass.getDeclaredField("dragAgents"); //$NON-NLS-1$
+
+            dragField.setAccessible(true);
+            @SuppressWarnings("unchecked")
+            List<Object> dragAgents = (List<Object>) dragField.get(theManager);
+            // remove IBFDragAgent
+            if (dragAgents.size() == 2) {
+                dragAgents.remove(1);
+            }
+
+            dragField.set(theManager, dragAgents);
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
     protected void recreateLayout(MUIElement element, Shell shell) {
         Layout oldLayout = shell.getLayout();
         if (oldLayout != null && oldLayout instanceof TrimmedPartLayout) {

diff --git a/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/renderer/XWorkbenchRendererFactory.java b/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/renderer/XWorkbenchRendererFactory.java
@@ -28,8 +28,12 @@ public AbstractPartRenderer getRenderer(MUIElement uiElement,
                 && (uiElement.getTags().contains(IModelConstants.TAG_X_STACK))
                 && (uiElement.getElementId() != null);
         boolean editorPartStack = (uiElement instanceof MPartStack)
-                && (uiElement.getTags().contains("EditorStack")) //$NON-NLS-1$
-                && (uiElement.getElementId() != null);
+                && (((uiElement.getTags().contains("EditorStack")) //$NON-NLS-1$
+                        && (uiElement.getElementId() != null))
+                        || (uiElement.getParent() != null
+                                && "org.eclipse.ui.editorss".equals( //$NON-NLS-1$
+                                        uiElement.getParent().getElementId())));
+
         if (viewPartStack) {
             if (xviewStackRenderer == null) {
                 xviewStackRenderer = new XStackRenderer();

diff --git a/bundles/org.xmind.core.command.remote/META-INF/MANIFEST.MF b/bundles/org.xmind.core.command.remote/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.xmind.core.command.remote;singleton:=true
-Bundle-Version: 3.7.3.qualifier
+Bundle-Version: 3.7.4.qualifier
 Bundle-Activator: org.xmind.core.internal.command.remote.RemoteCommandPlugin
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.core.runtime,
- org.xmind.core.command;bundle-version="[3.7.3,3.8.0)";visibility:=reexport
+ org.xmind.core.command;bundle-version="[3.7.4,3.8.0)";visibility:=reexport
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ActivationPolicy: lazy
 Export-Package: org.xmind.core.command.remote,

diff --git a/bundles/org.xmind.core.command.remote/pom.xml b/bundles/org.xmind.core.command.remote/pom.xml
@@ -5,12 +5,12 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.xmind.cathy.plugins</groupId>
     <artifactId>org.xmind.core.command.remote</artifactId>
-    <version>3.7.3-SNAPSHOT</version>
+    <version>3.7.4-SNAPSHOT</version>
     <packaging>eclipse-plugin</packaging>
     <parent>
         <groupId>org.xmind.releng</groupId>
         <artifactId>org.xmind.cathy.releng</artifactId>
-        <version>3.7.3-SNAPSHOT</version>
+        <version>3.7.4-SNAPSHOT</version>
         <relativePath>../../</relativePath>
     </parent>
 </project>
diff --git a/bundles/org.xmind.core.command/META-INF/MANIFEST.MF b/bundles/org.xmind.core.command/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.xmind.core.command;singleton:=true
-Bundle-Version: 3.7.3.qualifier
+Bundle-Version: 3.7.4.qualifier
 Bundle-Activator: org.xmind.core.internal.command.XMindCommandPlugin
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.core.runtime

diff --git a/bundles/org.xmind.core.command/pom.xml b/bundles/org.xmind.core.command/pom.xml
@@ -5,12 +5,12 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.xmind.cathy.plugins</groupId>
     <artifactId>org.xmind.core.command</artifactId>
-    <version>3.7.3-SNAPSHOT</version>
+    <version>3.7.4-SNAPSHOT</version>
     <packaging>eclipse-plugin</packaging>
     <parent>
         <groupId>org.xmind.releng</groupId>
         <artifactId>org.xmind.cathy.releng</artifactId>
-        <version>3.7.3-SNAPSHOT</version>
+        <version>3.7.4-SNAPSHOT</version>
         <relativePath>../../</relativePath>
     </parent>
 </project>
diff --git a/bundles/org.xmind.core.io/META-INF/MANIFEST.MF b/bundles/org.xmind.core.io/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.xmind.core.io;singleton:=true
-Bundle-Version: 3.7.3.qualifier
+Bundle-Version: 3.7.4.qualifier
 Bundle-Vendor: %providerName
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ActivationPolicy: lazy

diff --git a/bundles/org.xmind.core.io/pom.xml b/bundles/org.xmind.core.io/pom.xml
@@ -5,12 +5,12 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.xmind.cathy.plugins</groupId>
     <artifactId>org.xmind.core.io</artifactId>
-    <version>3.7.3-SNAPSHOT</version>
+    <version>3.7.4-SNAPSHOT</version>
     <packaging>eclipse-plugin</packaging>
     <parent>
         <groupId>org.xmind.releng</groupId>
         <artifactId>org.xmind.cathy.releng</artifactId>
-        <version>3.7.3-SNAPSHOT</version>
+        <version>3.7.4-SNAPSHOT</version>
         <relativePath>../../</relativePath>
     </parent>
 </project>
diff --git a/bundles/org.xmind.core.licensing/META-INF/MANIFEST.MF b/bundles/org.xmind.core.licensing/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Licensing API
 Bundle-SymbolicName: org.xmind.core.licensing
-Bundle-Version: 3.7.3.qualifier
+Bundle-Version: 3.7.4.qualifier
 Bundle-Vendor: XMind Ltd.
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Export-Package: org.xmind.core.licensing
diff --git a/bundles/org.xmind.core.licensing/pom.xml b/bundles/org.xmind.core.licensing/pom.xml
@@ -5,12 +5,12 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.xmind.cathy.plugins</groupId>
     <artifactId>org.xmind.core.licensing</artifactId>
-    <version>3.7.3-SNAPSHOT</version>
+    <version>3.7.4-SNAPSHOT</version>
     <packaging>eclipse-plugin</packaging>
     <parent>
         <groupId>org.xmind.releng</groupId>
         <artifactId>org.xmind.cathy.releng</artifactId>
-        <version>3.7.3-SNAPSHOT</version>
+        <version>3.7.4-SNAPSHOT</version>
         <relativePath>../../</relativePath>
     </parent>
 </project>
diff --git a/bundles/org.xmind.core.net/META-INF/MANIFEST.MF b/bundles/org.xmind.core.net/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.xmind.core.net;singleton:=true
-Bundle-Version: 3.7.3.qualifier
+Bundle-Version: 3.7.4.qualifier
 Bundle-Activator: org.xmind.core.net.internal.Activator
 Require-Bundle: org.eclipse.core.runtime,
  org.json;bundle-version="1.0.0"

diff --git a/bundles/org.xmind.core.net/pom.xml b/bundles/org.xmind.core.net/pom.xml
@@ -5,12 +5,12 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.xmind.cathy.plugins</groupId>
     <artifactId>org.xmind.core.net</artifactId>
-    <version>3.7.3-SNAPSHOT</version>
+    <version>3.7.4-SNAPSHOT</version>
     <packaging>eclipse-plugin</packaging>
     <parent>
         <groupId>org.xmind.releng</groupId>
         <artifactId>org.xmind.cathy.releng</artifactId>
-        <version>3.7.3-SNAPSHOT</version>
+        <version>3.7.4-SNAPSHOT</version>
         <relativePath>../../</relativePath>
     </parent>
 </project>
diff --git a/bundles/org.xmind.core.runtime/META-INF/MANIFEST.MF b/bundles/org.xmind.core.runtime/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.xmind.core.runtime;singleton:=true
-Bundle-Version: 3.7.3.qualifier
+Bundle-Version: 3.7.4.qualifier
 Bundle-Activator: org.xmind.core.internal.XmindCore
 Bundle-Vendor: %providerName
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.core.expressions,
  org.bouncycastle,
- org.xmind.core;bundle-version="[3.7.3,3.8.0)";visibility:=reexport
+ org.xmind.core;bundle-version="[3.7.4,3.8.0)";visibility:=reexport
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Export-Package: org.xmind.core.internal;x-internal:=true,
  org.xmind.core.internal.factory;x-internal:=true,