diff --git a/bundles/org.xmind.cathy.fonts/META-INF/MANIFEST.MF b/bundles/org.xmind.cathy.fonts/META-INF/MANIFEST.MF index 0441f360d..a2e72bb0a 100644 --- 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 index 2525d3153..bf83d1998 100644 --- a/bundles/org.xmind.cathy.fonts/pom.xml +++ b/bundles/org.xmind.cathy.fonts/pom.xml @@ -5,12 +5,12 @@ 4.0.0 org.xmind.cathy.plugins org.xmind.cathy.fonts - 3.7.3-SNAPSHOT + 3.7.4-SNAPSHOT eclipse-plugin org.xmind.releng org.xmind.cathy.releng - 3.7.3-SNAPSHOT + 3.7.4-SNAPSHOT ../../ diff --git a/bundles/org.xmind.cathy.win32/META-INF/MANIFEST.MF b/bundles/org.xmind.cathy.win32/META-INF/MANIFEST.MF index 5da84f1ce..3b2b2c371 100644 --- 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 index aeb3fb4cc..1087668a4 100644 --- a/bundles/org.xmind.cathy.win32/pom.xml +++ b/bundles/org.xmind.cathy.win32/pom.xml @@ -5,12 +5,12 @@ 4.0.0 org.xmind.cathy.plugins org.xmind.cathy.win32 - 3.7.3-SNAPSHOT + 3.7.4-SNAPSHOT eclipse-plugin org.xmind.releng org.xmind.cathy.releng - 3.7.3-SNAPSHOT + 3.7.4-SNAPSHOT ../../ diff --git a/bundles/org.xmind.cathy/META-INF/MANIFEST.MF b/bundles/org.xmind.cathy/META-INF/MANIFEST.MF index 255862669..53dac468f 100644 --- 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 index 18f2af0a5..fbfa0abd2 100644 --- a/bundles/org.xmind.cathy/plugin.xml +++ b/bundles/org.xmind.cathy/plugin.xml @@ -1226,6 +1226,18 @@ + + + + + + + + diff --git a/bundles/org.xmind.cathy/pom.xml b/bundles/org.xmind.cathy/pom.xml index e690e63e4..636c8f19d 100644 --- a/bundles/org.xmind.cathy/pom.xml +++ b/bundles/org.xmind.cathy/pom.xml @@ -5,12 +5,12 @@ 4.0.0 org.xmind.cathy.plugins org.xmind.cathy - 3.7.3-SNAPSHOT + 3.7.4-SNAPSHOT eclipse-plugin org.xmind.releng org.xmind.cathy.releng - 3.7.3-SNAPSHOT + 3.7.4-SNAPSHOT ../../ 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 index a9c4eb9dd..2d97faf2f 100644 --- 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 new file mode 100644 index 000000000..6a5da698a --- /dev/null +++ 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 index 26b2ae5c5..6e5b16642 100644 --- 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 dropAgents = (List) 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 dragAgents = (List) 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 index c214ce09f..46120e1fc 100644 --- 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 index ff181ffbb..3d3f97b6d 100644 --- 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 index 1d3177e82..e0aa09855 100644 --- a/bundles/org.xmind.core.command.remote/pom.xml +++ b/bundles/org.xmind.core.command.remote/pom.xml @@ -5,12 +5,12 @@ 4.0.0 org.xmind.cathy.plugins org.xmind.core.command.remote - 3.7.3-SNAPSHOT + 3.7.4-SNAPSHOT eclipse-plugin org.xmind.releng org.xmind.cathy.releng - 3.7.3-SNAPSHOT + 3.7.4-SNAPSHOT ../../ diff --git a/bundles/org.xmind.core.command/META-INF/MANIFEST.MF b/bundles/org.xmind.core.command/META-INF/MANIFEST.MF index dc854a09a..db30ca8fb 100644 --- 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 index f33043a6d..d443d596a 100644 --- a/bundles/org.xmind.core.command/pom.xml +++ b/bundles/org.xmind.core.command/pom.xml @@ -5,12 +5,12 @@ 4.0.0 org.xmind.cathy.plugins org.xmind.core.command - 3.7.3-SNAPSHOT + 3.7.4-SNAPSHOT eclipse-plugin org.xmind.releng org.xmind.cathy.releng - 3.7.3-SNAPSHOT + 3.7.4-SNAPSHOT ../../ diff --git a/bundles/org.xmind.core.io/META-INF/MANIFEST.MF b/bundles/org.xmind.core.io/META-INF/MANIFEST.MF index 780c20e97..1d68c6d16 100644 --- 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 index c4f6c7bc6..677b7945b 100644 --- a/bundles/org.xmind.core.io/pom.xml +++ b/bundles/org.xmind.core.io/pom.xml @@ -5,12 +5,12 @@ 4.0.0 org.xmind.cathy.plugins org.xmind.core.io - 3.7.3-SNAPSHOT + 3.7.4-SNAPSHOT eclipse-plugin org.xmind.releng org.xmind.cathy.releng - 3.7.3-SNAPSHOT + 3.7.4-SNAPSHOT ../../ diff --git a/bundles/org.xmind.core.licensing/META-INF/MANIFEST.MF b/bundles/org.xmind.core.licensing/META-INF/MANIFEST.MF index 3674d5465..0bd146739 100644 --- 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 index ab1caa0b6..7f8a720e2 100644 --- a/bundles/org.xmind.core.licensing/pom.xml +++ b/bundles/org.xmind.core.licensing/pom.xml @@ -5,12 +5,12 @@ 4.0.0 org.xmind.cathy.plugins org.xmind.core.licensing - 3.7.3-SNAPSHOT + 3.7.4-SNAPSHOT eclipse-plugin org.xmind.releng org.xmind.cathy.releng - 3.7.3-SNAPSHOT + 3.7.4-SNAPSHOT ../../ diff --git a/bundles/org.xmind.core.net/META-INF/MANIFEST.MF b/bundles/org.xmind.core.net/META-INF/MANIFEST.MF index 64b4e8857..fd0ff1cdf 100644 --- 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 index b811dc07f..7d1f9daa8 100644 --- a/bundles/org.xmind.core.net/pom.xml +++ b/bundles/org.xmind.core.net/pom.xml @@ -5,12 +5,12 @@ 4.0.0 org.xmind.cathy.plugins org.xmind.core.net - 3.7.3-SNAPSHOT + 3.7.4-SNAPSHOT eclipse-plugin org.xmind.releng org.xmind.cathy.releng - 3.7.3-SNAPSHOT + 3.7.4-SNAPSHOT ../../ diff --git a/bundles/org.xmind.core.runtime/META-INF/MANIFEST.MF b/bundles/org.xmind.core.runtime/META-INF/MANIFEST.MF index fa9bbe48f..ff8221eb7 100644 --- 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, diff --git a/bundles/org.xmind.core.runtime/pom.xml b/bundles/org.xmind.core.runtime/pom.xml index 36f690795..2809b9821 100644 --- a/bundles/org.xmind.core.runtime/pom.xml +++ b/bundles/org.xmind.core.runtime/pom.xml @@ -5,12 +5,12 @@ 4.0.0 org.xmind.cathy.plugins org.xmind.core.runtime - 3.7.3-SNAPSHOT + 3.7.4-SNAPSHOT eclipse-plugin org.xmind.releng org.xmind.cathy.releng - 3.7.3-SNAPSHOT + 3.7.4-SNAPSHOT ../../ diff --git a/bundles/org.xmind.core.usagedata/META-INF/MANIFEST.MF b/bundles/org.xmind.core.usagedata/META-INF/MANIFEST.MF index 9849c1072..85eea0536 100644 --- a/bundles/org.xmind.core.usagedata/META-INF/MANIFEST.MF +++ b/bundles/org.xmind.core.usagedata/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Usage Data API Bundle-SymbolicName: org.xmind.core.usagedata -Bundle-Version: 3.7.3.qualifier +Bundle-Version: 3.7.4.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ActivationPolicy: lazy diff --git a/bundles/org.xmind.core.usagedata/pom.xml b/bundles/org.xmind.core.usagedata/pom.xml index 2158068c4..501fb179c 100644 --- a/bundles/org.xmind.core.usagedata/pom.xml +++ b/bundles/org.xmind.core.usagedata/pom.xml @@ -5,12 +5,12 @@ 4.0.0 org.xmind.cathy.plugins org.xmind.core.usagedata - 3.7.3-SNAPSHOT + 3.7.4-SNAPSHOT eclipse-plugin org.xmind.releng org.xmind.cathy.releng - 3.7.3-SNAPSHOT + 3.7.4-SNAPSHOT ../../ diff --git a/bundles/org.xmind.core/META-INF/MANIFEST.MF b/bundles/org.xmind.core/META-INF/MANIFEST.MF index 286de2faa..79d3eee7b 100644 --- a/bundles/org.xmind.core/META-INF/MANIFEST.MF +++ b/bundles/org.xmind.core/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.xmind.core -Bundle-Version: 3.7.3.qualifier +Bundle-Version: 3.7.4.qualifier Export-Package: org.xmind.core, org.xmind.core.event, org.xmind.core.internal;x-internal:=true, diff --git a/bundles/org.xmind.core/pom.xml b/bundles/org.xmind.core/pom.xml index 6779880a3..1961d521f 100644 --- a/bundles/org.xmind.core/pom.xml +++ b/bundles/org.xmind.core/pom.xml @@ -5,12 +5,12 @@ 4.0.0 org.xmind.cathy.plugins org.xmind.core - 3.7.3-SNAPSHOT + 3.7.4-SNAPSHOT eclipse-plugin org.xmind.releng org.xmind.cathy.releng - 3.7.3-SNAPSHOT + 3.7.4-SNAPSHOT ../../ diff --git a/bundles/org.xmind.core/src/org/xmind/core/internal/CloneData.java b/bundles/org.xmind.core/src/org/xmind/core/internal/CloneData.java index 8879ef9fc..2a11c911e 100644 --- a/bundles/org.xmind.core/src/org/xmind/core/internal/CloneData.java +++ b/bundles/org.xmind.core/src/org/xmind/core/internal/CloneData.java @@ -34,7 +34,6 @@ public CategorizedString(String category, String source) { /* * (non-Javadoc) - * * @see java.lang.Object#equals(java.lang.Object) */ @Override @@ -44,17 +43,21 @@ public boolean equals(Object obj) { if (obj == null || !(obj instanceof CategorizedString)) return false; CategorizedString that = (CategorizedString) obj; - return this.category.equals(that.category) - && this.source.equals(that.source); + return (this.category == that.category || (this.category != null + && this.category.equals(that.category))) + && (this.source == that.source || (this.source != null + && this.source.equals(that.source))); } /* * (non-Javadoc) - * * @see java.lang.Object#hashCode() */ @Override public int hashCode() { + if (category == null || source == null) { + return super.hashCode(); + } return this.category.hashCode() ^ this.source.hashCode(); } } @@ -85,8 +88,8 @@ public void putString(String category, String source, String cloned) { } public Object get(Object source) { - Object cloned = clonedElements.isEmpty() ? null : clonedElements - .get(source); + Object cloned = clonedElements.isEmpty() ? null + : clonedElements.get(source); if (cloned == null && parent != null) cloned = parent.get(source); return cloned; @@ -168,7 +171,8 @@ private void fireStringCloned(Object sourceObj, String category, } } - public void addCloneDataListener(Object source, ICloneDataListener listener) { + public void addCloneDataListener(Object source, + ICloneDataListener listener) { List list = listeners.get(source); if (list == null) { list = new ArrayList(); @@ -208,7 +212,6 @@ public boolean isCloned(Object source) { /* * (non-Javadoc) - * * @see org.xmind.core.ICloneData#isCloned(java.lang.String, * java.lang.String) */ @@ -225,4 +228,4 @@ public boolean isCloned(String category, String source) { // return cloned instanceof String ? (String) cloned : null; // } -} \ No newline at end of file +} diff --git a/bundles/org.xmind.de.erichseifert.vectorgraphics2d/META-INF/MANIFEST.MF b/bundles/org.xmind.de.erichseifert.vectorgraphics2d/META-INF/MANIFEST.MF index f8a9e2cf8..2294c3c1d 100644 --- a/bundles/org.xmind.de.erichseifert.vectorgraphics2d/META-INF/MANIFEST.MF +++ b/bundles/org.xmind.de.erichseifert.vectorgraphics2d/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.xmind.de.erichseifert.vectorgraphics2d;singleton:=true -Bundle-Version: 3.7.3.qualifier +Bundle-Version: 3.7.4.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-Vendor: %providerName Export-Package: org.xmind.de.erichseifert.vectorgraphics2d, diff --git a/bundles/org.xmind.de.erichseifert.vectorgraphics2d/pom.xml b/bundles/org.xmind.de.erichseifert.vectorgraphics2d/pom.xml index 65155a00a..e946043d6 100644 --- a/bundles/org.xmind.de.erichseifert.vectorgraphics2d/pom.xml +++ b/bundles/org.xmind.de.erichseifert.vectorgraphics2d/pom.xml @@ -5,12 +5,12 @@ 4.0.0 org.xmind.orbit org.xmind.de.erichseifert.vectorgraphics2d - 3.7.3-SNAPSHOT + 3.7.4-SNAPSHOT eclipse-plugin org.xmind.releng org.xmind.cathy.releng - 3.7.3-SNAPSHOT + 3.7.4-SNAPSHOT ../../ diff --git a/bundles/org.xmind.gef.ui/META-INF/MANIFEST.MF b/bundles/org.xmind.gef.ui/META-INF/MANIFEST.MF index dc06f5b06..68b50506b 100644 --- a/bundles/org.xmind.gef.ui/META-INF/MANIFEST.MF +++ b/bundles/org.xmind.gef.ui/META-INF/MANIFEST.MF @@ -2,14 +2,14 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.xmind.gef.ui;singleton:=true -Bundle-Version: 3.7.3.qualifier +Bundle-Version: 3.7.4.qualifier Bundle-Activator: org.xmind.gef.ui.internal.GEFPlugin Bundle-Vendor: %providerName Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, org.eclipse.core.expressions, - org.xmind.gef;bundle-version="[3.7.3,3.8.0)";visibility:=reexport, - org.xmind.ui.toolkit;bundle-version="[3.7.3,3.8.0)" + org.xmind.gef;bundle-version="[3.7.4,3.8.0)";visibility:=reexport, + org.xmind.ui.toolkit;bundle-version="[3.7.4,3.8.0)" Eclipse-LazyStart: true Export-Package: org.xmind.gef.ui.actions, org.xmind.gef.ui.editor, diff --git a/bundles/org.xmind.gef.ui/pom.xml b/bundles/org.xmind.gef.ui/pom.xml index a608beeab..f8d1ec81b 100644 --- a/bundles/org.xmind.gef.ui/pom.xml +++ b/bundles/org.xmind.gef.ui/pom.xml @@ -5,12 +5,12 @@ 4.0.0 org.xmind.cathy.plugins org.xmind.gef.ui - 3.7.3-SNAPSHOT + 3.7.4-SNAPSHOT eclipse-plugin org.xmind.releng org.xmind.cathy.releng - 3.7.3-SNAPSHOT + 3.7.4-SNAPSHOT ../../ diff --git a/bundles/org.xmind.gef/META-INF/MANIFEST.MF b/bundles/org.xmind.gef/META-INF/MANIFEST.MF index 4308bb66e..42b596ba4 100644 --- a/bundles/org.xmind.gef/META-INF/MANIFEST.MF +++ b/bundles/org.xmind.gef/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.xmind.gef;singleton:=true -Bundle-Version: 3.7.3.qualifier +Bundle-Version: 3.7.4.qualifier Bundle-Vendor: %providerName Eclipse-LazyStart: true Require-Bundle: org.eclipse.core.runtime, diff --git a/bundles/org.xmind.gef/pom.xml b/bundles/org.xmind.gef/pom.xml index 9307449eb..528021cb5 100644 --- a/bundles/org.xmind.gef/pom.xml +++ b/bundles/org.xmind.gef/pom.xml @@ -5,12 +5,12 @@ 4.0.0 org.xmind.cathy.plugins org.xmind.gef - 3.7.3-SNAPSHOT + 3.7.4-SNAPSHOT eclipse-plugin org.xmind.releng org.xmind.cathy.releng - 3.7.3-SNAPSHOT + 3.7.4-SNAPSHOT ../../ diff --git a/bundles/org.xmind.neuquant/META-INF/MANIFEST.MF b/bundles/org.xmind.neuquant/META-INF/MANIFEST.MF index 4c07f40fc..797d35ee1 100644 --- a/bundles/org.xmind.neuquant/META-INF/MANIFEST.MF +++ b/bundles/org.xmind.neuquant/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.xmind.neuquant -Bundle-Version: 3.7.3.qualifier +Bundle-Version: 3.7.4.qualifier Bundle-Vendor: %providerName Bundle-RequiredExecutionEnvironment: J2SE-1.5 Require-Bundle: org.eclipse.swt diff --git a/bundles/org.xmind.neuquant/pom.xml b/bundles/org.xmind.neuquant/pom.xml index 0866d81be..4bce14caf 100644 --- a/bundles/org.xmind.neuquant/pom.xml +++ b/bundles/org.xmind.neuquant/pom.xml @@ -5,12 +5,12 @@ 4.0.0 org.xmind.cathy.plugins org.xmind.neuquant - 3.7.3-SNAPSHOT + 3.7.4-SNAPSHOT eclipse-plugin org.xmind.releng org.xmind.cathy.releng - 3.7.3-SNAPSHOT + 3.7.4-SNAPSHOT ../../ diff --git a/bundles/org.xmind.org.freehep.vectorgraphics/META-INF/MANIFEST.MF b/bundles/org.xmind.org.freehep.vectorgraphics/META-INF/MANIFEST.MF index d24cce27c..b512bab0c 100644 --- a/bundles/org.xmind.org.freehep.vectorgraphics/META-INF/MANIFEST.MF +++ b/bundles/org.xmind.org.freehep.vectorgraphics/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.xmind.org.freehep.vectorgraphics;singleton:=true -Bundle-Version: 3.7.3.qualifier +Bundle-Version: 3.7.4.qualifier Bundle-RequiredExecutionEnvironment: J2SE-1.5 Export-Package: org.xmind.org.freehep.graphics2d, org.xmind.org.freehep.graphics2d.font, diff --git a/bundles/org.xmind.org.freehep.vectorgraphics/pom.xml b/bundles/org.xmind.org.freehep.vectorgraphics/pom.xml index 9ce351358..10e90322e 100644 --- a/bundles/org.xmind.org.freehep.vectorgraphics/pom.xml +++ b/bundles/org.xmind.org.freehep.vectorgraphics/pom.xml @@ -5,12 +5,12 @@ 4.0.0 org.xmind.orbit org.xmind.org.freehep.vectorgraphics - 3.7.3-SNAPSHOT + 3.7.4-SNAPSHOT eclipse-plugin org.xmind.releng org.xmind.cathy.releng - 3.7.3-SNAPSHOT + 3.7.4-SNAPSHOT ../../ diff --git a/bundles/org.xmind.ui.browser/META-INF/MANIFEST.MF b/bundles/org.xmind.ui.browser/META-INF/MANIFEST.MF index ad851d594..1ef8e8466 100644 --- a/bundles/org.xmind.ui.browser/META-INF/MANIFEST.MF +++ b/bundles/org.xmind.ui.browser/META-INF/MANIFEST.MF @@ -2,15 +2,15 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.xmind.ui.browser;singleton:=true -Bundle-Version: 3.7.3.qualifier +Bundle-Version: 3.7.4.qualifier Bundle-Activator: org.xmind.ui.internal.browser.BrowserPlugin Bundle-Vendor: %providerName Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, org.eclipse.core.net, - 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.net;bundle-version="[3.7.3,3.8.0)";visibility:=reexport + 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.net;bundle-version="[3.7.4,3.8.0)";visibility:=reexport Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-ActivationPolicy: lazy Export-Package: org.xmind.ui.browser; diff --git a/bundles/org.xmind.ui.browser/pom.xml b/bundles/org.xmind.ui.browser/pom.xml index ac605627e..672e7f737 100644 --- a/bundles/org.xmind.ui.browser/pom.xml +++ b/bundles/org.xmind.ui.browser/pom.xml @@ -5,12 +5,12 @@ 4.0.0 org.xmind.cathy.plugins org.xmind.ui.browser - 3.7.3-SNAPSHOT + 3.7.4-SNAPSHOT eclipse-plugin org.xmind.releng org.xmind.cathy.releng - 3.7.3-SNAPSHOT + 3.7.4-SNAPSHOT ../../ diff --git a/bundles/org.xmind.ui.dashboard/META-INF/MANIFEST.MF b/bundles/org.xmind.ui.dashboard/META-INF/MANIFEST.MF index c20a18a12..662a7c223 100644 --- a/bundles/org.xmind.ui.dashboard/META-INF/MANIFEST.MF +++ b/bundles/org.xmind.ui.dashboard/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Dashboard Bundle-SymbolicName: org.xmind.ui.dashboard;singleton:=true -Bundle-Version: 3.7.3.qualifier +Bundle-Version: 3.7.4.qualifier Bundle-Activator: org.xmind.ui.internal.dashboard.DashboardPlugin Bundle-Vendor: XMind Ltd Require-Bundle: org.eclipse.ui, diff --git a/bundles/org.xmind.ui.dashboard/pom.xml b/bundles/org.xmind.ui.dashboard/pom.xml index 12cfd8d65..1fbd7bcea 100644 --- a/bundles/org.xmind.ui.dashboard/pom.xml +++ b/bundles/org.xmind.ui.dashboard/pom.xml @@ -5,12 +5,12 @@ 4.0.0 org.xmind.cathy.plugins org.xmind.ui.dashboard - 3.7.3-SNAPSHOT + 3.7.4-SNAPSHOT eclipse-plugin org.xmind.releng org.xmind.cathy.releng - 3.7.3-SNAPSHOT + 3.7.4-SNAPSHOT ../../ diff --git a/bundles/org.xmind.ui.exports.vector.svg/META-INF/MANIFEST.MF b/bundles/org.xmind.ui.exports.vector.svg/META-INF/MANIFEST.MF index 9c7aaba76..a8dbad9a3 100644 --- a/bundles/org.xmind.ui.exports.vector.svg/META-INF/MANIFEST.MF +++ b/bundles/org.xmind.ui.exports.vector.svg/META-INF/MANIFEST.MF @@ -2,16 +2,16 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.xmind.ui.exports.vector.svg;singleton:=true -Bundle-Version: 3.7.3.qualifier +Bundle-Version: 3.7.4.qualifier Bundle-Activator: org.xmind.ui.internal.exports.vector.svg.SvgPlugin Bundle-Vendor: %providerName Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, - org.xmind.ui;bundle-version="[3.7.3,3.8.0)", - org.xmind.de.erichseifert.vectorgraphics2d;bundle-version="[3.7.3,3.8.0)", - org.xmind.ui.exports.vector;bundle-version="[3.7.3,3.8.0)", - org.xmind.ui.toolkit;bundle-version="[3.7.3,3.8.0)", - org.xmind.core.usagedata;bundle-version="[3.7.3,3.8.0)" + org.xmind.ui;bundle-version="[3.7.4,3.8.0)", + org.xmind.de.erichseifert.vectorgraphics2d;bundle-version="[3.7.4,3.8.0)", + org.xmind.ui.exports.vector;bundle-version="[3.7.4,3.8.0)", + org.xmind.ui.toolkit;bundle-version="[3.7.4,3.8.0)", + org.xmind.core.usagedata;bundle-version="[3.7.4,3.8.0)" Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-ActivationPolicy: lazy Bundle-Localization: plugin diff --git a/bundles/org.xmind.ui.exports.vector.svg/pom.xml b/bundles/org.xmind.ui.exports.vector.svg/pom.xml index 6f4ab4859..2f8d7f21c 100644 --- a/bundles/org.xmind.ui.exports.vector.svg/pom.xml +++ b/bundles/org.xmind.ui.exports.vector.svg/pom.xml @@ -5,12 +5,12 @@ 4.0.0 org.xmind.cathy.plugins org.xmind.ui.exports.vector.svg - 3.7.3-SNAPSHOT + 3.7.4-SNAPSHOT eclipse-plugin org.xmind.releng org.xmind.cathy.releng - 3.7.3-SNAPSHOT + 3.7.4-SNAPSHOT ../../ diff --git a/bundles/org.xmind.ui.exports.vector/META-INF/MANIFEST.MF b/bundles/org.xmind.ui.exports.vector/META-INF/MANIFEST.MF index 3d999edcd..48ad073f3 100644 --- a/bundles/org.xmind.ui.exports.vector/META-INF/MANIFEST.MF +++ b/bundles/org.xmind.ui.exports.vector/META-INF/MANIFEST.MF @@ -2,12 +2,12 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.xmind.ui.exports.vector;singleton:=true -Bundle-Version: 3.7.3.qualifier +Bundle-Version: 3.7.4.qualifier Bundle-Activator: org.xmind.ui.exports.vector.VectorPlugin Bundle-Vendor: %providerName Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, - org.xmind.ui;bundle-version="[3.7.3,3.8.0)" + org.xmind.ui;bundle-version="[3.7.4,3.8.0)" Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-ActivationPolicy: lazy Bundle-Localization: plugin diff --git a/bundles/org.xmind.ui.exports.vector/pom.xml b/bundles/org.xmind.ui.exports.vector/pom.xml index 57f3373b7..246c71251 100644 --- a/bundles/org.xmind.ui.exports.vector/pom.xml +++ b/bundles/org.xmind.ui.exports.vector/pom.xml @@ -5,12 +5,12 @@ 4.0.0 org.xmind.cathy.plugins org.xmind.ui.exports.vector - 3.7.3-SNAPSHOT + 3.7.4-SNAPSHOT eclipse-plugin org.xmind.releng org.xmind.cathy.releng - 3.7.3-SNAPSHOT + 3.7.4-SNAPSHOT ../../ diff --git a/bundles/org.xmind.ui.fishbone/META-INF/MANIFEST.MF b/bundles/org.xmind.ui.fishbone/META-INF/MANIFEST.MF index a8bf52d7a..b1da58c5a 100644 --- a/bundles/org.xmind.ui.fishbone/META-INF/MANIFEST.MF +++ b/bundles/org.xmind.ui.fishbone/META-INF/MANIFEST.MF @@ -2,13 +2,13 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.xmind.ui.fishbone;singleton:=true -Bundle-Version: 3.7.3.qualifier +Bundle-Version: 3.7.4.qualifier Bundle-Activator: org.xmind.ui.internal.fishbone.FishboneUIPlugin Bundle-Vendor: %providerName Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, - org.xmind.ui;bundle-version="[3.7.3,3.8.0)", - org.xmind.ui.toolkit;bundle-version="[3.7.3,3.8.0)" + org.xmind.ui;bundle-version="[3.7.4,3.8.0)", + org.xmind.ui.toolkit;bundle-version="[3.7.4,3.8.0)" Eclipse-LazyStart: true Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-ActivationPolicy: lazy diff --git a/bundles/org.xmind.ui.fishbone/pom.xml b/bundles/org.xmind.ui.fishbone/pom.xml index 39738e09a..2d01021fe 100644 --- a/bundles/org.xmind.ui.fishbone/pom.xml +++ b/bundles/org.xmind.ui.fishbone/pom.xml @@ -5,12 +5,12 @@ 4.0.0 org.xmind.cathy.plugins org.xmind.ui.fishbone - 3.7.3-SNAPSHOT + 3.7.4-SNAPSHOT eclipse-plugin org.xmind.releng org.xmind.cathy.releng - 3.7.3-SNAPSHOT + 3.7.4-SNAPSHOT ../../ diff --git a/bundles/org.xmind.ui.imports/META-INF/MANIFEST.MF b/bundles/org.xmind.ui.imports/META-INF/MANIFEST.MF index 4501d1705..48e99cada 100644 --- a/bundles/org.xmind.ui.imports/META-INF/MANIFEST.MF +++ b/bundles/org.xmind.ui.imports/META-INF/MANIFEST.MF @@ -2,15 +2,15 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.xmind.ui.imports;singleton:=true -Bundle-Version: 3.7.3.qualifier +Bundle-Version: 3.7.4.qualifier Bundle-Activator: org.xmind.ui.internal.imports.ImportPlugin Bundle-Vendor: %providerName Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, - org.xmind.core.io;bundle-version="[3.7.3,3.8.0)", - org.xmind.ui.toolkit;bundle-version="[3.7.3,3.8.0)", - org.xmind.ui.mindmap;bundle-version="[3.7.3,3.8.0)", - org.xmind.core.usagedata;bundle-version="[3.7.3,3.8.0)", + org.xmind.core.io;bundle-version="[3.7.4,3.8.0)", + org.xmind.ui.toolkit;bundle-version="[3.7.4,3.8.0)", + org.xmind.ui.mindmap;bundle-version="[3.7.4,3.8.0)", + org.xmind.core.usagedata;bundle-version="[3.7.4,3.8.0)", org.json;bundle-version="1.0.0" Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-ActivationPolicy: lazy diff --git a/bundles/org.xmind.ui.imports/pom.xml b/bundles/org.xmind.ui.imports/pom.xml index 120fe8bc3..c036f6085 100644 --- a/bundles/org.xmind.ui.imports/pom.xml +++ b/bundles/org.xmind.ui.imports/pom.xml @@ -5,12 +5,12 @@ 4.0.0 org.xmind.cathy.plugins org.xmind.ui.imports - 3.7.3-SNAPSHOT + 3.7.4-SNAPSHOT eclipse-plugin org.xmind.releng org.xmind.cathy.releng - 3.7.3-SNAPSHOT + 3.7.4-SNAPSHOT ../../ diff --git a/bundles/org.xmind.ui.menus/META-INF/MANIFEST.MF b/bundles/org.xmind.ui.menus/META-INF/MANIFEST.MF index 295f40d44..3df88017a 100644 --- a/bundles/org.xmind.ui.menus/META-INF/MANIFEST.MF +++ b/bundles/org.xmind.ui.menus/META-INF/MANIFEST.MF @@ -3,12 +3,12 @@ Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, org.eclipse.e4.ui.model.workbench, org.eclipse.e4.ui.workbench, - org.xmind.core;bundle-version="[3.7.3,3.8.0)", - org.xmind.ui;bundle-version="[3.7.3,3.8.0)", - org.xmind.ui.toolkit;bundle-version="[3.7.3,3.8.0)", - org.xmind.ui.spelling;bundle-version="[3.7.3,3.8.0)" + org.xmind.core;bundle-version="[3.7.4,3.8.0)", + org.xmind.ui;bundle-version="[3.7.4,3.8.0)", + org.xmind.ui.toolkit;bundle-version="[3.7.4,3.8.0)", + org.xmind.ui.spelling;bundle-version="[3.7.4,3.8.0)" Bundle-ActivationPolicy: lazy -Bundle-Version: 3.7.3.qualifier +Bundle-Version: 3.7.4.qualifier Bundle-Name: %Bundle-Name Bundle-Activator: org.xmind.ui.menus.MenusPlugin Bundle-ManifestVersion: 2 diff --git a/bundles/org.xmind.ui.menus/pom.xml b/bundles/org.xmind.ui.menus/pom.xml index 28ce0a59f..4514ccdc5 100644 --- a/bundles/org.xmind.ui.menus/pom.xml +++ b/bundles/org.xmind.ui.menus/pom.xml @@ -5,12 +5,12 @@ 4.0.0 org.xmind.cathy.plugins org.xmind.ui.menus - 3.7.3-SNAPSHOT + 3.7.4-SNAPSHOT eclipse-plugin org.xmind.releng org.xmind.cathy.releng - 3.7.3-SNAPSHOT + 3.7.4-SNAPSHOT ../../ diff --git a/bundles/org.xmind.ui.mindmap/META-INF/MANIFEST.MF b/bundles/org.xmind.ui.mindmap/META-INF/MANIFEST.MF index 997966c9c..b04dac335 100644 --- a/bundles/org.xmind.ui.mindmap/META-INF/MANIFEST.MF +++ b/bundles/org.xmind.ui.mindmap/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.xmind.ui.mindmap;singleton:=true -Bundle-Version: 3.7.3.qualifier +Bundle-Version: 3.7.4.qualifier Bundle-ClassPath: . Bundle-Activator: org.xmind.ui.internal.MindMapUIPlugin Bundle-Vendor: %providerName @@ -63,14 +63,14 @@ Require-Bundle: org.eclipse.ui, org.eclipse.core.filesystem, org.eclipse.core.resources, org.apache.commons.codec, - org.xmind.core.runtime;bundle-version="[3.7.3,3.8.0)";visibility:=reexport, - org.xmind.gef.ui;bundle-version="[3.7.3,3.8.0)";visibility:=reexport, - org.xmind.ui.toolkit;bundle-version="[3.7.3,3.8.0)", - org.xmind.ui.browser;bundle-version="[3.7.3,3.8.0)", - org.xmind.ui.spelling;bundle-version="[3.7.3,3.8.0)", - org.xmind.core.command;bundle-version="[3.7.3,3.8.0)", + org.xmind.core.runtime;bundle-version="[3.7.4,3.8.0)";visibility:=reexport, + org.xmind.gef.ui;bundle-version="[3.7.4,3.8.0)";visibility:=reexport, + org.xmind.ui.toolkit;bundle-version="[3.7.4,3.8.0)", + org.xmind.ui.browser;bundle-version="[3.7.4,3.8.0)", + org.xmind.ui.spelling;bundle-version="[3.7.4,3.8.0)", + org.xmind.core.command;bundle-version="[3.7.4,3.8.0)", org.eclipse.swt, - 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.xmind.core, org.eclipse.e4.core.commands, org.eclipse.e4.core.di, diff --git a/bundles/org.xmind.ui.mindmap/pom.xml b/bundles/org.xmind.ui.mindmap/pom.xml index 7c6c832de..c7814409a 100644 --- a/bundles/org.xmind.ui.mindmap/pom.xml +++ b/bundles/org.xmind.ui.mindmap/pom.xml @@ -5,12 +5,12 @@ 4.0.0 org.xmind.cathy.plugins org.xmind.ui.mindmap - 3.7.3-SNAPSHOT + 3.7.4-SNAPSHOT eclipse-plugin org.xmind.releng org.xmind.cathy.releng - 3.7.3-SNAPSHOT + 3.7.4-SNAPSHOT ../../ diff --git a/bundles/org.xmind.ui.mindmap/src/org/xmind/ui/internal/properties/PropertyMessages.java b/bundles/org.xmind.ui.mindmap/src/org/xmind/ui/internal/properties/PropertyMessages.java index 284cea542..b9ef335e0 100644 --- a/bundles/org.xmind.ui.mindmap/src/org/xmind/ui/internal/properties/PropertyMessages.java +++ b/bundles/org.xmind.ui.mindmap/src/org/xmind/ui/internal/properties/PropertyMessages.java @@ -30,6 +30,7 @@ public class PropertyMessages extends NLS { public static String LineWidth_None; public static String LineWidth_Thin; public static String LineWidth_Thinnest; + public static String SheetMultiBranchColorsStylePropertySectionPart_multiBranchColor_text; public static String ShowLegend_text; public static String ShowLegend_toolTip; public static String Structure_toolTip; diff --git a/bundles/org.xmind.ui.mindmap/src/org/xmind/ui/internal/properties/SheetMultiBranchColorsStylePropertySectionPart.java b/bundles/org.xmind.ui.mindmap/src/org/xmind/ui/internal/properties/SheetMultiBranchColorsStylePropertySectionPart.java index 955b4204b..64b3bc2f0 100644 --- a/bundles/org.xmind.ui.mindmap/src/org/xmind/ui/internal/properties/SheetMultiBranchColorsStylePropertySectionPart.java +++ b/bundles/org.xmind.ui.mindmap/src/org/xmind/ui/internal/properties/SheetMultiBranchColorsStylePropertySectionPart.java @@ -177,7 +177,8 @@ protected void createContent(Composite parent) { multiLineColors.setLayout(createLayout(parent)); multiLineColorsCheck = new Button(multiLineColors, SWT.CHECK); - multiLineColorsCheck.setText("Multi Branch Color"); //$NON-NLS-1$ + multiLineColorsCheck.setText( + PropertyMessages.SheetMultiBranchColorsStylePropertySectionPart_multiBranchColor_text); multiLineColorsCheck.addSelectionListener(new SelectionListener() { public void widgetSelected(SelectionEvent e) { MindMapUIPlugin.getDefault().getUsageDataCollector() diff --git a/bundles/org.xmind.ui.mindmap/src/org/xmind/ui/internal/properties/messages.properties b/bundles/org.xmind.ui.mindmap/src/org/xmind/ui/internal/properties/messages.properties index 277701154..778a78f44 100644 --- a/bundles/org.xmind.ui.mindmap/src/org/xmind/ui/internal/properties/messages.properties +++ b/bundles/org.xmind.ui.mindmap/src/org/xmind/ui/internal/properties/messages.properties @@ -11,6 +11,7 @@ LineWidth_Medium=Medium LineWidth_None=None LineWidth_Thin=Thin LineWidth_Thinnest=Thinnest +SheetMultiBranchColorsStylePropertySectionPart_multiBranchColor_text=Multi Branch Color ShowLegend_text=Show Legend ShowLegend_toolTip=Show or hide the legend of this sheet Structure_toolTip=Select the structure of this topic and its subtopics diff --git a/bundles/org.xmind.ui.mindmap/src/org/xmind/ui/internal/svgsupport/SVGImageFigure.java b/bundles/org.xmind.ui.mindmap/src/org/xmind/ui/internal/svgsupport/SVGImageFigure.java index d4d4cad96..4a47dcdc3 100644 --- a/bundles/org.xmind.ui.mindmap/src/org/xmind/ui/internal/svgsupport/SVGImageFigure.java +++ b/bundles/org.xmind.ui.mindmap/src/org/xmind/ui/internal/svgsupport/SVGImageFigure.java @@ -7,9 +7,7 @@ import org.xmind.gef.draw2d.ReferencedFigure; /** - * * @author Enki Xiong - * */ public class SVGImageFigure extends ReferencedFigure { @@ -105,7 +103,10 @@ public Dimension getPreferredSize(int wHint, int hHint) { if (d != null) return d; } - return svgData.getSize(); + if (svgData != null) { + return svgData.getSize(); + } + return new Dimension(0, 0); } /** diff --git a/bundles/org.xmind.ui.resources/META-INF/MANIFEST.MF b/bundles/org.xmind.ui.resources/META-INF/MANIFEST.MF index 5bd16d10e..7635d2943 100644 --- a/bundles/org.xmind.ui.resources/META-INF/MANIFEST.MF +++ b/bundles/org.xmind.ui.resources/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.xmind.ui.resources;singleton:=true -Bundle-Version: 3.7.3.qualifier +Bundle-Version: 3.7.4.qualifier Bundle-Vendor: %providerName Fragment-Host: org.xmind.ui Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/bundles/org.xmind.ui.resources/pom.xml b/bundles/org.xmind.ui.resources/pom.xml index 778f01419..1f2b3cd63 100644 --- a/bundles/org.xmind.ui.resources/pom.xml +++ b/bundles/org.xmind.ui.resources/pom.xml @@ -5,12 +5,12 @@ 4.0.0 org.xmind.cathy.plugins org.xmind.ui.resources - 3.7.3-SNAPSHOT + 3.7.4-SNAPSHOT eclipse-plugin org.xmind.releng org.xmind.cathy.releng - 3.7.3-SNAPSHOT + 3.7.4-SNAPSHOT ../../ diff --git a/bundles/org.xmind.ui.spelling/META-INF/MANIFEST.MF b/bundles/org.xmind.ui.spelling/META-INF/MANIFEST.MF index 0262f947e..b9c38b0f1 100644 --- a/bundles/org.xmind.ui.spelling/META-INF/MANIFEST.MF +++ b/bundles/org.xmind.ui.spelling/META-INF/MANIFEST.MF @@ -2,15 +2,15 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.xmind.ui.spelling;singleton:=true -Bundle-Version: 3.7.3.qualifier +Bundle-Version: 3.7.4.qualifier Bundle-Activator: org.xmind.ui.internal.spelling.SpellingPlugin Bundle-Vendor: %providerName Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, net.sourceforge.jazzy, - org.xmind.ui.toolkit;bundle-version="[3.7.3,3.8.0)", - org.xmind.ui.browser;bundle-version="[3.7.3,3.8.0)", - org.xmind.core.usagedata;bundle-version="[3.7.3,3.8.0)" + org.xmind.ui.toolkit;bundle-version="[3.7.4,3.8.0)", + org.xmind.ui.browser;bundle-version="[3.7.4,3.8.0)", + org.xmind.core.usagedata;bundle-version="[3.7.4,3.8.0)" Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-ActivationPolicy: lazy Export-Package: org.xmind.ui, diff --git a/bundles/org.xmind.ui.spelling/pom.xml b/bundles/org.xmind.ui.spelling/pom.xml index 8ce7876d4..205b5dcf7 100644 --- a/bundles/org.xmind.ui.spelling/pom.xml +++ b/bundles/org.xmind.ui.spelling/pom.xml @@ -5,12 +5,12 @@ 4.0.0 org.xmind.cathy.plugins org.xmind.ui.spelling - 3.7.3-SNAPSHOT + 3.7.4-SNAPSHOT eclipse-plugin org.xmind.releng org.xmind.cathy.releng - 3.7.3-SNAPSHOT + 3.7.4-SNAPSHOT ../../ diff --git a/bundles/org.xmind.ui.spreadsheet/META-INF/MANIFEST.MF b/bundles/org.xmind.ui.spreadsheet/META-INF/MANIFEST.MF index 41f5b205b..17b2d9c46 100644 --- a/bundles/org.xmind.ui.spreadsheet/META-INF/MANIFEST.MF +++ b/bundles/org.xmind.ui.spreadsheet/META-INF/MANIFEST.MF @@ -2,12 +2,12 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.xmind.ui.spreadsheet;singleton:=true -Bundle-Version: 3.7.3.qualifier +Bundle-Version: 3.7.4.qualifier Bundle-Activator: org.xmind.ui.internal.spreadsheet.SpreadsheetUIPlugin Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, - org.xmind.ui;bundle-version="[3.7.3,3.8.0)", - org.xmind.ui.toolkit;bundle-version="[3.7.3,3.8.0)", + org.xmind.ui;bundle-version="[3.7.4,3.8.0)", + org.xmind.ui.toolkit;bundle-version="[3.7.4,3.8.0)", org.xmind.core.runtime, org.xmind.core.usagedata Eclipse-LazyStart: true diff --git a/bundles/org.xmind.ui.spreadsheet/pom.xml b/bundles/org.xmind.ui.spreadsheet/pom.xml index 7fc5ae513..86a4c709a 100644 --- a/bundles/org.xmind.ui.spreadsheet/pom.xml +++ b/bundles/org.xmind.ui.spreadsheet/pom.xml @@ -5,12 +5,12 @@ 4.0.0 org.xmind.cathy.plugins org.xmind.ui.spreadsheet - 3.7.3-SNAPSHOT + 3.7.4-SNAPSHOT eclipse-plugin org.xmind.releng org.xmind.cathy.releng - 3.7.3-SNAPSHOT + 3.7.4-SNAPSHOT ../../ diff --git a/bundles/org.xmind.ui.toolkit/META-INF/MANIFEST.MF b/bundles/org.xmind.ui.toolkit/META-INF/MANIFEST.MF index b8b1db57f..11348c189 100644 --- a/bundles/org.xmind.ui.toolkit/META-INF/MANIFEST.MF +++ b/bundles/org.xmind.ui.toolkit/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.xmind.ui.toolkit;singleton:=true -Bundle-Version: 3.7.3.qualifier +Bundle-Version: 3.7.4.qualifier Bundle-Activator: org.xmind.ui.internal.ToolkitPlugin Bundle-Vendor: %providerName Require-Bundle: org.eclipse.ui;visibility:=reexport, diff --git a/bundles/org.xmind.ui.toolkit/pom.xml b/bundles/org.xmind.ui.toolkit/pom.xml index 285357b62..ebf0468b6 100644 --- a/bundles/org.xmind.ui.toolkit/pom.xml +++ b/bundles/org.xmind.ui.toolkit/pom.xml @@ -5,12 +5,12 @@ 4.0.0 org.xmind.cathy.plugins org.xmind.ui.toolkit - 3.7.3-SNAPSHOT + 3.7.4-SNAPSHOT eclipse-plugin org.xmind.releng org.xmind.cathy.releng - 3.7.3-SNAPSHOT + 3.7.4-SNAPSHOT ../../ diff --git a/bundles/org.xmind.ui/META-INF/MANIFEST.MF b/bundles/org.xmind.ui/META-INF/MANIFEST.MF index f23e71b9e..1cadb7665 100644 --- a/bundles/org.xmind.ui/META-INF/MANIFEST.MF +++ b/bundles/org.xmind.ui/META-INF/MANIFEST.MF @@ -2,13 +2,13 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.xmind.ui;singleton:=true -Bundle-Version: 3.7.3.qualifier +Bundle-Version: 3.7.4.qualifier Bundle-Activator: org.xmind.ui.internal.XmindUIPlugin Bundle-Vendor: %providerName Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, - org.xmind.ui.mindmap;bundle-version="[3.7.3,3.8.0)";visibility:=reexport, - org.xmind.ui.toolkit;bundle-version="[3.7.3,3.8.0)" + org.xmind.ui.mindmap;bundle-version="[3.7.4,3.8.0)";visibility:=reexport, + org.xmind.ui.toolkit;bundle-version="[3.7.4,3.8.0)" Eclipse-LazyStart: true Export-Package: org.xmind.ui.internal;x-friends:="org.xmind.ui" Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/bundles/org.xmind.ui/pom.xml b/bundles/org.xmind.ui/pom.xml index 9a61f552c..be1c55cd4 100644 --- a/bundles/org.xmind.ui/pom.xml +++ b/bundles/org.xmind.ui/pom.xml @@ -5,12 +5,12 @@ 4.0.0 org.xmind.cathy.plugins org.xmind.ui - 3.7.3-SNAPSHOT + 3.7.4-SNAPSHOT eclipse-plugin org.xmind.releng org.xmind.cathy.releng - 3.7.3-SNAPSHOT + 3.7.4-SNAPSHOT ../../ diff --git a/features/org.xmind.cathy.feature/feature.xml b/features/org.xmind.cathy.feature/feature.xml index 4ad7d6e9a..c36469076 100644 --- a/features/org.xmind.cathy.feature/feature.xml +++ b/features/org.xmind.cathy.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/features/org.xmind.cathy.feature/pom.xml b/features/org.xmind.cathy.feature/pom.xml index 7a421f278..f057e78f2 100644 --- a/features/org.xmind.cathy.feature/pom.xml +++ b/features/org.xmind.cathy.feature/pom.xml @@ -5,12 +5,12 @@ 4.0.0 org.xmind.cathy.features org.xmind.cathy.feature - 3.7.3-SNAPSHOT + 3.7.4-SNAPSHOT eclipse-feature org.xmind.releng org.xmind.cathy.releng - 3.7.3-SNAPSHOT + 3.7.4-SNAPSHOT ../../ diff --git a/features/org.xmind.cathy.platform.feature/feature.xml b/features/org.xmind.cathy.platform.feature/feature.xml index a92514ce5..269ceaf0d 100644 --- a/features/org.xmind.cathy.platform.feature/feature.xml +++ b/features/org.xmind.cathy.platform.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/features/org.xmind.cathy.platform.feature/pom.xml b/features/org.xmind.cathy.platform.feature/pom.xml index 8775890ee..08eba89ce 100644 --- a/features/org.xmind.cathy.platform.feature/pom.xml +++ b/features/org.xmind.cathy.platform.feature/pom.xml @@ -5,12 +5,12 @@ 4.0.0 org.xmind.cathy.features org.xmind.cathy.platform.feature - 3.7.3-SNAPSHOT + 3.7.4-SNAPSHOT eclipse-feature org.xmind.releng org.xmind.cathy.releng - 3.7.3-SNAPSHOT + 3.7.4-SNAPSHOT ../../ diff --git a/features/org.xmind.graphicsio.feature/feature.xml b/features/org.xmind.graphicsio.feature/feature.xml index 838f8cac4..b21a6ff88 100644 --- a/features/org.xmind.graphicsio.feature/feature.xml +++ b/features/org.xmind.graphicsio.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/features/org.xmind.graphicsio.feature/pom.xml b/features/org.xmind.graphicsio.feature/pom.xml index 8568d9063..c79fc95f0 100644 --- a/features/org.xmind.graphicsio.feature/pom.xml +++ b/features/org.xmind.graphicsio.feature/pom.xml @@ -5,12 +5,12 @@ 4.0.0 org.xmind.cathy.features org.xmind.graphicsio.feature - 3.7.3-SNAPSHOT + 3.7.4-SNAPSHOT eclipse-feature org.xmind.releng org.xmind.cathy.releng - 3.7.3-SNAPSHOT + 3.7.4-SNAPSHOT ../../ diff --git a/features/org.xmind.hebe.feature/feature.xml b/features/org.xmind.hebe.feature/feature.xml index c97a86895..bcd0f5425 100644 --- a/features/org.xmind.hebe.feature/feature.xml +++ b/features/org.xmind.hebe.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/features/org.xmind.hebe.feature/pom.xml b/features/org.xmind.hebe.feature/pom.xml index baabb796c..351da0a02 100644 --- a/features/org.xmind.hebe.feature/pom.xml +++ b/features/org.xmind.hebe.feature/pom.xml @@ -5,12 +5,12 @@ 4.0.0 org.xmind.cathy.features org.xmind.hebe.feature - 3.7.3-SNAPSHOT + 3.7.4-SNAPSHOT eclipse-feature org.xmind.releng org.xmind.cathy.releng - 3.7.3-SNAPSHOT + 3.7.4-SNAPSHOT ../../ diff --git a/releng/org.xmind.cathy.product/META-INF/MANIFEST.MF b/releng/org.xmind.cathy.product/META-INF/MANIFEST.MF index 3853cb52c..df811b63f 100644 --- a/releng/org.xmind.cathy.product/META-INF/MANIFEST.MF +++ b/releng/org.xmind.cathy.product/META-INF/MANIFEST.MF @@ -2,5 +2,5 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: XMind Products Bundle-SymbolicName: org.xmind.products -Bundle-Version: 3.7.3.qualifier +Bundle-Version: 3.7.4.qualifier Bundle-Vendor: XMind Ltd. diff --git a/releng/org.xmind.cathy.product/cathy.product b/releng/org.xmind.cathy.product/cathy.product index 66ee428c2..838f18437 100644 --- a/releng/org.xmind.cathy.product/cathy.product +++ b/releng/org.xmind.cathy.product/cathy.product @@ -1,7 +1,7 @@ - + diff --git a/releng/org.xmind.cathy.product/pom.xml b/releng/org.xmind.cathy.product/pom.xml index 2abd1ca01..725ff7cbb 100644 --- a/releng/org.xmind.cathy.product/pom.xml +++ b/releng/org.xmind.cathy.product/pom.xml @@ -5,13 +5,13 @@ 4.0.0 org.xmind.releng org.xmind.cathy.product - 3.7.3-SNAPSHOT + 3.7.4-SNAPSHOT eclipse-repository org.xmind.releng org.xmind.cathy.releng - 3.7.3-SNAPSHOT + 3.7.4-SNAPSHOT ../../ diff --git a/releng/org.xmind.cathy.repository/category.xml b/releng/org.xmind.cathy.repository/category.xml index db8f42626..9cd7d5c99 100644 --- a/releng/org.xmind.cathy.repository/category.xml +++ b/releng/org.xmind.cathy.repository/category.xml @@ -1,15 +1,15 @@ - + - + - + - + diff --git a/releng/org.xmind.cathy.repository/pom.xml b/releng/org.xmind.cathy.repository/pom.xml index 68485041c..653e7f032 100644 --- a/releng/org.xmind.cathy.repository/pom.xml +++ b/releng/org.xmind.cathy.repository/pom.xml @@ -8,7 +8,7 @@ org.xmind.releng org.xmind.cathy.releng - 3.7.3-SNAPSHOT + 3.7.4-SNAPSHOT ../../ diff --git a/releng/org.xmind.cathy.target/pom.xml b/releng/org.xmind.cathy.target/pom.xml index b2cd8b678..d75d71219 100644 --- a/releng/org.xmind.cathy.target/pom.xml +++ b/releng/org.xmind.cathy.target/pom.xml @@ -8,7 +8,7 @@ org.xmind.releng org.xmind.cathy.releng - 3.7.3-SNAPSHOT + 3.7.4-SNAPSHOT ../../ diff --git a/tests/org.xmind.core.runtime.tests/META-INF/MANIFEST.MF b/tests/org.xmind.core.runtime.tests/META-INF/MANIFEST.MF index 86a54f574..2fec61b5c 100644 --- a/tests/org.xmind.core.runtime.tests/META-INF/MANIFEST.MF +++ b/tests/org.xmind.core.runtime.tests/META-INF/MANIFEST.MF @@ -2,10 +2,10 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.xmind.core.runtime.tests;singleton:=true -Bundle-Version: 3.7.3.qualifier +Bundle-Version: 3.7.4.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ActivationPolicy: lazy Require-Bundle: org.eclipse.core.runtime, org.junit, - org.xmind.core.runtime;bundle-version="[3.7.3,3.8.0)" + org.xmind.core.runtime;bundle-version="[3.7.4,3.8.0)" diff --git a/tests/org.xmind.core.runtime.tests/pom.xml b/tests/org.xmind.core.runtime.tests/pom.xml index dd5f397ea..7f06153b1 100644 --- a/tests/org.xmind.core.runtime.tests/pom.xml +++ b/tests/org.xmind.core.runtime.tests/pom.xml @@ -5,12 +5,12 @@ 4.0.0 org.xmind.cathy.tests org.xmind.core.runtime.tests - 3.7.3-SNAPSHOT + 3.7.4-SNAPSHOT eclipse-test-plugin org.xmind.releng org.xmind.cathy.releng - 3.7.3-SNAPSHOT + 3.7.4-SNAPSHOT ../../ \ No newline at end of file diff --git a/tests/org.xmind.core.tests/META-INF/MANIFEST.MF b/tests/org.xmind.core.tests/META-INF/MANIFEST.MF index 26ebf6837..2d409dcf4 100644 --- a/tests/org.xmind.core.tests/META-INF/MANIFEST.MF +++ b/tests/org.xmind.core.tests/META-INF/MANIFEST.MF @@ -2,12 +2,12 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.xmind.core.tests;singleton:=true -Bundle-Version: 3.7.3.qualifier +Bundle-Version: 3.7.4.qualifier Bundle-Activator: org.xmind.core.internal.tests.TestPluginForXMindCore Bundle-Vendor: %Bundle-Vendor Require-Bundle: org.eclipse.core.runtime, org.junit, - org.xmind.core;bundle-version="[3.7.3,3.8.0)" + org.xmind.core;bundle-version="[3.7.4,3.8.0)" Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ActivationPolicy: lazy Export-Package: org.xmind.core.internal.experiments;x-internal:=true, diff --git a/tests/org.xmind.core.tests/pom.xml b/tests/org.xmind.core.tests/pom.xml index 35b43a0e5..e76f222f1 100644 --- a/tests/org.xmind.core.tests/pom.xml +++ b/tests/org.xmind.core.tests/pom.xml @@ -5,12 +5,12 @@ 4.0.0 org.xmind.cathy.tests org.xmind.core.tests - 3.7.3-SNAPSHOT + 3.7.4-SNAPSHOT eclipse-test-plugin org.xmind.releng org.xmind.cathy.releng - 3.7.3-SNAPSHOT + 3.7.4-SNAPSHOT ../../ \ No newline at end of file