Release 3.7.3.201708180239

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

Hide file tree

Showing 171 changed files with 3,732 additions and 544 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.2.qualifier
+Bundle-Version: 3.7.3.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.2-SNAPSHOT</version>
+    <version>3.7.3-SNAPSHOT</version>
     <packaging>eclipse-plugin</packaging>
     <parent>
         <groupId>org.xmind.releng</groupId>
         <artifactId>org.xmind.cathy.releng</artifactId>
-        <version>3.7.2-SNAPSHOT</version>
+        <version>3.7.3-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.2.qualifier
+Bundle-Version: 3.7.3.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.2-SNAPSHOT</version>
+    <version>3.7.3-SNAPSHOT</version>
     <packaging>eclipse-plugin</packaging>
     <parent>
         <groupId>org.xmind.releng</groupId>
         <artifactId>org.xmind.cathy.releng</artifactId>
-        <version>3.7.2-SNAPSHOT</version>
+        <version>3.7.3-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.2,3.8.0)",
- org.xmind.ui.imports;bundle-version="[3.7.2,3.8.0)",
- org.xmind.ui.toolkit;bundle-version="[3.7.2,3.8.0)",
- org.xmind.core.command;bundle-version="[3.7.2,3.8.0)",
- org.xmind.core.command.remote;bundle-version="[3.7.2,3.8.0)",
+ 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.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.2,3.8.0)",
+ org.xmind.core.usagedata;bundle-version="[3.7.3,3.8.0)",
  org.json,
- org.xmind.ui.browser;bundle-version="[3.7.2,3.8.0)",
- org.xmind.core.licensing;bundle-version="[3.7.2,3.8.0)",
+ 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.eclipse.e4.ui.workbench.addons.swt,
- org.xmind.ui.mindmap;bundle-version="3.7.2",
+ org.xmind.ui.mindmap;bundle-version="3.7.3",
  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.2.qualifier
+Bundle-Version: 3.7.3.qualifier
 Bundle-Activator: org.xmind.cathy.internal.CathyPlugin
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.2-SNAPSHOT</version>
+    <version>3.7.3-SNAPSHOT</version>
     <packaging>eclipse-plugin</packaging>
     <parent>
         <groupId>org.xmind.releng</groupId>
         <artifactId>org.xmind.cathy.releng</artifactId>
-        <version>3.7.2-SNAPSHOT</version>
+        <version>3.7.3-SNAPSHOT</version>
         <relativePath>../../</relativePath>
     </parent>
 </project>
diff --git a/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/BetaVerifier.java b/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/BetaVerifier.java
@@ -24,6 +24,7 @@
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.program.Program;
 import org.eclipse.swt.widgets.Display;
+import org.xmind.core.net.util.LinkUtils;
 
 public class BetaVerifier {
 
@@ -107,8 +108,9 @@ private void promptBetaExpiry() {
     }
 
     private void openDownloadSite() {
-        Program.launch("http://www.xmind.net/xmind/beta-expired/" //$NON-NLS-1$
-                + buildId.replace("qualifier", "000000000000")); //$NON-NLS-1$ //$NON-NLS-2$
+        Program.launch(
+                LinkUtils.getLinkByLanguage(true, false, "/xmind/beta-expired/") //$NON-NLS-1$
+                        + buildId.replace("qualifier", "000000000000")); //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     public static boolean isBeta() {

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
@@ -38,6 +38,7 @@
 import org.xmind.core.internal.runtime.WorkspaceConfigurer;
 import org.xmind.core.internal.runtime.WorkspaceSession;
 import org.xmind.core.licensing.ILicenseAgent;
+import org.xmind.core.net.util.LinkUtils;
 import org.xmind.core.usagedata.IUsageDataSampler;
 import org.xmind.ui.internal.app.ApplicationConstants;
 import org.xmind.ui.internal.statushandlers.DefaultErrorReporter;
@@ -157,7 +158,8 @@ public class CathyPlugin extends AbstractUIPlugin {
     /**
      * Online help page.
      */
-    public static final String ONLINE_HELP_URL = "https://www.xmind.net/xmind/help"; //$NON-NLS-1$
+    public static final String ONLINE_HELP_URL = LinkUtils
+            .getLinkByLanguage(true, true, "/xmind/help"); //$NON-NLS-1$
 
     /**
      * Boolean value:<br>

diff --git a/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/CathyWorkbenchAdvisor.java b/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/CathyWorkbenchAdvisor.java
@@ -203,9 +203,13 @@ private XMLMemento recordEditorsState(
 
     private void saveEditorsState(IMemento memento,
             ArrayList<IEditorReference> editorRefs) {
-        IWorkbenchPage activePage = PlatformUI.getWorkbench()
-                .getActiveWorkbenchWindow().getActivePage();
-        IEditorPart activeEditor = activePage.getActiveEditor();
+        IEditorPart activeEditor = null;
+
+        IWorkbenchWindow window = PlatformUI.getWorkbench()
+                .getActiveWorkbenchWindow();
+        if (window != null && window.getActivePage() != null) {
+            activeEditor = window.getActivePage().getActiveEditor();
+        }
 
         IMemento childrenMemento = memento
                 .createChild(IWorkbenchConstants.TAG_EDITORS);

diff --git a/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/GeneralPrefPage.java b/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/GeneralPrefPage.java
@@ -43,6 +43,7 @@
 import org.eclipse.ui.forms.widgets.Hyperlink;
 import org.eclipse.ui.internal.IPreferenceConstants;
 import org.eclipse.ui.internal.WorkbenchPlugin;
+import org.xmind.core.net.util.LinkUtils;
 import org.xmind.core.usagedata.IUsageDataSampler;
 import org.xmind.core.usagedata.IUsageDataUploader;
 import org.xmind.ui.internal.MindMapUIPlugin;
@@ -484,7 +485,8 @@ private void addSendUsageDataGroup() {
                 (Color) resources.get(ColorUtils.toDescriptor("#77afe0"))); //$NON-NLS-1$
         privacyHyperlink.addHyperlinkListener(new HyperlinkAdapter() {
             public void linkActivated(HyperlinkEvent e) {
-                Program.launch("http://www.xmind.net/privacy/usage/"); //$NON-NLS-1$
+                Program.launch(LinkUtils.getLinkByLanguage(true, false,
+                        "/privacy/usage/")); //$NON-NLS-1$
             }
         });
 
@@ -614,4 +616,4 @@ public void handleEvent(Event event) {
 //            checkState();
 //        }
     }
-}
+}
diff --git a/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/StartupPreferencePageSection.java b/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/StartupPreferencePageSection.java
@@ -19,6 +19,7 @@
 import org.eclipse.ui.forms.events.HyperlinkAdapter;
 import org.eclipse.ui.forms.events.HyperlinkEvent;
 import org.eclipse.ui.forms.widgets.Hyperlink;
+import org.xmind.core.net.util.LinkUtils;
 import org.xmind.core.usagedata.IUsageDataSampler;
 import org.xmind.core.usagedata.IUsageDataUploader;
 import org.xmind.ui.preference.PreferenceFieldEditorPageSection;
@@ -115,7 +116,8 @@ private void addSendUsageDataGroup(Composite parent) {
                 (Color) resources.get(ColorUtils.toDescriptor("#006CF9"))); //$NON-NLS-1$
         privacyHyperlink.addHyperlinkListener(new HyperlinkAdapter() {
             public void linkActivated(HyperlinkEvent e) {
-                Program.launch("http://www.xmind.net/privacy/usage/"); //$NON-NLS-1$
+                Program.launch(LinkUtils.getLinkByLanguage(true, false,
+                        "/privacy/usage/")); //$NON-NLS-1$
             }
         });
 

diff --git a/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/WelcomeDialog.java b/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/WelcomeDialog.java
@@ -32,6 +32,7 @@
 import org.eclipse.ui.forms.events.HyperlinkEvent;
 import org.eclipse.ui.forms.events.IHyperlinkListener;
 import org.eclipse.ui.forms.widgets.Hyperlink;
+import org.xmind.core.net.util.LinkUtils;
 import org.xmind.ui.resources.ColorUtils;
 import org.xmind.ui.resources.FontUtils;
 
@@ -98,7 +99,7 @@ private void createTopSection(Composite parent) {
         composite.setBackground(parent.getBackground());
         GridData layoutData = new GridData(SWT.FILL, SWT.TOP, true, false);
         layoutData.widthHint = 740;
-        layoutData.heightHint = 120;
+//        layoutData.heightHint = 120;
         composite.setLayoutData(layoutData);
 
         GridLayout layout = new GridLayout(1, false);
@@ -243,7 +244,7 @@ public void handleEvent(Event event) {
     private void createTitleSection(Composite parent) {
         Composite composite = new Composite(parent, SWT.NONE);
         composite.setBackground(parent.getBackground());
-        GridData gridData = new GridData(SWT.FILL, SWT.CENTER, true, true);
+        GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, true);
         composite.setLayoutData(gridData);
 
         GridLayout layout = new GridLayout(2, false);
@@ -514,7 +515,8 @@ public void linkEntered(HyperlinkEvent e) {
             }
 
             public void linkActivated(HyperlinkEvent e) {
-                Program.launch("http://www.xmind.net/privacy/usage/"); //$NON-NLS-1$
+                Program.launch(LinkUtils.getLinkByLanguage(true, false,
+                        "/privacy/usage/")); //$NON-NLS-1$
             }
         });
     }

diff --git a/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/dashboard/DashboardAutomationAddon.java b/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/dashboard/DashboardAutomationAddon.java
@@ -289,13 +289,29 @@ public static final String hideVisiblePart(MWindow window,
         }
         MPartStack partStack = partStacks.get(0);
 
-        MPart visiblePart = null;
         MStackElement selectedElement = partStack.getSelectedElement();
-        if (selectedElement instanceof MPlaceholder) {
-            MPlaceholder placeholder = (MPlaceholder) selectedElement;
+        String hidePartId = hidePart(partService, selectedElement);
+        if (hidePartId != null) {
+            return hidePartId;
+        }
+
+        //fix: part may not be hiden
+        List<MStackElement> children = partStack.getChildren();
+        for (MStackElement child : children) {
+            hidePart(partService, child);
+        }
+
+        return null;
+    }
+
+    private static String hidePart(EPartService partService,
+            MStackElement element) {
+        MPart visiblePart = null;
+        if (element instanceof MPlaceholder) {
+            MPlaceholder placeholder = (MPlaceholder) element;
             visiblePart = partService.findPart(placeholder.getElementId());
-        } else if (selectedElement instanceof MPart) {
-            visiblePart = (MPart) selectedElement;
+        } else if (element instanceof MPart) {
+            visiblePart = (MPart) element;
         }
 
         if (visiblePart != null) {

diff --git a/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/messages.properties b/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/messages.properties
@@ -137,7 +137,7 @@ BetaVerifier_BetaExpiredPromptDialog_ExitButton_text=&Exit
 BetaVerifier_BetaExpiredPromptDialog_DownloadFailure_message=Oops! An error occurred. Please try again later, or visit www.xmind.net and download the latest release manually.
 
 
-About_Copyright=Copyright (C) 2006 - 2016, XMind Ltd. All rights reserved.
+About_Copyright=Copyright (C) 2006 - 2017, XMind Ltd. All rights reserved.
 About_Homepage=http://www.xmind.net/
 About_BetaExpiryMessage_withExpiryTime=This beta edition will expire at {0}.\n
 

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.2.qualifier
+Bundle-Version: 3.7.3.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.2,3.8.0)";visibility:=reexport
+ org.xmind.core.command;bundle-version="[3.7.3,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.2-SNAPSHOT</version>
+    <version>3.7.3-SNAPSHOT</version>
     <packaging>eclipse-plugin</packaging>
     <parent>
         <groupId>org.xmind.releng</groupId>
         <artifactId>org.xmind.cathy.releng</artifactId>
-        <version>3.7.2-SNAPSHOT</version>
+        <version>3.7.3-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.2.qualifier
+Bundle-Version: 3.7.3.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.2-SNAPSHOT</version>
+    <version>3.7.3-SNAPSHOT</version>
     <packaging>eclipse-plugin</packaging>
     <parent>
         <groupId>org.xmind.releng</groupId>
         <artifactId>org.xmind.cathy.releng</artifactId>
-        <version>3.7.2-SNAPSHOT</version>
+        <version>3.7.3-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.2.qualifier
+Bundle-Version: 3.7.3.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.2-SNAPSHOT</version>
+    <version>3.7.3-SNAPSHOT</version>
     <packaging>eclipse-plugin</packaging>
     <parent>
         <groupId>org.xmind.releng</groupId>
         <artifactId>org.xmind.cathy.releng</artifactId>
-        <version>3.7.2-SNAPSHOT</version>
+        <version>3.7.3-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.2.qualifier
+Bundle-Version: 3.7.3.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.2-SNAPSHOT</version>
+    <version>3.7.3-SNAPSHOT</version>
     <packaging>eclipse-plugin</packaging>
     <parent>
         <groupId>org.xmind.releng</groupId>
         <artifactId>org.xmind.cathy.releng</artifactId>
-        <version>3.7.2-SNAPSHOT</version>
+        <version>3.7.3-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,13 +2,14 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.xmind.core.net;singleton:=true
-Bundle-Version: 3.7.2.qualifier
+Bundle-Version: 3.7.3.qualifier
 Bundle-Activator: org.xmind.core.net.internal.Activator
 Require-Bundle: org.eclipse.core.runtime,
  org.json;bundle-version="1.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Bundle-ActivationPolicy: lazy
 Export-Package: org.xmind.core.net,
  org.xmind.core.net.http,
- org.xmind.core.net.internal;x-internal:=true
+ org.xmind.core.net.internal;x-internal:=true,
+ org.xmind.core.net.util
 Bundle-Vendor: %providerName