* We activate a {@link DisabledHandler} handler object for each command to
* be disabled. These handlers are registered within the context of this
@@ -306,12 +312,17 @@ public void subscribeDashboardTransientData(
if (selectedPageId == null || !(selectedPageId instanceof String))
return;
- if (this.tabFolder == null)
+ if (this.tabFolder == null || content == null)
return;
MTabItem item = content.getItemById((String) selectedPageId);
IDashboardPage dashboardPage = content.getDashboardPage(item);
if (dashboardPage != null) {
+ Control control = dashboardPage.getControl();
+ if (control == null || control.isDisposed()) {
+ dashboardPage.createControl(this.tabFolder.getBody());
+ item.setControl(dashboardPage.getControl());
+ }
dashboardPage.setFocus();
this.tabFolder.setSelection(item);
}
@@ -319,7 +330,7 @@ public void subscribeDashboardTransientData(
@Focus
public void setFocus() {
- if (tabFolder != null && !tabFolder.isDisposed()) {
+ if (tabFolder != null && !tabFolder.isDisposed() && content != null) {
MTabItem item = tabFolder.getSelection();
if (item != null) {
IDashboardPage page = content.getDashboardPage(item);
@@ -351,27 +362,33 @@ public void registerAvailableCommandId(String commandId) {
}
public boolean registerContextMenu(Object menuParent, final String menuId) {
- if (menuService != null) {
- if (modelService != null & partModel != null) {
- MPopupMenu menuModel = null;
- for (MMenu item : partModel.getMenus()) {
- if (menuId.equals(item.getElementId())
- && item instanceof MPopupMenu) {
- menuModel = (MPopupMenu) item;
- break;
- }
- }
- if (menuModel == null) {
- menuModel = modelService
- .createModelElement(MPopupMenu.class);
- menuModel.setElementId(menuId);
- menuModel.getTags().add("menuContribution:popup"); //$NON-NLS-1$
- partModel.getMenus().add(menuModel);
- }
+ if (!(menuParent instanceof Control) || menuService == null
+ || partModel == null) {
+ return false;
+ }
+ Control parentControl = (Control) menuParent;
+ MPopupMenu menuModel = null;
+ for (MMenu item : partModel.getMenus()) {
+ if (menuId.equals(item.getElementId())
+ && item instanceof MPopupMenu) {
+ menuModel = (MPopupMenu) item;
+ break;
}
- return menuService.registerContextMenu(menuParent, menuId);
}
- return false;
+ if (menuModel == null) {
+ menuModel = modelService.createModelElement(MPopupMenu.class);
+ menuModel.setElementId(menuId);
+ menuModel.getTags().add("menuContribution:popup"); //$NON-NLS-1$
+ partModel.getMenus().add(menuModel);
+ }
+
+ if (menuModel.getWidget() instanceof Menu) {
+ Menu menu = (Menu) menuModel.getWidget();
+ parentControl.setMenu(menu);
+ return true;
+ }
+
+ return menuService.registerContextMenu(parentControl, menuId);
}
public boolean openEditor(final IEditorInput input, final String editorId) {
@@ -407,7 +424,6 @@ public boolean showView(final String viewId) {
/*
* (non-Javadoc)
- *
* @see
* org.xmind.ui.internal.dashboard.pages.IDashboardContext#getPersistedState
* (java.lang.String)
@@ -420,7 +436,6 @@ public String getPersistedState(String key) {
/*
* (non-Javadoc)
- *
* @see
* org.xmind.ui.internal.dashboard.pages.IDashboardContext#setPersistedState
* (java.lang.String, java.lang.String)
@@ -438,7 +453,6 @@ public void setPersistedState(String key, String value) {
/*
* (non-Javadoc)
- *
* @see org.xmind.ui.internal.dashboard.pages.IDashboardContext#
* getContextVariable(java.lang.Class)
*/
@@ -448,7 +462,6 @@ public T getContextVariable(Class key) {
/*
* (non-Javadoc)
- *
* @see org.xmind.ui.internal.dashboard.pages.IDashboardContext#
* getContextVariable(java.lang.String)
*/
@@ -456,4 +469,4 @@ public Object getContextVariable(String key) {
return context.get(key);
}
-}
\ No newline at end of file
+}
diff --git a/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/dashboard/NewFileDashboardPage.java b/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/dashboard/NewFileDashboardPage.java
index 374804738..48f34610e 100644
--- a/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/dashboard/NewFileDashboardPage.java
+++ b/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/dashboard/NewFileDashboardPage.java
@@ -1,11 +1,15 @@
package org.xmind.cathy.internal.dashboard;
import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+import javax.annotation.PostConstruct;
+
+import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.core.runtime.SafeRunner;
import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.ToolBarManager;
-import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.action.IAction;
import org.eclipse.jface.layout.GridDataFactory;
import org.eclipse.jface.layout.GridLayoutFactory;
import org.eclipse.jface.resource.ColorDescriptor;
@@ -14,39 +18,37 @@
import org.eclipse.jface.resource.ResourceManager;
import org.eclipse.jface.util.SafeRunnable;
import org.eclipse.jface.util.Util;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.ISelectionProvider;
import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.StackLayout;
+import org.eclipse.swt.events.MouseEvent;
+import org.eclipse.swt.events.MouseTrackAdapter;
import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.graphics.Font;
+import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.graphics.Point;
import org.eclipse.swt.layout.FormAttachment;
import org.eclipse.swt.layout.FormData;
import org.eclipse.swt.layout.FormLayout;
-import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Event;
import org.eclipse.swt.widgets.FileDialog;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.ToolBar;
+import org.xmind.cathy.internal.CathyPlugin;
import org.xmind.cathy.internal.WorkbenchMessages;
import org.xmind.ui.internal.dashboard.pages.DashboardPage;
+import org.xmind.ui.internal.dashboard.pages.IDashboardContext;
import org.xmind.ui.internal.dashboard.pages.IDashboardPage;
-import org.xmind.ui.mindmap.ITemplate;
import org.xmind.ui.mindmap.MindMapUI;
import org.xmind.ui.resources.ColorUtils;
import org.xmind.ui.tabfolder.MTabBar;
import org.xmind.ui.tabfolder.MTabBarItem;
import org.xmind.ui.util.StyleProvider;
-public class NewFileDashboardPage extends DashboardPage
- implements ISelectionChangedListener {
+public class NewFileDashboardPage extends DashboardPage implements IAdaptable {
private class SegmentBarStyleProvider extends StyleProvider {
@Override
@@ -142,15 +144,29 @@ public int getAlpha(Object widget, String key, int defaultValue) {
private Composite titleBar = null;
private Composite rightBar = null;
private MTabBar tabBar = null;
- private ToolBar normalModeEditContainer = null;
- private Control editModeContainer = null;
-
- private boolean normalOrEditMode = true;
private Composite pageContainer = null;
- private ITemplate selectedTemplate = null;
- private Action deleteTemplatesAction = null;
+ private List pages = new ArrayList();
+
+ @PostConstruct
+ private void init(IDashboardContext dashboardContext) {
+ NewFromStructuresDashboardPage structurePage = new NewFromStructuresDashboardPage();
+ structurePage.setTitle(WorkbenchMessages.DashboardBlankPage_name);
+ structurePage
+ .setDescription(WorkbenchMessages.DashboardBlankPage_message);
+ structurePage.setContext(dashboardContext);
+ pages.add(structurePage);
+
+ NewFromTemplatesDashboardPage templatePage = new NewFromTemplatesDashboardPage();
+ templatePage.setTitle(WorkbenchMessages.DashboardTemplatesPage_name);
+ templatePage.setDescription(
+ WorkbenchMessages.DashboardTemplatesPage_message);
+ templatePage.setContext(dashboardContext);
+ templatePage.registerAvailableCommands();
+ pages.add(templatePage);
+
+ }
public void createControl(Composite parent) {
final Composite composite = new Composite(parent, SWT.NONE);
@@ -178,12 +194,11 @@ public void createControl(Composite parent) {
this.control = composite;
- addPage(new NewFromStructuresDashboardPage(),
- WorkbenchMessages.DashboardBlankPage_name,
- WorkbenchMessages.DashboardBlankPage_message);
- addPage(new NewFromTemplatesDashboardPage(),
- WorkbenchMessages.DashboardTemplatesPage_name,
- WorkbenchMessages.DashboardTemplatesPage_message);
+ for (IDashboardPage page : pages) {
+ MTabBarItem item = new MTabBarItem(tabBar, SWT.RADIO);
+ item.setText(page.getTitle());
+ item.setData(page);
+ }
setTitleBarComponentLayoutData();
@@ -196,8 +211,8 @@ private void setTitleBarComponentLayoutData() {
// CAUTION: This depends on the fact that the size won't change.
Point tabSize = tabBar.computeSize(SWT.DEFAULT, SWT.DEFAULT);
tabData.left = new FormAttachment(50, -tabSize.x / 2);
- tabData.top = new FormAttachment(0, 0);
- tabData.bottom = new FormAttachment(100, 0);
+ tabData.top = new FormAttachment(50, -tabSize.y / 2);
+ tabData.bottom = new FormAttachment(50, tabSize.y / 2);
tabBar.setLayoutData(tabData);
FormData rightData = new FormData();
@@ -207,24 +222,12 @@ private void setTitleBarComponentLayoutData() {
rightBar.setLayoutData(rightData);
}
- private void addPage(IDashboardPage page, String title,
- String description) {
- page.setTitle(title);
- page.setDescription(description);
- page.setContext(getContext());
-
- MTabBarItem item = new MTabBarItem(tabBar, SWT.RADIO);
- item.setText(title);
- item.setData(page);
- }
-
private Control createTitleBar(Composite parent) {
titleBar = new Composite(parent, SWT.NONE);
FormLayout titleBarLayout = new FormLayout();
- titleBarLayout.marginLeft = 10;
- titleBarLayout.marginRight = 10;
- titleBarLayout.marginTop = 9;
- titleBarLayout.marginBottom = 9;
+ titleBarLayout.marginWidth = 10;
+ titleBarLayout.marginHeight = 0;
+ titleBarLayout.marginRight = 15;
titleBar.setLayout(titleBarLayout);
titleBar.setForeground(parent.getForeground());
// titleBar.setBackground(parent.getBackground());
@@ -294,34 +297,53 @@ public void handleEvent(Event event) {
private Control createRightBar(Composite composite) {
rightBar = new Composite(composite, SWT.NONE);
- GridLayoutFactory.fillDefaults().numColumns(2).applyTo(rightBar);
+ GridLayoutFactory.fillDefaults().numColumns(1).applyTo(rightBar);
+
+ createImportButton(rightBar);
+
+ return rightBar;
+ }
+
+ private void createImportButton(Composite parent) {
+ final Label importBtton = new Label(parent, SWT.NONE);
+ importBtton.setBackground(parent.getBackground());
+ importBtton.setToolTipText(
+ WorkbenchMessages.NewFileDashboardPage_Import_button);
+ importBtton.setImage((Image) resourceManager.get(
+ CathyPlugin.imageDescriptorFromPlugin(CathyPlugin.PLUGIN_ID,
+ "dashboard/new/button_import.png"))); //$NON-NLS-1$
+ GridDataFactory.swtDefaults().align(SWT.END, SWT.CENTER)
+ .grab(true, true).applyTo(importBtton);
+
+ final IAction addTemplateAction = getAddTemplateAction();
+
+ importBtton.addListener(SWT.MouseDown, new Listener() {
- ToolBarManager normalModeToolBarManager = new ToolBarManager();
- Action editModeAction = new Action(
- WorkbenchMessages.NewFileDashboardPage_GoToEditTemplateMode_label) {
@Override
- public void run() {
- normalOrEditMode = false;
- updateTitleBar();
+ public void handleEvent(Event event) {
+ addTemplateAction.run();
}
- };
- editModeAction.setToolTipText(
- WorkbenchMessages.NewFileDashboardPage_GoIntoTemplatesManagerMode_tooltip);
- normalModeToolBarManager.add(editModeAction);
- normalModeEditContainer = normalModeToolBarManager
- .createControl(rightBar);
- GridDataFactory.fillDefaults().align(SWT.FILL, SWT.CENTER)
- .applyTo(normalModeEditContainer);
-
- editModeContainer = createEditModeContainer(rightBar);
- GridDataFactory.fillDefaults().align(SWT.FILL, SWT.FILL)
- .applyTo(editModeContainer);
+ });
- return rightBar;
+ importBtton.addMouseTrackListener(new MouseTrackAdapter() {
+
+ @Override
+ public void mouseExit(MouseEvent e) {
+ importBtton.setImage((Image) resourceManager.get(CathyPlugin
+ .imageDescriptorFromPlugin(CathyPlugin.PLUGIN_ID,
+ "dashboard/new/button_import.png"))); //$NON-NLS-1$
+ }
+
+ @Override
+ public void mouseEnter(MouseEvent e) {
+ importBtton.setImage((Image) resourceManager.get(CathyPlugin
+ .imageDescriptorFromPlugin(CathyPlugin.PLUGIN_ID,
+ "dashboard/new/button_import_hover.png"))); //$NON-NLS-1$
+ }
+ });
}
- private Control createEditModeContainer(final Composite rightBar) {
- ToolBarManager editModeToolBarManager = new ToolBarManager();
+ private IAction getAddTemplateAction() {
Action addTemplateAction = new Action(
WorkbenchMessages.NewFileDashboardPage_AddTemplates_label) {
@Override
@@ -352,43 +374,7 @@ public void run() throws Exception {
addTemplateAction.setToolTipText(
WorkbenchMessages.NewFileDashboardPage_AddTemplates_tooltip);
- deleteTemplatesAction = new Action(
- WorkbenchMessages.NewFileDashboardPage_DeleteTemplate_label) {
- @Override
- public void run() {
- deleteSelectedTemplate();
- }
- };
- deleteTemplatesAction.setToolTipText(
- WorkbenchMessages.NewFileDashboardPage_DeleteTemplate_tooltip);
- deleteTemplatesAction.setEnabled(false);
- Action exitEditModeAction = new Action(
- WorkbenchMessages.NewFileDashboardPage_ExitEditTemplatesMode_label) {
- @Override
- public void run() {
- normalOrEditMode = true;
- updateTitleBar();
- }
- };
- exitEditModeAction.setToolTipText(
- WorkbenchMessages.NewFileDashboardPage_ExitEditMode_tooltip);
- editModeToolBarManager.add(addTemplateAction);
- editModeToolBarManager.add(deleteTemplatesAction);
- editModeToolBarManager.add(exitEditModeAction);
- return editModeToolBarManager.createControl(rightBar);
- }
-
- private void deleteSelectedTemplate() {
- ITemplate template = selectedTemplate;
- if (template != null) {
- if (!MessageDialog.openConfirm(rightBar.getShell(),
- WorkbenchMessages.ConfirmDeleteTemplateDialog_title,
- NLS.bind(
- WorkbenchMessages.ConfirmDeleteTemplateDialog_message_withTemplateName,
- template.getName())))
- return;
- MindMapUI.getResourceManager().removeUserTemplate(template);
- }
+ return addTemplateAction;
}
private Control createPageContainer(Composite parent) {
@@ -416,10 +402,6 @@ private void showPage(MTabBarItem item) {
if (page != null) {
if (page.getControl() == null) {
page.createControl(pageContainer);
- if (page instanceof NewFromTemplatesDashboardPage) {
- ((NewFromTemplatesDashboardPage) page)
- .addSelectionChangedListener(this);
- }
}
layout.topControl = page.getControl();
pageContainer.layout(true);
@@ -427,25 +409,16 @@ private void showPage(MTabBarItem item) {
updateTitleBar();
}
+ getContext().setSelectionProvider(getAdapter(ISelectionProvider.class));
}
private void updateTitleBar() {
MTabBarItem item = tabBar.getSelection();
IDashboardPage page = (IDashboardPage) item.getData();
if (page instanceof NewFromTemplatesDashboardPage) {
- ((GridData) normalModeEditContainer
- .getLayoutData()).exclude = !normalOrEditMode;
- normalModeEditContainer.setVisible(normalOrEditMode);
- ((GridData) editModeContainer
- .getLayoutData()).exclude = normalOrEditMode;
- editModeContainer.setVisible(!normalOrEditMode);
- ((NewFromTemplatesDashboardPage) page).setState(normalOrEditMode);
+ rightBar.setVisible(true);
} else if (page instanceof NewFromStructuresDashboardPage) {
- normalOrEditMode = true;
- ((GridData) normalModeEditContainer.getLayoutData()).exclude = true;
- normalModeEditContainer.setVisible(false);
- ((GridData) editModeContainer.getLayoutData()).exclude = true;
- editModeContainer.setVisible(false);
+ rightBar.setVisible(false);
}
titleBar.layout(true);
}
@@ -464,29 +437,14 @@ public void setFocus() {
}
}
- public void selectionChanged(SelectionChangedEvent event) {
- ITemplate template = findTemplate(event.getSelection());
- setSelectedTemplate(template);
- }
-
- private ITemplate findTemplate(ISelection selection) {
- if (selection instanceof IStructuredSelection) {
- Object element = ((IStructuredSelection) selection)
- .getFirstElement();
- if (element instanceof ITemplate) {
- return (ITemplate) element;
- }
+ public T getAdapter(Class adapter) {
+ MTabBarItem item = tabBar.getSelection();
+ IDashboardPage page = (IDashboardPage) item.getData();
+ if (page instanceof IAdaptable) {
+ return ((IAdaptable) page).getAdapter(adapter);
}
- return null;
- }
- private void setSelectedTemplate(ITemplate template) {
- this.selectedTemplate = template;
- if (deleteTemplatesAction != null) {
- boolean enabled = selectedTemplate != null && MindMapUI
- .getResourceManager().isUserTemplate(selectedTemplate);
- deleteTemplatesAction.setEnabled(enabled);
- }
+ return null;
}
}
diff --git a/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/dashboard/NewFromStructuresDashboardPage.java b/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/dashboard/NewFromStructuresDashboardPage.java
index 692c60f14..7a5d1bf36 100644
--- a/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/dashboard/NewFromStructuresDashboardPage.java
+++ b/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/dashboard/NewFromStructuresDashboardPage.java
@@ -1,11 +1,16 @@
package org.xmind.cathy.internal.dashboard;
+import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.draw2d.geometry.Insets;
+import org.eclipse.jface.resource.JFaceResources;
+import org.eclipse.jface.resource.LocalResourceManager;
+import org.eclipse.jface.resource.ResourceManager;
import org.eclipse.jface.viewers.IOpenListener;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.OpenEvent;
import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Display;
@@ -15,19 +20,25 @@
import org.xmind.core.style.IStyle;
import org.xmind.gef.EditDomain;
import org.xmind.gef.GEF;
+import org.xmind.gef.ui.internal.SpaceCollaborativeEngine;
import org.xmind.gef.util.Properties;
import org.xmind.ui.gallery.GalleryLayout;
import org.xmind.ui.gallery.GallerySelectTool;
import org.xmind.ui.gallery.GalleryViewer;
+import org.xmind.ui.internal.MindMapUIPlugin;
import org.xmind.ui.internal.dashboard.pages.DashboardPage;
import org.xmind.ui.mindmap.MindMapUI;
import org.xmind.ui.mindmap.WorkbookInitializer;
import org.xmind.ui.resources.ColorUtils;
-public class NewFromStructuresDashboardPage extends DashboardPage {
+@SuppressWarnings("restriction")
+public class NewFromStructuresDashboardPage extends DashboardPage
+ implements IAdaptable {
private GalleryViewer viewer;
+ private ResourceManager resources;
+
public void setFocus() {
if (viewer != null && viewer.getControl() != null
&& !viewer.getControl().isDisposed()) {
@@ -36,6 +47,9 @@ public void setFocus() {
}
public void createControl(Composite parent) {
+ resources = new LocalResourceManager(JFaceResources.getResources(),
+ parent);
+
viewer = new GalleryViewer();
EditDomain editDomain = new EditDomain();
@@ -52,12 +66,15 @@ public void createControl(Composite parent) {
properties.set(GalleryViewer.FlatFrames, true);
properties.set(GalleryViewer.ImageConstrained, true);
properties.set(GalleryViewer.Layout,
- new GalleryLayout(GalleryLayout.ALIGN_CENTER,
- GalleryLayout.ALIGN_TOPLEFT, 10, 10,
- new Insets(5, 15, 5, 15)));
+ new GalleryLayout(GalleryLayout.ALIGN_TOPLEFT,
+ GalleryLayout.ALIGN_TOPLEFT, 30, 0,
+ new Insets(10, 65, 20, 65)));
properties.set(GalleryViewer.ContentPaneBorderWidth, 1);
properties.set(GalleryViewer.ContentPaneBorderColor,
- ColorUtils.getColor("#cccccc"));
+ (Color) resources.get(ColorUtils.toDescriptor("#cccccc"))); //$NON-NLS-1$
+
+ properties.set(GalleryViewer.ContentPaneSpaceCollaborativeEngine,
+ new SpaceCollaborativeEngine());
Control control = viewer.createControl(parent);
control.setBackground(parent.getBackground());
@@ -101,10 +118,17 @@ public void run() {
return;
final StructureDescriptor structure = (StructureDescriptor) selectedElement;
- final IStyle theme = chooseTheme(viewer.getControl().getShell());
+ final IStyle theme = chooseTheme(viewer.getControl().getShell(),
+ structure.getValue());
if (theme == null)
return;
+ MindMapUIPlugin.getDefault().getUsageDataCollector()
+ .increase("CreateWorkbookCount"); //$NON-NLS-1$
+ MindMapUIPlugin.getDefault().getUsageDataCollector()
+ .increase("CreateSheetCount"); //$NON-NLS-1$
+ MindMapUIPlugin.getDefault().getUsageDataCollector()
+ .increase("StructureTypeCount:" + structure.getValue()); //$NON-NLS-1$
WorkbookInitializer initializer = WorkbookInitializer.getDefault()
.withStructureClass(structure.getValue()).withTheme(theme);
IEditorInput editorInput = MindMapUI.getEditorInputFactory()
@@ -112,12 +136,24 @@ public void run() {
getContext().openEditor(editorInput, MindMapUI.MINDMAP_EDITOR_ID);
}
- private IStyle chooseTheme(Shell shell) {
- ThemeChooserDialog dialog = new ThemeChooserDialog(shell);
+ private IStyle chooseTheme(Shell shell, String structureClass) {
+ ThemeChooserDialog dialog = new ThemeChooserDialog(shell,
+ structureClass);
int result = dialog.open();
if (result == ThemeChooserDialog.CANCEL)
return null;
return dialog.getSelectedTheme();
}
+ public T getAdapter(Class adapter) {
+ if (viewer != null) {
+ if (adapter.isAssignableFrom(viewer.getClass()))
+ return adapter.cast(viewer);
+ T obj = viewer.getAdapter(adapter);
+ if (obj != null)
+ return obj;
+ }
+ return null;
+ }
+
}
diff --git a/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/dashboard/NewFromTemplatesDashboardPage.java b/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/dashboard/NewFromTemplatesDashboardPage.java
index 06d198b7c..ac30a7657 100644
--- a/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/dashboard/NewFromTemplatesDashboardPage.java
+++ b/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/dashboard/NewFromTemplatesDashboardPage.java
@@ -1,79 +1,33 @@
package org.xmind.cathy.internal.dashboard;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Insets;
-import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.jface.viewers.IOpenListener;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.ISelectionChangedListener;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.OpenEvent;
import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Display;
import org.eclipse.ui.IEditorInput;
-import org.xmind.cathy.internal.WorkbenchMessages;
-import org.xmind.gef.EditDomain;
-import org.xmind.gef.GEF;
-import org.xmind.gef.event.KeyEvent;
-import org.xmind.gef.util.Properties;
-import org.xmind.ui.gallery.GalleryLayout;
-import org.xmind.ui.gallery.GallerySelectTool;
+import org.xmind.cathy.internal.ICathyConstants;
import org.xmind.ui.gallery.GalleryViewer;
+import org.xmind.ui.internal.MindMapUIPlugin;
import org.xmind.ui.internal.dashboard.pages.DashboardPage;
-import org.xmind.ui.internal.wizards.TemplateLabelProvider;
-import org.xmind.ui.mindmap.IResourceManager;
+import org.xmind.ui.internal.dashboard.pages.IDashboardContext;
import org.xmind.ui.mindmap.IResourceManagerListener;
import org.xmind.ui.mindmap.ITemplate;
import org.xmind.ui.mindmap.MindMapUI;
-import org.xmind.ui.resources.ColorUtils;
public class NewFromTemplatesDashboardPage extends DashboardPage
- implements IResourceManagerListener {
-
- private static final int FRAME_WIDTH = 225;
- private static final int FRAME_HEIGHT = 130;
-
- private class TemplateGallerySelectTool extends GallerySelectTool {
- @Override
- protected boolean handleKeyUp(KeyEvent ke) {
- int state = ke.getState();
- int key = ke.keyCode;
- if (state == 0 && key == SWT.DEL) {
- ISelection selection = viewer.getSelection();
- if (selection instanceof IStructuredSelection) {
- Object element = ((IStructuredSelection) selection)
- .getFirstElement();
- if (element instanceof ITemplate) {
- ITemplate template = (ITemplate) element;
- if (MindMapUI.getResourceManager()
- .isUserTemplate(template)) {
- if (MessageDialog.openConfirm(
- viewer.getControl().getShell(),
- WorkbenchMessages.ConfirmDeleteTemplateDialog_title,
- NLS.bind(
- WorkbenchMessages.ConfirmDeleteTemplateDialog_message_withTemplateName,
- template.getName()))) {
- MindMapUI.getResourceManager()
- .removeUserTemplate(template);
- }
- }
- }
- }
- }
- return super.handleKeyUp(ke);
- }
- }
+ implements IResourceManagerListener, IAdaptable {
+
+ private CategorizedTemplateViewer viewer;
- private GalleryViewer viewer;
- private boolean normalOrEditMode;
private boolean templateOpening;
public void setFocus() {
@@ -89,58 +43,69 @@ public void dispose() {
super.dispose();
}
- public void setState(boolean normalOrEditMode) {
- this.normalOrEditMode = normalOrEditMode;
- }
-
public void createControl(Composite parent) {
- viewer = new GalleryViewer();
-
- EditDomain editDomain = new EditDomain();
- editDomain.installTool(GEF.TOOL_SELECT,
- new TemplateGallerySelectTool());
- viewer.setEditDomain(editDomain);
-
- Properties properties = viewer.getProperties();
- properties.set(GalleryViewer.Horizontal, Boolean.TRUE);
- properties.set(GalleryViewer.Wrap, Boolean.TRUE);
- properties.set(GalleryViewer.TitlePlacement,
- GalleryViewer.TITLE_BOTTOM);
- properties.set(GalleryViewer.SingleClickToOpen, Boolean.TRUE);
- properties.set(GalleryViewer.SolidFrames, true);
- properties.set(GalleryViewer.FlatFrames, true);
- properties.set(GalleryViewer.ImageConstrained, true);
- properties.set(GalleryViewer.ImageStretched, true);
- properties.set(GalleryViewer.Layout,
- new GalleryLayout(GalleryLayout.ALIGN_CENTER,
- GalleryLayout.ALIGN_TOPLEFT, 10, 10,
- new Insets(5, 15, 5, 15)));
- properties.set(GalleryViewer.FrameContentSize,
- new Dimension(FRAME_WIDTH, FRAME_HEIGHT));
- properties.set(GalleryViewer.ContentPaneBorderWidth, 1);
- properties.set(GalleryViewer.ContentPaneBorderColor,
- ColorUtils.getColor("#cccccc"));
-
- Control control = viewer.createControl(parent);
- control.setBackground(parent.getBackground());
- control.setForeground(parent.getForeground());
-
- viewer.setLabelProvider(new TemplateLabelProvider());
-
- viewer.setInput(getViewerInput());
+ Composite container = new Composite(parent, SWT.NONE);
+ container.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
+
+ GridLayout layout = new GridLayout();
+ layout.marginWidth = 0;
+ layout.marginLeft = 60;
+ layout.marginRight = 0;
+ layout.marginHeight = 7;
+ container.setLayout(layout);
+
+ MindMapUIPlugin.getDefault().getUsageDataCollector()
+ .increase("ShowTemplatesCount"); //$NON-NLS-1$
+ viewer = new CategorizedTemplateViewer(container);
+ Control control = viewer.getControl();
+ control.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
viewer.addOpenListener(new IOpenListener() {
public void open(OpenEvent event) {
- if (normalOrEditMode) {
- if (!templateOpening)
- handleTemplateSelected(event.getSelection());
+ if (!templateOpening) {
+ handleTemplateSelected(event.getSelection());
+ MindMapUIPlugin.getDefault().getUsageDataCollector()
+ .increase("CreateWorkbookCount"); //$NON-NLS-1$
+ MindMapUIPlugin.getDefault().getUsageDataCollector()
+ .increase("CreateSheetCount"); //$NON-NLS-1$
+ MindMapUIPlugin.getDefault().getUsageDataCollector()
+ .increase("UseTemplatesCount"); //$NON-NLS-1$
}
}
});
MindMapUI.getResourceManager().addResourceManagerListener(this);
- setControl(control);
+ registerContextMenu(control);
+ setControl(container);
+ }
+
+ public void registerAvailableCommands() {
+ IDashboardContext context = getContext();
+
+ context.registerAvailableCommandId(
+ ICathyConstants.COMMAND_TEMPLATE_DUPLICATE);
+ context.registerAvailableCommandId(
+ ICathyConstants.COMMAND_TEMPLATE_RENAME);
+ context.registerAvailableCommandId(
+ ICathyConstants.COMMAND_TEMPLATE_DELETE);
+ }
+
+ private void registerContextMenu(Control control) {
+ getContext().registerContextMenu(control,
+ ICathyConstants.POPUP_TEMPLATE);
+
+ //add context menu for nested viewers' control.
+ Object input = viewer.getInput();
+ if (input instanceof Object[]) {
+ Object[] groups = (Object[]) viewer.getInput();
+ for (Object group : groups) {
+ GalleryViewer nestedViewer = viewer.getNestedViewer(group);
+ if (nestedViewer != null) {
+ nestedViewer.getControl().setMenu(control.getMenu());
+ }
+ }
+ }
}
public void addSelectionChangedListener(
@@ -150,31 +115,15 @@ public void addSelectionChangedListener(
}
}
- private List getViewerInput() {
- ArrayList templates = new ArrayList();
- IResourceManager resourceManager = MindMapUI.getResourceManager();
- templates.addAll(resourceManager.getSystemTemplates());
- templates.addAll(resourceManager.getUserTemplates());
- // move recently added template ahead
- Collections.reverse(templates);
- return templates;
- }
-
public void userTemplateAdded(ITemplate template) {
- if (template instanceof ITemplate) {
- if (viewer == null || viewer.getControl() == null
- || viewer.getControl().isDisposed())
- return;
- viewer.setInput(getViewerInput());
+ if (viewer != null) {
+ viewer.userTemplateAdded(template);
}
}
public void userTemplateRemoved(ITemplate template) {
- if (template instanceof ITemplate) {
- if (viewer == null || viewer.getControl() == null
- || viewer.getControl().isDisposed())
- return;
- viewer.setInput(getViewerInput());
+ if (viewer != null) {
+ viewer.userTemplateRemoved(template);
}
}
@@ -209,4 +158,15 @@ public void run() {
templateOpening = false;
}
+ public T getAdapter(Class adapter) {
+ if (viewer != null) {
+ if (adapter.isAssignableFrom(viewer.getClass()))
+ return adapter.cast(viewer);
+ T obj = viewer.getAdapter(adapter);
+ if (obj != null)
+ return obj;
+ }
+ return null;
+ }
+
}
diff --git a/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/dashboard/RecentContainerLayout.java b/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/dashboard/RecentContainerLayout.java
new file mode 100644
index 000000000..a5682be5e
--- /dev/null
+++ b/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/dashboard/RecentContainerLayout.java
@@ -0,0 +1,106 @@
+package org.xmind.cathy.internal.dashboard;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.draw2d.AbstractHintLayout;
+import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.PositionConstants;
+import org.eclipse.draw2d.geometry.Dimension;
+import org.eclipse.draw2d.geometry.Rectangle;
+
+public class RecentContainerLayout extends AbstractHintLayout {
+ private Map constraints = new HashMap();
+
+ public RecentContainerLayout() {
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.eclipse.draw2d.AbstractLayout#setConstraint(org.eclipse.draw2d.
+ * IFigure, java.lang.Object)
+ */
+ @Override
+ public void setConstraint(IFigure child, Object constraint) {
+ constraints.put(child, constraint);
+ super.setConstraint(child, constraint);
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.eclipse.draw2d.AbstractLayout#getConstraint(org.eclipse.draw2d.
+ * IFigure)
+ */
+ @Override
+ public Object getConstraint(IFigure child) {
+ Object constraint = constraints.get(child);
+ return constraint == null ? super.getConstraint(child) : constraint;
+ }
+
+ public void layout(IFigure container) {
+ Rectangle area = container.getClientArea();
+ for (Object child : container.getChildren()) {
+ IFigure figure = (IFigure) child;
+ Dimension childSize = figure.getPreferredSize(-1, -1);
+ int childWidth = Math.min(area.width, childSize.width);
+ int childHeight = Math.min(area.height, childSize.height);
+
+ int childX, childY;
+ Object constraint = getConstraint(figure);
+ if (constraint instanceof Integer) {
+ int bit = ((Integer) constraint).intValue();
+ if ((bit & PositionConstants.LEFT) != 0) {
+ childX = area.x;
+ } else if ((bit & PositionConstants.RIGHT) != 0) {
+ childX = area.x + area.width - childWidth;
+ } else if ((bit & PositionConstants.CENTER) != 0) {
+ childX = area.x + (area.width - childWidth) / 2;
+ } else {
+ childX = area.x;
+ childWidth = area.width;
+ }
+ if ((bit & PositionConstants.TOP) != 0) {
+ childY = area.y;
+ } else if ((bit & PositionConstants.BOTTOM) != 0) {
+ childY = area.y + area.height - childHeight;
+ } else if ((bit & PositionConstants.MIDDLE) != 0) {
+ childY = area.y + (area.height - childHeight) / 2;
+ } else {
+ childY = area.y;
+ childHeight = area.height;
+ }
+ } else {
+ childX = area.x;
+ childY = area.y;
+ childWidth = area.width;
+ childHeight = area.height;
+ }
+
+ figure.setBounds(
+ new Rectangle(childX, childY, childWidth, childHeight));
+ }
+ }
+
+ @Override
+ protected Dimension calculatePreferredSize(IFigure figure, int wHint,
+ int hHint) {
+ if (wHint > -1)
+ wHint = Math.max(0, wHint - figure.getInsets().getWidth());
+ if (hHint > -1)
+ hHint = Math.max(0, hHint - figure.getInsets().getHeight());
+
+ Dimension d = new Dimension();
+ List children = figure.getChildren();
+ IFigure child;
+ for (int i = 0; i < children.size(); i++) {
+ child = (IFigure) children.get(i);
+ if (!isObservingVisibility() || child.isVisible())
+ d.union(child.getPreferredSize(wHint, hHint));
+ }
+
+ d.expand(figure.getInsets().getWidth(), figure.getInsets().getHeight());
+ d.union(getBorderPreferredSize(figure));
+ return d;
+ }
+}
diff --git a/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/dashboard/RecentFileBlankPage.java b/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/dashboard/RecentFileBlankPage.java
new file mode 100644
index 000000000..33f7e7547
--- /dev/null
+++ b/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/dashboard/RecentFileBlankPage.java
@@ -0,0 +1,81 @@
+package org.xmind.cathy.internal.dashboard;
+
+import org.eclipse.jface.layout.GridDataFactory;
+import org.eclipse.jface.layout.GridLayoutFactory;
+import org.eclipse.jface.resource.JFaceResources;
+import org.eclipse.jface.resource.LocalResourceManager;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.Font;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Label;
+import org.xmind.cathy.internal.CathyPlugin;
+import org.xmind.cathy.internal.WorkbenchMessages;
+import org.xmind.ui.resources.ColorUtils;
+import org.xmind.ui.views.Page;
+
+public class RecentFileBlankPage extends Page {
+
+ private static final String COLOR_DESCRIPTION = "#9B9B9B"; //$NON-NLS-1$
+ private LocalResourceManager resources;
+
+ @Override
+ protected Control doCreateControl(Composite parent) {
+ final Composite composite = new Composite(parent, SWT.NONE);
+ composite.setBackground(parent.getBackground());
+ composite.setForeground(parent.getForeground());
+ GridLayoutFactory.fillDefaults().spacing(0, 0).applyTo(composite);
+
+ if (resources == null)
+ resources = new LocalResourceManager(JFaceResources.getResources(),
+ composite);
+ return createContent(composite);
+ }
+
+ private Control createContent(Composite parent) {
+ Composite panel = new Composite(parent, SWT.NONE);
+ panel.setBackground(parent.getBackground());
+ GridLayoutFactory.fillDefaults().spacing(0, 24)
+ .extendedMargins(0, 0, 0, 100).applyTo(panel);
+ GridDataFactory.fillDefaults().grab(true, true)
+ .align(SWT.CENTER, SWT.CENTER).applyTo(panel);
+
+ Label imageLabel = new Label(panel, SWT.NONE);
+ imageLabel.setImage((Image) resources.get(
+ CathyPlugin.imageDescriptorFromPlugin(CathyPlugin.PLUGIN_ID,
+ "dashboard/recent/blank_recent.png"))); //$NON-NLS-1$
+ GridDataFactory.fillDefaults().align(SWT.CENTER, SWT.CENTER)
+ .grab(true, false).applyTo(imageLabel);
+ Point imageSize = imageLabel.computeSize(SWT.DEFAULT, SWT.DEFAULT);
+
+ Control textArea = createTextArea(panel);
+ GridDataFactory.fillDefaults().align(SWT.CENTER, SWT.FILL)
+ .grab(true, false).hint(imageSize.x + 140, SWT.DEFAULT)
+ .applyTo(textArea);
+
+ return parent;
+ }
+
+ private Control createTextArea(Composite parent) {
+ Composite composite = new Composite(parent, SWT.NONE);
+ composite.setBackground(parent.getBackground());
+ composite.setForeground(parent.getForeground());
+ GridLayoutFactory.fillDefaults().spacing(0, 24).applyTo(composite);
+
+ Label descriptionLabel = new Label(composite, SWT.CENTER | SWT.WRAP);
+ descriptionLabel.setForeground((Color) resources
+ .get(ColorUtils.toDescriptor(COLOR_DESCRIPTION)));
+ descriptionLabel.setFont(
+ (Font) resources.get(JFaceResources.getDefaultFontDescriptor()
+ .setStyle(SWT.NORMAL).setHeight(12)));
+ descriptionLabel
+ .setText(WorkbenchMessages.RecentFileBlankPage_description);
+ GridDataFactory.fillDefaults().align(SWT.FILL, SWT.FILL)
+ .grab(true, false).applyTo(descriptionLabel);
+
+ return composite;
+ }
+}
diff --git a/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/dashboard/RecentFileGridDashboardPage.java b/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/dashboard/RecentFileGridDashboardPage.java
new file mode 100644
index 000000000..0d89de052
--- /dev/null
+++ b/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/dashboard/RecentFileGridDashboardPage.java
@@ -0,0 +1,117 @@
+package org.xmind.cathy.internal.dashboard;
+
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.IWorkbenchCommandConstants;
+import org.eclipse.ui.PlatformUI;
+import org.xmind.cathy.internal.ICathyConstants;
+import org.xmind.ui.editor.IEditorHistory;
+import org.xmind.ui.editor.IEditorHistory.IEditorHistoryListener;
+import org.xmind.ui.gallery.GalleryViewer;
+import org.xmind.ui.internal.dashboard.pages.DashboardPage;
+import org.xmind.ui.internal.dashboard.pages.IDashboardContext;
+import org.xmind.ui.views.IPage;
+import org.xmind.ui.views.PageStack;
+
+public class RecentFileGridDashboardPage extends DashboardPage
+ implements IAdaptable {
+
+ private static final String COMMAND_OPEN_SEAWIND_FILE_ID = "org.xmind.ui.seawind.command.openSeawindFile"; //$NON-NLS-1$
+
+ private static final String COMMAND_OPEN_LOCAL_FILE_ID = "org.xmind.ui.mindmap.command.openLocalFile"; //$NON-NLS-1$
+
+ private GalleryViewer viewer;
+
+ private PageStack stack;
+
+ IPage recentBlankPage;
+
+ IPage recentFileGridPage;
+
+ public void createControl(Composite parent) {
+
+ stack = new PageStack();
+ stack.createControl(parent);
+ stack.getControl().setBackground(parent.getBackground());
+
+ final IEditorHistory editorHistory = PlatformUI.getWorkbench()
+ .getService(IEditorHistory.class);
+ editorHistory.addEditorHistoryListener(new IEditorHistoryListener() {
+
+ @Override
+ public void editorHistoryChanged() {
+ if (getControl() == null || getControl().isDisposed())
+ return;
+ if (Display.getCurrent() == null)
+ return;
+ showPage(editorHistory);
+ }
+ });
+
+ //do chose which viewer will show;
+ showPage(editorHistory);
+ }
+
+ private void showPage(final IEditorHistory editorHistory) {
+ Composite composite = stack.getStackComposite();
+
+ if (editorHistory.getAllInputURIs().length == 0) {
+ if (recentBlankPage == null) {
+ recentBlankPage = new RecentFileBlankPage();
+ recentBlankPage.createControl(composite);
+ }
+ stack.showPage(recentBlankPage);
+ } else {
+ if (recentFileGridPage == null) {
+ recentFileGridPage = new RecentFileGridPage();
+ recentFileGridPage.createControl(composite);
+ viewer = recentFileGridPage.getAdapter(GalleryViewer.class);
+ }
+ stack.showPage(recentFileGridPage);
+ }
+ setControl(stack.getControl());
+ stack.setFocus();
+ }
+
+ @Override
+ public void setContext(IDashboardContext context) {
+ super.setContext(context);
+ context.registerAvailableCommandId(
+ ICathyConstants.COMMAND_RECENTFILE_PIN);
+ context.registerAvailableCommandId(
+ ICathyConstants.COMMAND_RECENTFILE_UNPIN);
+ context.registerAvailableCommandId(
+ ICathyConstants.COMMAND_RECENTFILE_CLEAR);
+ context.registerAvailableCommandId(
+ IWorkbenchCommandConstants.EDIT_DELETE);
+
+ //register command in DashboardContext
+ context.registerAvailableCommandId(COMMAND_OPEN_SEAWIND_FILE_ID);
+ context.registerAvailableCommandId(COMMAND_OPEN_LOCAL_FILE_ID);
+ }
+
+ public void setFocus() {
+ if (viewer != null && viewer.getControl() != null
+ && !viewer.getControl().isDisposed()) {
+ getContext().registerContextMenu(viewer.getControl(),
+ ICathyConstants.POPUP_RECENTFILE);
+ }
+ if (stack != null && stack.getControl() != null
+ && !stack.getControl().isDisposed()) {
+ stack.setFocus();
+ }
+ }
+
+ public T getAdapter(Class adapter) {
+ if (viewer != null) {
+ if (adapter.isAssignableFrom(viewer.getClass()))
+ return adapter.cast(viewer);
+ T obj = viewer.getAdapter(adapter);
+ if (obj != null)
+ return obj;
+ }
+ return null;
+ }
+
+}
diff --git a/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/dashboard/RecentFileGridPage.java b/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/dashboard/RecentFileGridPage.java
new file mode 100644
index 000000000..a7ddbe5c1
--- /dev/null
+++ b/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/dashboard/RecentFileGridPage.java
@@ -0,0 +1,177 @@
+package org.xmind.cathy.internal.dashboard;
+
+import java.net.URI;
+
+import org.eclipse.core.commands.Command;
+import org.eclipse.core.commands.IParameter;
+import org.eclipse.core.commands.Parameterization;
+import org.eclipse.core.commands.ParameterizedCommand;
+import org.eclipse.core.commands.common.NotDefinedException;
+import org.eclipse.e4.core.commands.ECommandService;
+import org.eclipse.e4.core.commands.EHandlerService;
+import org.eclipse.jface.layout.GridDataFactory;
+import org.eclipse.jface.layout.GridLayoutFactory;
+import org.eclipse.jface.resource.JFaceResources;
+import org.eclipse.jface.resource.LocalResourceManager;
+import org.eclipse.jface.viewers.IOpenListener;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.OpenEvent;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.Font;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.PlatformUI;
+import org.xmind.cathy.internal.CathyPlugin;
+import org.xmind.cathy.internal.WorkbenchMessages;
+import org.xmind.ui.gallery.GalleryViewer;
+import org.xmind.ui.resources.ColorUtils;
+import org.xmind.ui.views.Page;
+
+public class RecentFileGridPage extends Page {
+
+ private static final String COMMANDPARAMETER_OPEN_CLOUD_FILE_URI = "org.xmind.ui.seawind.commandparameter.openCloudFile.uri"; //$NON-NLS-1$
+
+ private static final String COMMAND_OPEN_SEAWIND_FILE_ID = "org.xmind.ui.seawind.command.openSeawindFile"; //$NON-NLS-1$
+
+ private static final String COMMAND_OPEN_LOCAL_FILE_ID = "org.xmind.ui.mindmap.command.openLocalFile"; //$NON-NLS-1$
+
+ private static final String COMMANDPARAMETER_OPEN_LOCAL_FILE_URI = "org.xmind.ui.mindmap.commandparameter.openLocalFile.uri"; //$NON-NLS-1$
+
+ private GalleryViewer viewer;
+
+ private LocalResourceManager resources;
+
+ @Override
+ protected Control doCreateControl(Composite parent) {
+ final Composite composite = new Composite(parent, SWT.NONE);
+ composite.setBackground(parent.getBackground());
+ composite.setForeground(parent.getForeground());
+ GridLayoutFactory.fillDefaults().spacing(0, 0).applyTo(composite);
+ GridDataFactory.fillDefaults().grab(true, true).applyTo(composite);
+
+ if (null == resources)
+ resources = new LocalResourceManager(JFaceResources.getResources(),
+ composite);
+ Composite titleBar = new Composite(composite, SWT.NONE);
+ titleBar.setBackground(
+ (Color) resources.get(ColorUtils.toDescriptor("#ececec"))); //$NON-NLS-1$
+ titleBar.setForeground(composite.getForeground());
+ GridLayoutFactory.fillDefaults().margins(10, 10).applyTo(titleBar);
+ GridData titleBarData = new GridData(SWT.FILL, SWT.FILL, true, false);
+ titleBarData.heightHint = 44;
+ titleBar.setLayoutData(titleBarData);
+
+ Label titleLabel = new Label(titleBar, SWT.NONE);
+ titleLabel.setBackground(titleBar.getBackground());
+ titleLabel.setForeground(
+ (Color) resources.get(ColorUtils.toDescriptor("#000000"))); //$NON-NLS-1$
+
+ titleLabel.setFont((Font) resources.get(
+ JFaceResources.getHeaderFontDescriptor().increaseHeight(-1)));
+
+ titleLabel.setText(WorkbenchMessages.DashboardRecentFiles_message);
+ GridDataFactory.fillDefaults().align(SWT.FILL, SWT.CENTER)
+ .grab(true, true).applyTo(titleLabel);
+
+ Label separator = new Label(composite, SWT.SEPARATOR | SWT.HORIZONTAL);
+ separator.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
+
+ Composite panel = new Composite(composite, SWT.NONE);
+ GridLayoutFactory.fillDefaults().spacing(0, 0).applyTo(panel);
+ GridDataFactory.fillDefaults().grab(true, true).applyTo(panel);
+
+ createViewer(panel);
+ return composite;
+ }
+
+ private void createViewer(Composite parent) {
+ viewer = new RecentFileViewer(parent);
+
+ viewer.addOpenListener(new IOpenListener() {
+ public void open(OpenEvent event) {
+ handleOpenRecentFile(event.getSelection());
+ }
+ });
+ }
+
+ private void handleOpenRecentFile(ISelection selection) {
+ if (!(selection instanceof IStructuredSelection))
+ return;
+
+ Object element = ((IStructuredSelection) selection).getFirstElement();
+ if (!(element instanceof URI))
+ return;
+
+ URI uri = (URI) element;
+ if (uri.getScheme().equalsIgnoreCase("seawind")) {//$NON-NLS-1$
+ // TODO do execute command openEditor by seawind plugin
+ openCloudFile(uri);
+ } else if (uri.getScheme().equalsIgnoreCase("file")) { //$NON-NLS-1$
+ //TODO do execute command openEditor by mindmap plugin
+ openLocalFile(uri);
+ }
+ }
+
+ private void openLocalFile(final URI uri) {
+ executeCommand(COMMAND_OPEN_LOCAL_FILE_ID,
+ COMMANDPARAMETER_OPEN_LOCAL_FILE_URI, uri);
+ }
+
+ private void openCloudFile(final URI uri) {
+ executeCommand(COMMAND_OPEN_SEAWIND_FILE_ID,
+ COMMANDPARAMETER_OPEN_CLOUD_FILE_URI, uri);
+ }
+
+ private void executeCommand(String commandId, String parameter, URI uri) {
+ IWorkbenchWindow window = PlatformUI.getWorkbench()
+ .getActiveWorkbenchWindow();
+ if (window == null)
+ return;
+
+ final EHandlerService hs = window.getService(EHandlerService.class);
+ final ECommandService cs = window.getService(ECommandService.class);
+
+ if (hs == null || cs == null)
+ return;
+
+ final Command command = cs.getCommand(commandId);
+ if (command == null || !command.isDefined())
+ return;
+
+ try {
+ IParameter param = command.getParameter(parameter);
+ if (param == null)
+ return;
+
+ ParameterizedCommand pc = new ParameterizedCommand(command,
+ new Parameterization[] {
+ new Parameterization(param, uri.toString()) });
+
+ if (!hs.canExecute(pc))
+ return;
+ hs.executeHandler(pc);
+
+ } catch (NotDefinedException e) {
+ CathyPlugin.log(e, this.getClass().getName()
+ + "-->execute openLocalFileHandler or openCloudFileHandler"); //$NON-NLS-1$
+ }
+ }
+
+ @Override
+ public T getAdapter(Class adapter) {
+ if (viewer != null) {
+ if (adapter.isAssignableFrom(viewer.getClass()))
+ return adapter.cast(viewer);
+ T obj = viewer.getAdapter(adapter);
+ if (obj != null)
+ return obj;
+ }
+ return super.getAdapter(adapter);
+ }
+
+}
diff --git a/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/dashboard/RecentFileListDashboardPage.java b/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/dashboard/RecentFileListDashboardPage.java
deleted file mode 100644
index 0e93e4a72..000000000
--- a/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/dashboard/RecentFileListDashboardPage.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package org.xmind.cathy.internal.dashboard;
-
-import java.net.URI;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.jface.layout.GridDataFactory;
-import org.eclipse.jface.layout.GridLayoutFactory;
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.jface.viewers.IOpenListener;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.OpenEvent;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IWorkbenchCommandConstants;
-import org.xmind.cathy.internal.ICathyConstants;
-import org.xmind.cathy.internal.WorkbenchMessages;
-import org.xmind.ui.gallery.GalleryViewer;
-import org.xmind.ui.internal.dashboard.pages.DashboardPage;
-import org.xmind.ui.internal.dashboard.pages.IDashboardContext;
-import org.xmind.ui.mindmap.MindMapUI;
-import org.xmind.ui.resources.ColorUtils;
-
-public class RecentFileListDashboardPage extends DashboardPage
- implements IAdaptable {
-
- private GalleryViewer viewer;
-
- public void createControl(Composite parent) {
- Composite composite = new Composite(parent, SWT.NONE);
- composite.setBackground(parent.getBackground());
- composite.setForeground(parent.getForeground());
- GridLayoutFactory.fillDefaults().spacing(0, 0).applyTo(composite);
-
- Composite titleBar = new Composite(composite, SWT.NONE);
-// titleBar.setBackground(composite.getBackground());
- titleBar.setBackground((Color) JFaceResources.getResources()
- .get(ColorUtils.toDescriptor("#ececec"))); //$NON-NLS-1$
- titleBar.setForeground(composite.getForeground());
- GridLayoutFactory.fillDefaults().margins(10, 10).applyTo(titleBar);
- GridData titleBarData = new GridData(SWT.FILL, SWT.FILL, true, false);
- titleBarData.heightHint = 44;
- titleBar.setLayoutData(titleBarData);
-
- Label titleLabel = new Label(titleBar, SWT.NONE);
- titleLabel.setBackground(titleBar.getBackground());
-// titleLabel.setForeground(titleBar.getForeground());
- titleLabel.setForeground((Color) JFaceResources.getResources()
- .get(ColorUtils.toDescriptor("#000000"))); //$NON-NLS-1$
- titleLabel.setFont((Font) JFaceResources.getResources().get(
- JFaceResources.getHeaderFontDescriptor().increaseHeight(-1)));
- titleLabel.setText(WorkbenchMessages.DashboardRecentFiles_message);
- GridDataFactory.fillDefaults().align(SWT.FILL, SWT.CENTER)
- .grab(true, true).applyTo(titleLabel);
-
- Label separator = new Label(composite, SWT.SEPARATOR | SWT.HORIZONTAL);
- separator.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
-
- IDashboardContext context = getContext();
- context.registerAvailableCommandId(
- ICathyConstants.COMMAND_RECENTFILE_PIN);
- context.registerAvailableCommandId(
- ICathyConstants.COMMAND_RECENTFILE_UNPIN);
- context.registerAvailableCommandId(
- ICathyConstants.COMMAND_RECENTFILE_CLEAR);
- context.registerAvailableCommandId(
- IWorkbenchCommandConstants.EDIT_DELETE);
- Control container = createViewer(composite);
- context.registerContextMenu(container,
- ICathyConstants.POPUP_RECENTFILE);
- setControl(composite);
- }
-
- protected Control createViewer(Composite parent) {
- viewer = new RecentFileViewer(parent);
- Control control = viewer.getControl();
- GridData viewerLayoutData = new GridData(SWT.FILL, SWT.FILL, true,
- true);
- control.setLayoutData(viewerLayoutData);
-
- control.setBackground(parent.getBackground());
- control.setForeground(parent.getForeground());
-
- viewer.addOpenListener(new IOpenListener() {
- public void open(OpenEvent event) {
- ISelection selection = event.getSelection();
- if (selection instanceof IStructuredSelection) {
- final Object element = ((IStructuredSelection) selection)
- .getFirstElement();
- if (element instanceof URI) {
- handleOpenRecentFile((URI) element);
- }
- }
- }
- });
-
- return control;
- }
-
- private void handleOpenRecentFile(URI uri) {
- IEditorInput input = MindMapUI.getEditorInputFactory()
- .createEditorInput(uri);
- getContext().openEditor(input, MindMapUI.MINDMAP_EDITOR_ID);
- }
-
- public void setFocus() {
- if (viewer != null && viewer.getControl() != null
- && !viewer.getControl().isDisposed()) {
- viewer.getControl().setFocus();
- }
- }
-
- public T getAdapter(Class adapter) {
- if (viewer != null) {
- if (adapter.isAssignableFrom(viewer.getClass()))
- return adapter.cast(viewer);
- T obj = viewer.getAdapter(adapter);
- if (obj != null)
- return obj;
- }
- return null;
- }
-
-}
diff --git a/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/dashboard/RecentFileViewer.java b/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/dashboard/RecentFileViewer.java
index 413201ce9..f5e810997 100644
--- a/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/dashboard/RecentFileViewer.java
+++ b/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/dashboard/RecentFileViewer.java
@@ -1,267 +1,48 @@
package org.xmind.cathy.internal.dashboard;
-import java.io.IOException;
-import java.io.InputStream;
import java.net.URI;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
-import org.eclipse.draw2d.Figure;
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.IFigure;
import org.eclipse.draw2d.geometry.Dimension;
import org.eclipse.draw2d.geometry.Insets;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.resource.JFaceResources;
+import org.eclipse.jface.resource.LocalResourceManager;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.LabelProvider;
import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.ImageData;
+import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.PlatformUI;
import org.xmind.cathy.internal.ICathyConstants;
+import org.xmind.cathy.internal.dashboard.RecentFilesGalleryPartFactory.RecentFilesFramePart;
import org.xmind.gef.EditDomain;
import org.xmind.gef.GEF;
-import org.xmind.gef.draw2d.graphics.GraphicsUtils;
-import org.xmind.gef.part.GraphicalEditPart;
-import org.xmind.gef.part.IPart;
-import org.xmind.gef.part.IPartFactory;
+import org.xmind.gef.ui.internal.SpaceCollaborativeEngine;
import org.xmind.gef.util.Properties;
import org.xmind.ui.editor.IEditorHistory;
-import org.xmind.ui.gallery.FramePart;
import org.xmind.ui.gallery.GalleryLayout;
import org.xmind.ui.gallery.GalleryNavigablePolicy;
import org.xmind.ui.gallery.GallerySelectTool;
import org.xmind.ui.gallery.GalleryViewer;
-import org.xmind.ui.internal.protocols.FilePathParser;
-import org.xmind.ui.mindmap.IMindMapImages;
-import org.xmind.ui.mindmap.MindMapUI;
import org.xmind.ui.resources.ColorUtils;
public class RecentFileViewer extends GalleryViewer {
- private static class RecentInputURILabelProvider extends LabelProvider {
-
- private Map labels;
-
- public void setLabels(Map labels) {
- this.labels = labels;
- }
-
- @Override
- public String getText(Object element) {
- if (!(element instanceof URI))
- return super.getText(element);
- URI uri = (URI) element;
- String label = labels == null ? null : labels.get(uri);
- if (label != null)
- return label;
- return uri.toString();
- }
- }
-
- private class RecentFileFigure extends Figure {
-
- private URI recentFile;
-
- private final Rectangle RECT = new Rectangle();
-
- private Image pinImage = null;
-
- public void setRecentFile(URI recentFile) {
- if (this.recentFile == recentFile)
- return;
- this.recentFile = recentFile;
- repaint();
- }
-
- public void setPinImage(Image pinImage) {
- if (pinImage == this.pinImage)
- return;
- this.pinImage = pinImage;
- repaint();
- }
-
- public void paint(Graphics graphics) {
- GraphicsUtils.fixGradientBugForCarbon(graphics, this);
- super.paint(graphics);
- }
-
- protected void paintFigure(Graphics graphics) {
- super.paintFigure(graphics);
- drawRecentFile(graphics);
- }
-
- protected void drawRecentFile(Graphics graphics) {
- if (recentFile == null)
- return;
-
- graphics.setAntialias(SWT.ON);
- graphics.setTextAntialias(SWT.ON);
-
- drawRecentFile(graphics, recentFile);
- }
-
- protected void drawRecentFile(Graphics graphics, URI recentFile) {
- Image image = getImageFromSource(recentFile);
-
- if (image != null) {
- Dimension imageSize = new Dimension(image);
- paintImage(graphics, image, imageSize,
- getImageClientArea(imageSize));
- }
-
- if (pinImage != null) {
- Rectangle ca = getClientArea();
- graphics.drawImage(pinImage, ca.x + 1, ca.y + 1);
- }
- }
-
- protected Rectangle getImageClientArea(Dimension imageSize) {
- Rectangle area = getClientArea(RECT);
- Boolean isStretched = (Boolean) RecentFileViewer.this
- .getProperty(GalleryViewer.ImageStretched, false);
- Boolean isConstrained = (Boolean) RecentFileViewer.this
- .getProperty(GalleryViewer.ImageConstrained, false);
- if (isConstrained && (isStretched || imageSize.width > area.width
- || imageSize.height > area.height)) {
- adaptAreaToRatio(area, imageSize, isStretched);
- } else {
- adaptAreaToSize(area, imageSize);
- }
- return area;
- }
-
- protected void adaptAreaToSize(Rectangle area, Dimension size) {
- area.x += (area.width - size.width) / 2;
- area.width = size.width;
- area.y += (area.height - size.height) / 2;
- area.height = size.height;
- }
-
- protected void adaptAreaToRatio(Rectangle area, Dimension ratio,
- boolean bigger) {
- int a = ratio.width * area.height;
- int b = ratio.height * area.width;
- if (bigger ? (a < b) : (a > b)) {
- int h = area.width == 0 ? 0 : b / ratio.width;
- area.y += (area.height - h) / 2;
- area.height = h;
- } else if (bigger ? (a > b) : (a < b)) {
- int w = area.height == 0 ? 0 : a / ratio.height;
- area.x += (area.width - w) / 2;
- area.width = w;
- }
- }
-
- protected void paintImage(Graphics graphics, Image image,
- Dimension imageSize, Rectangle clientArea) {
- if (clientArea.width == imageSize.width
- && clientArea.height == imageSize.height) {
- graphics.drawImage(image, clientArea.x, clientArea.y);
- } else {
- graphics.drawImage(image, 0, 0, imageSize.width,
- imageSize.height, clientArea.x, clientArea.y,
- clientArea.width, clientArea.height);
- }
- }
-
- private Image getImageFromSource(URI recentFile) {
- InputStream thumbnailData = null;
- try {
- IEditorHistory editorHistory = PlatformUI.getWorkbench()
- .getService(IEditorHistory.class);
- thumbnailData = editorHistory.loadThumbnailData(recentFile);
- if (thumbnailData != null) {
- ImageDescriptor imageDescriptor = ImageDescriptor
- .createFromImageData(new ImageData(thumbnailData));
- return JFaceResources.getResources()
- .createImage(imageDescriptor);
- }
- } catch (IOException e) {
- } finally {
- try {
- if (thumbnailData != null)
- thumbnailData.close();
- } catch (IOException e) {
- }
- }
- return MindMapUI.getImages()
- .get(IMindMapImages.THUMBNAIL_LOST, true).createImage();
- }
-
- }
-
- private class RecentFilePart extends GraphicalEditPart {
-
- public RecentFilePart(URI uri) {
- setModel(uri);
- }
-
- public URI getURI() {
- return (URI) super.getModel();
- }
-
- protected IFigure createFigure() {
- return new RecentFileFigure();
- }
-
- protected void updateView() {
- super.updateView();
- ((RecentFileFigure) getFigure()).setRecentFile(getURI());
- ((RecentFileFigure) getFigure()).setPinImage(getPinImage(getURI()));
-
- Properties properties = ((GalleryViewer) getSite().getViewer())
- .getProperties();
- Dimension size = (Dimension) properties
- .get(GalleryViewer.FrameContentSize);
- if (size != null) {
- getFigure().setPreferredSize(size);
- }
- }
-
- protected void register() {
- registerModel(getURI());
- super.register();
- }
-
- @Override
- protected void unregister() {
- super.unregister();
- unregisterModel(getURI());
- }
- }
-
- private class RecentFilePartFactory implements IPartFactory {
-
- private IPartFactory factory;
-
- public RecentFilePartFactory(IPartFactory factory) {
- this.factory = factory;
- }
-
- public IPart createPart(IPart context, Object model) {
- if (context instanceof FramePart && model instanceof URI)
- return new RecentFilePart((URI) model);
- return factory.createPart(context, model);
- }
-
- }
-
- static Image pinImage;
+ private static final int FRAME_WIDTH = 215;
+ private static final int FRAME_HEIGHT = 130;
+ private static final String COLOR_CONTENT_BORDER = "#cccccc"; //$NON-NLS-1$
private IEditorHistory editorHistory;
+ private LocalResourceManager resources;
+ private Control viewerControl;
+
public RecentFileViewer(Composite parent) {
editorHistory = PlatformUI.getWorkbench()
.getService(IEditorHistory.class);
initViewer(parent);
- createControl(parent);
registerHelper(parent.getShell());
}
@@ -308,8 +89,11 @@ public void run() {
});
}
- private void initViewer(Composite parent) {
- setPartFactory(new RecentFilePartFactory(getPartFactory()));
+ @SuppressWarnings("restriction")
+ private void initViewer(final Composite parent) {
+ if (resources == null)
+ resources = new LocalResourceManager(JFaceResources.getResources(),
+ parent);
EditDomain editDomain = new EditDomain();
editDomain.installTool(GEF.TOOL_SELECT, new GallerySelectTool());
@@ -327,25 +111,38 @@ private void initViewer(Composite parent) {
properties.set(GalleryViewer.FlatFrames, true);
properties.set(GalleryViewer.ImageConstrained, Boolean.TRUE);
properties.set(GalleryViewer.ImageStretched, Boolean.TRUE);
-
- properties.set(GalleryViewer.FrameContentSize, new Dimension(215, 130));
- properties.set(GalleryViewer.Layout,
- new GalleryLayout(GalleryLayout.ALIGN_TOPLEFT,
- GalleryLayout.ALIGN_TOPLEFT, 10, 10, new Insets(10)));
-
properties.set(GalleryViewer.ContentPaneBorderWidth, 1);
+ properties.set(GalleryViewer.CustomContentPaneDecorator, true);
properties.set(GalleryViewer.ContentPaneBorderColor,
- ColorUtils.getColor("#cccccc"));
+ resources.get(ColorUtils.toDescriptor(COLOR_CONTENT_BORDER)));
- final RecentFileListContentProvider contentProvider = new RecentFileListContentProvider();
- final RecentInputURILabelProvider labelProvider = new RecentInputURILabelProvider();
+ properties.set(GalleryViewer.FrameContentSize,
+ new Dimension(FRAME_WIDTH, FRAME_HEIGHT));
+ properties.set(GalleryViewer.Layout,
+ new GalleryLayout(GalleryLayout.ALIGN_TOPLEFT,
+ GalleryLayout.ALIGN_TOPLEFT, 30, 0,
+ new Insets(10, 65, 20, 65)));
+ properties.set(GalleryViewer.ContentPaneSpaceCollaborativeEngine,
+ new SpaceCollaborativeEngine());
+
+ final RecentFilesContentProvider contentProvider = new RecentFilesContentProvider();
+ final RecentFilesLabelProvider labelProvider = new RecentFilesLabelProvider(
+ parent);
contentProvider.addContentChangeListener(new Runnable() {
public void run() {
handleRecentFileListChanged(contentProvider, labelProvider,
true);
+ parent.layout(true);
}
});
+ viewerControl = createControl(parent);
+ viewerControl.setBackground(parent.getBackground());
+ viewerControl.setForeground(parent.getForeground());
+ viewerControl
+ .setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
+
+ setPartFactory(new RecentFilesGalleryPartFactory());
setContentProvider(contentProvider);
setLabelProvider(labelProvider);
@@ -354,7 +151,21 @@ public void run() {
editorHistory.addEditorHistoryListener(contentProvider);
setInput(editorHistory);
handleRecentFileListChanged(contentProvider, labelProvider, true);
+ }
+ @Override
+ public Control getControl() {
+ if (viewerControl != null)
+ return viewerControl;
+ return super.getControl();
+ }
+
+ private void handleRecentFileListChanged(
+ RecentFilesContentProvider contentProvider,
+ RecentFilesLabelProvider labelProvider, boolean refresh) {
+ if (refresh) {
+ setInput(getInput());
+ }
}
private void clearRecentFile() {
@@ -375,49 +186,15 @@ private void unPinRecentFile(URI fileURI) {
updateRecentFilePart(fileURI);
}
- private void handleRecentFileListChanged(
- RecentFileListContentProvider contentProvider,
- RecentInputURILabelProvider labelProvider, boolean refresh) {
- Map labels = new HashMap();
- FilePathParser.calculateFileURILabels(
- contentProvider.getRecentInputURIs(), labels);
- labelProvider.setLabels(labels);
- if (refresh) {
-// refresh();
- setInput(getInput());
- }
- }
-
- private Image getPinImage(URI uri) {
- boolean isPin = editorHistory.isPinned(uri);
- return isPin ? getPinImage() : null;
- }
-
- private static Image getPinImage() {
- if (pinImage == null) {
- ImageDescriptor desc = MindMapUI.getImages().get(IMindMapImages.PIN,
- true);
- if (desc != null) {
- try {
- pinImage = desc.createImage();
- } catch (Throwable e) {
- //e.printStackTrace();
- }
- }
- }
- return pinImage;
- }
-
private void updateRecentFilePart(URI pinURI) {
- RecentFilePart part = findRecentFilePart(pinURI);
+ RecentFilesFramePart part = findRecentFilePart(pinURI);
if (part != null)
part.update();
}
- private RecentFilePart findRecentFilePart(URI pinURI) {
+ private RecentFilesFramePart findRecentFilePart(URI pinURI) {
if (pinURI == null)
return null;
- return (RecentFilePart) getPartRegistry().getPartByModel(pinURI);
+ return (RecentFilesFramePart) getPartRegistry().getPartByModel(pinURI);
}
-
}
diff --git a/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/dashboard/RecentFileListContentProvider.java b/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/dashboard/RecentFilesContentProvider.java
similarity index 78%
rename from bundles/org.xmind.cathy/src/org/xmind/cathy/internal/dashboard/RecentFileListContentProvider.java
rename to bundles/org.xmind.cathy/src/org/xmind/cathy/internal/dashboard/RecentFilesContentProvider.java
index bc123ec54..ec9e6a664 100644
--- a/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/dashboard/RecentFileListContentProvider.java
+++ b/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/dashboard/RecentFilesContentProvider.java
@@ -1,6 +1,8 @@
package org.xmind.cathy.internal.dashboard;
import java.net.URI;
+import java.util.ArrayList;
+import java.util.List;
import org.eclipse.core.commands.common.EventManager;
import org.eclipse.jface.preference.IPreferenceStore;
@@ -13,11 +15,11 @@
import org.xmind.ui.editor.IEditorHistory;
import org.xmind.ui.editor.IEditorHistory.IEditorHistoryListener;
-public class RecentFileListContentProvider extends EventManager
+public class RecentFilesContentProvider extends EventManager
implements IStructuredContentProvider, IEditorHistoryListener,
IPropertyChangeListener {
- private static final int DEFAULT_ITEM_COUNT = 10;
+ private static final int DEFAULT_ITEM_COUNT = 20;
private IEditorHistory history = null;
@@ -64,18 +66,31 @@ public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
public Object[] getElements(Object inputElement) {
if (inputElement != history)
return new Object[0];
- return getRecentInputURIs();
+ return getRecentInput();
}
- public URI[] getRecentInputURIs() {
+ public URI[] getRecentInput() {
if (history == null)
return new URI[0];
int itemsToShow = getItemCount();
if (itemsToShow <= 0)
return new URI[0];
- URI[] recentInputURIs = history.getRecentInputURIs(itemsToShow);
- return recentInputURIs;
+ URI[] uncheckedURIs = history.getAllInputURIs();
+ List recentInputURIs = new ArrayList();
+ int count = 0;
+ for (URI uri : uncheckedURIs) {
+ if (!recentInputURIs.contains(uri)) {
+ recentInputURIs.add(uri);
+ count++;
+ } else {
+ history.remove(uri);
+ }
+ if (count == itemsToShow)
+ break;
+ }
+
+ return recentInputURIs.toArray(new URI[recentInputURIs.size()]);
}
private int getItemCount() {
diff --git a/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/dashboard/RecentFilesGalleryPartFactory.java b/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/dashboard/RecentFilesGalleryPartFactory.java
new file mode 100644
index 000000000..69bbf7e50
--- /dev/null
+++ b/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/dashboard/RecentFilesGalleryPartFactory.java
@@ -0,0 +1,140 @@
+package org.xmind.cathy.internal.dashboard;
+
+import org.eclipse.draw2d.ColorConstants;
+import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.PositionConstants;
+import org.eclipse.jface.resource.FontDescriptor;
+import org.eclipse.jface.resource.JFaceResources;
+import org.eclipse.jface.util.Util;
+import org.eclipse.jface.viewers.IBaseLabelProvider;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.Font;
+import org.eclipse.swt.graphics.FontData;
+import org.xmind.gef.IGraphicalViewer;
+import org.xmind.gef.IViewer;
+import org.xmind.gef.draw2d.ITextFigure;
+import org.xmind.gef.draw2d.RotatableWrapLabel;
+import org.xmind.gef.part.IGraphicalPart;
+import org.xmind.gef.part.IPart;
+import org.xmind.gef.util.Properties;
+import org.xmind.ui.gallery.FrameBorderLayout;
+import org.xmind.ui.gallery.FrameDecorator;
+import org.xmind.ui.gallery.FrameFigure;
+import org.xmind.ui.gallery.FramePart;
+import org.xmind.ui.gallery.GalleryPartFactory;
+import org.xmind.ui.resources.ColorUtils;
+import org.xmind.ui.resources.FontUtils;
+
+public class RecentFilesGalleryPartFactory extends GalleryPartFactory {
+ public static class RecentFilesFramePart extends FramePart {
+ RecentFilesFrameFigure figure;
+
+ public RecentFilesFramePart(Object model) {
+ super(model);
+ setDecorator(RecentFilesFrameDecorator.DEFAULT);
+ }
+
+ @Override
+ protected IFigure createFigure() {
+ figure = new RecentFilesFrameFigure();
+ Properties properties = getSite().getViewer().getProperties();
+ boolean useAdvancedRenderer = properties.getBoolean(
+ IGraphicalViewer.VIEWER_RENDER_TEXT_AS_PATH, false);
+ figure.setTitleRenderStyle(useAdvancedRenderer
+ ? RotatableWrapLabel.ADVANCED : RotatableWrapLabel.NORMAL);
+
+ return figure;
+ }
+
+ @Override
+ protected void updateChildren() {
+ super.updateChildren();
+ boolean isSelected = figure.isSelected();
+ if (isSelected) {
+ figure.setForegroundColor(ColorConstants.white);
+ figure.subTitle.setForegroundColor(ColorConstants.white);
+ }
+ }
+ }
+
+ private static class RecentFilesFrameDecorator extends FrameDecorator {
+
+ public static final RecentFilesFrameDecorator DEFAULT = new RecentFilesFrameDecorator();
+
+ @Override
+ public void decorate(IGraphicalPart part, IFigure figure) {
+ super.decorate(part, figure);
+
+ IFigure f = part.getFigure();
+ Object model = part.getModel();
+
+ IViewer viewer = part.getSite().getViewer();
+ IBaseLabelProvider labelProvider = viewer
+ .getAdapter(IBaseLabelProvider.class);
+
+ if (f instanceof RecentFilesFrameFigure
+ && labelProvider instanceof RecentFilesLabelProvider) {
+ decorateSubTitle(((RecentFilesFrameFigure) f).getSubTitle(),
+ model, (RecentFilesLabelProvider) labelProvider);
+ }
+ }
+
+ private void decorateSubTitle(ITextFigure subTitle, Object model,
+ RecentFilesLabelProvider labelProvider) {
+ if (model == null)
+ return;
+ String text = labelProvider.getSubtitle(model);
+ if (text == null)
+ return;
+
+ subTitle.setText(text);
+ subTitle.setForegroundColor((Color) JFaceResources.getResources()
+ .get(ColorUtils.toDescriptor("#8f8f8f"))); //$NON-NLS-1$
+ Font countFont = subTitle.getFont();
+ if (countFont != null) {
+ FontData[] fontData = countFont.getFontData();
+ FontData[] newFontData = FontUtils.newHeight(fontData,
+ Util.isMac() ? 9 : 7);
+ subTitle.setFont((Font) JFaceResources.getResources()
+ .get(FontDescriptor.createFrom(newFontData)));
+ }
+ }
+ }
+
+ private static class RecentFilesFrameFigure extends FrameFigure {
+
+ private RotatableWrapLabel subTitle;
+
+ Color subTitleColor = (Color) JFaceResources.getResources()
+ .get(ColorUtils.toDescriptor("#8f8f8f")); //$NON-NLS-1$
+
+ public RecentFilesFrameFigure() {
+ super();
+
+ subTitle = new RotatableWrapLabel(RotatableWrapLabel.NORMAL);
+ subTitle.setTextAlignment(PositionConstants.CENTER);
+ subTitle.setEnabled(false);
+ subTitle.setAbbreviated(true);
+ subTitle.setForegroundColor(subTitleColor);
+ getTitleContainer().add(subTitle, FrameBorderLayout.BOTTOM);
+
+ }
+
+ public ITextFigure getSubTitle() {
+ return subTitle;
+ }
+
+ @Override
+ public void setSelected(boolean selected) {
+ super.setSelected(selected);
+ subTitle.setForegroundColor(
+ selected ? ColorConstants.white : subTitleColor);
+ }
+ }
+
+ @Override
+ protected IPart createFramePart(IPart parent, Object model) {
+ return new RecentFilesFramePart(model);
+ }
+
+}
diff --git a/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/dashboard/RecentFilesLabelProvider.java b/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/dashboard/RecentFilesLabelProvider.java
new file mode 100644
index 000000000..d3925b3fc
--- /dev/null
+++ b/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/dashboard/RecentFilesLabelProvider.java
@@ -0,0 +1,241 @@
+package org.xmind.cathy.internal.dashboard;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URI;
+import java.sql.Date;
+import java.text.DateFormat;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.PositionConstants;
+import org.eclipse.draw2d.geometry.Dimension;
+import org.eclipse.draw2d.geometry.Insets;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.resource.JFaceResources;
+import org.eclipse.jface.resource.LocalResourceManager;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.swt.SWTException;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.PlatformUI;
+import org.xmind.cathy.internal.CathyPlugin;
+import org.xmind.cathy.internal.WorkbenchMessages;
+import org.xmind.gef.draw2d.SizeableImageFigure;
+import org.xmind.ui.editor.IEditorHistory;
+import org.xmind.ui.editor.IEditorHistoryItem;
+import org.xmind.ui.gallery.GalleryViewer;
+import org.xmind.ui.gallery.IDecorationContext;
+import org.xmind.ui.gallery.ILabelDecorator;
+import org.xmind.ui.mindmap.IMindMapImages;
+import org.xmind.ui.mindmap.MindMapUI;
+
+public class RecentFilesLabelProvider extends LabelProvider
+ implements ILabelDecorator {
+
+ Image pinImage;
+
+ protected static class RecentFrameContentLayout
+ extends RecentContainerLayout {
+
+ private IDecorationContext context;
+
+ public RecentFrameContentLayout(IDecorationContext context) {
+ this.context = context;
+ }
+
+ @Override
+ protected Dimension calculatePreferredSize(IFigure figure, int wHint,
+ int hHint) {
+ if (context != null) {
+ Insets insets = figure.getInsets();
+ Dimension contentSize = (Dimension) context
+ .getProperty(GalleryViewer.FrameContentSize, null);
+ if (contentSize != null)
+ return new Dimension(contentSize.width + insets.getWidth(),
+ contentSize.height + insets.getHeight());
+ }
+ return super.calculatePreferredSize(figure, wHint, hHint);
+ }
+ }
+
+ protected static final String COLOR_NONEXISTING_WORKBOOK_COVER = "#DDDDDD"; //$NON-NLS-1$
+ protected static final String COLOR_NONEXISTING_WORKBOOK_TEXT = "#CCCCCC"; //$NON-NLS-1$
+
+ private LocalResourceManager resources;
+ private IEditorHistory editorHistory;
+ private Map images;
+
+ public RecentFilesLabelProvider(Composite parent) {
+ this.images = new HashMap();
+ resources = new LocalResourceManager(JFaceResources.getResources(),
+ parent);
+ editorHistory = PlatformUI.getWorkbench()
+ .getService(IEditorHistory.class);
+ }
+
+ public void clear() {
+ Object[] imageArray = images.values().toArray();
+ images.clear();
+ for (Object image : imageArray) {
+ ((Image) image).dispose();
+ }
+ }
+
+ @Override
+ public void dispose() {
+ resources.dispose();
+ clear();
+ super.dispose();
+ }
+
+ @Override
+ public String getText(Object element) {
+ if (!(element instanceof URI))
+ return super.getText(element);
+ URI uri = (URI) element;
+ IEditorHistoryItem item = editorHistory.getItem(uri);
+ if (item != null) {
+ String name = item.getName();
+ Assert.isTrue(name != null);
+
+ StringBuffer buf = new StringBuffer();
+ if (name.length() > 20)
+ name = name.substring(0, 20) + "..."; //$NON-NLS-1$
+ buf.append(name);
+ if (uri.getScheme().equalsIgnoreCase("seawind")) { //$NON-NLS-1$
+ buf.append(" "); //$NON-NLS-1$
+ buf.append(
+ WorkbenchMessages.RecentFilesLabelProvider_Cloud_text);
+ }
+ return buf.toString();
+ }
+ return uri.toString();
+ }
+
+ @Override
+ public Image getImage(Object element) {
+ if (element instanceof URI) {
+ URI uri = (URI) element;
+ Image image = images.get(uri);
+ if (image != null && !image.isDisposed())
+ return image;
+
+ image = getImageByThumb(uri);
+ if (image != null && !image.isDisposed()) {
+ images.put(uri, image);
+ }
+ return image;
+ }
+ return resources.createImage(
+ MindMapUI.getImages().get(IMindMapImages.THUMBNAIL_LOST, true));
+ }
+
+ private Image getImageByThumb(URI uri) {
+ InputStream thumbnailData = null;
+ try {
+ thumbnailData = editorHistory.loadThumbnailData(uri);
+ if (thumbnailData != null) {
+ return new Image(resources.getDevice(), thumbnailData);
+ }
+ } catch (IOException e) {
+ CathyPlugin.log(e, String.format(
+ "Failed to load preview image for recent page uri == %s", //$NON-NLS-1$
+ uri));
+ } catch (SWTException e) {
+ CathyPlugin.log(e, String.format(
+ "Failed to load preview image for recent page uri == %s", //$NON-NLS-1$
+ uri));
+ } finally {
+ try {
+ if (thumbnailData != null)
+ thumbnailData.close();
+ } catch (IOException e) {
+ }
+ }
+ return resources.createImage(
+ MindMapUI.getImages().get(IMindMapImages.THUMBNAIL_LOST, true));
+ }
+
+ public IFigure decorateFigure(IFigure figure, Object element,
+ IDecorationContext context) {
+ if (!(element instanceof URI))
+ return figure;
+
+ return decorateFrameFigure(figure, (URI) element, context);
+ }
+
+ protected IFigure decorateFrameFigure(IFigure contentPane, URI uri,
+ IDecorationContext context) {
+ SizeableImageFigure thumbnailFigure;
+ SizeableImageFigure pinIcon;
+
+ List figures = contentPane.getChildren();
+ boolean needInitFigureContent = figures.isEmpty();
+ if (needInitFigureContent) {
+ contentPane.setLayoutManager(new RecentFrameContentLayout(context));
+
+ thumbnailFigure = new SizeableImageFigure(getImage(uri));
+ pinIcon = new SizeableImageFigure(getPinImage(uri));
+
+ contentPane.add(thumbnailFigure);
+ contentPane.add(pinIcon, Integer
+ .valueOf(PositionConstants.LEFT | PositionConstants.TOP));
+
+ if (context != null) {
+ boolean imageConstrained = Boolean.TRUE.equals(context
+ .getProperty(GalleryViewer.ImageConstrained, false));
+ boolean imageStretched = Boolean.TRUE.equals(context
+ .getProperty(GalleryViewer.ImageStretched, false));
+ thumbnailFigure.setConstrained(imageConstrained);
+ thumbnailFigure.setStretched(imageStretched);
+ }
+ } else {
+ thumbnailFigure = (SizeableImageFigure) figures.get(0);
+ pinIcon = (SizeableImageFigure) figures.get(1);
+ }
+
+ thumbnailFigure.setImage(getImage(uri));
+ pinIcon.setImage(getPinImage(uri));
+
+ return contentPane;
+ }
+
+ private Image getPinImage(URI uri) {
+ boolean isPin = editorHistory.isPinned(uri);
+ return isPin ? getPinImage() : null;
+ }
+
+ private Image getPinImage() {
+ if (pinImage == null) {
+ ImageDescriptor desc = MindMapUI.getImages().get(IMindMapImages.PIN,
+ true);
+ if (desc != null) {
+ try {
+ pinImage = resources.createImage(desc);
+ } catch (Throwable e) {
+ //e.printStackTrace();
+ }
+ }
+ }
+ return pinImage;
+ }
+
+ public String getSubtitle(Object element) {
+ if (element instanceof URI) {
+ IEditorHistoryItem item = editorHistory.getItem((URI) element);
+ long t = item.getOpenedTime();
+ Date date = new Date(t);
+ return DateFormat
+ .getDateTimeInstance(DateFormat.MEDIUM, DateFormat.SHORT)
+ .format(date);
+ }
+ Date newDate = new Date(System.currentTimeMillis());
+ return DateFormat
+ .getDateTimeInstance(DateFormat.MEDIUM, DateFormat.SHORT)
+ .format(newDate);
+ }
+}
diff --git a/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/dashboard/TemplatePropertyTester.java b/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/dashboard/TemplatePropertyTester.java
new file mode 100644
index 000000000..11d461945
--- /dev/null
+++ b/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/dashboard/TemplatePropertyTester.java
@@ -0,0 +1,32 @@
+package org.xmind.cathy.internal.dashboard;
+
+import org.eclipse.core.expressions.PropertyTester;
+import org.eclipse.core.runtime.Assert;
+import org.xmind.ui.mindmap.ITemplate;
+import org.xmind.ui.mindmap.MindMapUI;
+
+public class TemplatePropertyTester extends PropertyTester {
+
+ private static final String PROP_SYSTEM = "system"; //$NON-NLS-1$
+
+ private static final String PROP_USER = "user"; //$NON-NLS-1$
+
+ public boolean test(Object receiver, String property, Object[] args,
+ Object expectedValue) {
+ Assert.isLegal(receiver instanceof ITemplate,
+ "Receiver is not an ITemplate object: " + receiver); //$NON-NLS-1$
+
+ ITemplate template = (ITemplate) receiver;
+
+ if (PROP_SYSTEM.equals(property)) {
+ return MindMapUI.getResourceManager().isSystemTemplate(template);
+ } else if (PROP_USER.equals(property)) {
+ return MindMapUI.getResourceManager().isUserTemplate(template);
+ }
+
+ Assert.isLegal(false, "Unrecognized property: " + property); //$NON-NLS-1$
+
+ return false;
+ }
+
+}
diff --git a/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/dashboard/ThemeChooserDialog.java b/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/dashboard/ThemeChooserDialog.java
index 3c9fc670a..5262ce44c 100644
--- a/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/dashboard/ThemeChooserDialog.java
+++ b/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/dashboard/ThemeChooserDialog.java
@@ -33,11 +33,18 @@ public class ThemeChooserDialog extends Dialog {
private IStyle selectedTheme = null;
+ private String structureClass;
+
protected ThemeChooserDialog(Shell parentShell) {
super(parentShell);
setShellStyle(getShellStyle() | SWT.SHEET);
}
+ protected ThemeChooserDialog(Shell parentShell, String structureClass) {
+ this(parentShell);
+ this.structureClass = structureClass;
+ }
+
@Override
protected boolean isResizable() {
return true;
@@ -108,7 +115,8 @@ protected void postInit() {
@Override
protected void initGalleryViewer(GalleryViewer galleryViewerer) {
- galleryViewerer.setLabelProvider(new ThemeLabelProvider());
+ galleryViewerer.setLabelProvider(
+ new ThemeLabelProvider(structureClass));
EditDomain editDomain = new EditDomain();
editDomain.installTool(GEF.TOOL_SELECT,
new GallerySelectTool());
diff --git a/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/handlers/DeleteTemplateHandler.java b/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/handlers/DeleteTemplateHandler.java
new file mode 100644
index 000000000..f156c64b5
--- /dev/null
+++ b/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/handlers/DeleteTemplateHandler.java
@@ -0,0 +1,41 @@
+package org.xmind.cathy.internal.handlers;
+
+import org.eclipse.core.commands.AbstractHandler;
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.osgi.util.NLS;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.handlers.HandlerUtil;
+import org.xmind.cathy.internal.WorkbenchMessages;
+import org.xmind.ui.mindmap.ITemplate;
+import org.xmind.ui.mindmap.MindMapUI;
+
+public class DeleteTemplateHandler extends AbstractHandler {
+
+ public Object execute(ExecutionEvent event) throws ExecutionException {
+
+ ISelection selection = HandlerUtil.getCurrentSelection(event);
+ if (selection instanceof IStructuredSelection) {
+ Object obj = ((IStructuredSelection) selection).getFirstElement();
+ if (obj instanceof ITemplate) {
+ ITemplate template = (ITemplate) obj;
+ Shell activeShell = HandlerUtil.getActiveShell(event);
+
+ if (!MessageDialog.openConfirm(activeShell,
+ WorkbenchMessages.ConfirmDeleteTemplateDialog_title,
+ NLS.bind(
+ WorkbenchMessages.ConfirmDeleteTemplateDialog_message_withTemplateName,
+ template.getName()))) {
+ return null;
+ }
+ MindMapUI.getResourceManager().removeUserTemplate(template);
+ }
+ }
+
+ return null;
+ }
+
+}
diff --git a/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/handlers/DuplicateTemplateHandler.java b/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/handlers/DuplicateTemplateHandler.java
new file mode 100644
index 000000000..db879371b
--- /dev/null
+++ b/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/handlers/DuplicateTemplateHandler.java
@@ -0,0 +1,30 @@
+package org.xmind.cathy.internal.handlers;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.core.commands.AbstractHandler;
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.ui.handlers.HandlerUtil;
+import org.xmind.ui.internal.utils.ResourceUtils;
+import org.xmind.ui.mindmap.ITemplate;
+
+public class DuplicateTemplateHandler extends AbstractHandler {
+
+ public Object execute(ExecutionEvent event) throws ExecutionException {
+ List templates = new ArrayList();
+ ISelection selection = HandlerUtil.getCurrentSelection(event);
+ if (selection instanceof IStructuredSelection) {
+ Object obj = ((IStructuredSelection) selection).getFirstElement();
+ if (obj instanceof ITemplate) {
+ templates.add((ITemplate) obj);
+ }
+ }
+ ResourceUtils.duplicateTemplates(templates);
+ return null;
+ }
+
+}
diff --git a/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/handlers/RenameTemplateHandler.java b/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/handlers/RenameTemplateHandler.java
new file mode 100644
index 000000000..ae13f7001
--- /dev/null
+++ b/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/handlers/RenameTemplateHandler.java
@@ -0,0 +1,23 @@
+package org.xmind.cathy.internal.handlers;
+
+import org.eclipse.core.commands.AbstractHandler;
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.handlers.HandlerUtil;
+import org.xmind.cathy.internal.ICathyConstants;
+
+public class RenameTemplateHandler extends AbstractHandler {
+
+ public Object execute(ExecutionEvent event) throws ExecutionException {
+ Shell shell = HandlerUtil.getActiveShell(event);
+ if (shell != null) {
+ Object data = shell.getData(ICathyConstants.HELPER_TEMPLATE_RENAME);
+ if (data instanceof Runnable) {
+ ((Runnable) data).run();
+ }
+ }
+ return null;
+ }
+
+}
diff --git a/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/handlers/WelcomeToXMindHandler.java b/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/handlers/WelcomeToXMindHandler.java
index b43e7fe4e..29ca952c4 100644
--- a/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/handlers/WelcomeToXMindHandler.java
+++ b/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/handlers/WelcomeToXMindHandler.java
@@ -12,6 +12,7 @@
import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.ui.handlers.HandlerUtil;
import org.xmind.cathy.internal.WorkbenchMessages;
+import org.xmind.ui.internal.MindMapUIPlugin;
import org.xmind.ui.mindmap.MindMapUI;
public class WelcomeToXMindHandler extends AbstractHandler {
@@ -27,8 +28,9 @@ public Object execute(ExecutionEvent event) throws ExecutionException {
if (activePage == null)
return null;
+ MindMapUIPlugin.getDefault().getUsageDataCollector()
+ .increase("WelcomeToXmindCount"); //$NON-NLS-1$
SafeRunner.run(new SafeRunnable() {
- @Override
public void run() throws Exception {
IEditorInput input = MindMapUI.getEditorInputFactory()
.createEditorInput(new URI(URL_WELCOME_FILE),
diff --git a/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/handlers/XMindHelpHandler.java b/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/handlers/XMindHelpHandler.java
index 8c07d00d6..fbe9f3834 100644
--- a/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/handlers/XMindHelpHandler.java
+++ b/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/handlers/XMindHelpHandler.java
@@ -1,17 +1,10 @@
package org.xmind.cathy.internal.handlers;
-import java.io.IOException;
-import java.net.URL;
-
import org.eclipse.core.commands.AbstractHandler;
import org.eclipse.core.commands.ExecutionEvent;
import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.SafeRunner;
import org.eclipse.jface.util.SafeRunnable;
-import org.osgi.framework.Bundle;
import org.xmind.cathy.internal.CathyPlugin;
import org.xmind.ui.browser.BrowserSupport;
@@ -21,32 +14,32 @@ public Object execute(ExecutionEvent event) throws ExecutionException {
SafeRunner.run(new SafeRunnable() {
@Override
public void run() throws Exception {
- String internalURL = findInternalHelpURL();
- if (internalURL != null) {
- BrowserSupport.getInstance().createBrowser()
- .openURL(internalURL);
- } else {
- BrowserSupport.getInstance().createBrowser()
- .openURL(CathyPlugin.ONLINE_HELP_URL);
- }
+// String internalURL = findInternalHelpURL();
+// if (internalURL != null) {
+// BrowserSupport.getInstance().createBrowser()
+// .openURL(internalURL);
+// } else {
+ BrowserSupport.getInstance().createBrowser()
+ .openURL(CathyPlugin.ONLINE_HELP_URL);
+// }
}
});
return null;
}
- private String findInternalHelpURL() {
- Bundle helpBundle = Platform.getBundle("org.xmind.ui.help"); //$NON-NLS-1$
- if (helpBundle != null) {
- URL url = FileLocator.find(helpBundle,
- new Path("$nl$/contents/index.html"), null); //$NON-NLS-1$
- if (url != null) {
- try {
- url = FileLocator.toFileURL(url);
- return url.toExternalForm();
- } catch (IOException e) {
- }
- }
- }
- return null;
- }
+// private String findInternalHelpURL() {
+// Bundle helpBundle = Platform.getBundle("org.xmind.ui.help"); //$NON-NLS-1$
+// if (helpBundle != null) {
+// URL url = FileLocator.find(helpBundle,
+// new Path("$nl$/contents/index.html"), null); //$NON-NLS-1$
+// if (url != null) {
+// try {
+// url = FileLocator.toFileURL(url);
+// return url.toExternalForm();
+// } catch (IOException e) {
+// }
+// }
+// }
+// return 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
index b80b6b33d..f2bff5c55 100644
--- a/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/messages.properties
+++ b/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/messages.properties
@@ -9,6 +9,8 @@ SaveAction_text=&Save New Revision
GeneralPrefPage_seePolicy_link=See Policy
GeneralPrefPage_title=General
GeneralPrefPage_usageData_text=Send usage data. (NO PRIVATE DATA\!)
+GeneralPrefPageSection_RecentFileCountSection_title=Files List
+GeneralPrefPageSection_AutoSaveGroup_title=Save & Backup
RecentFiles_label=Size of the recently opened files list:
RecentFileViewer_PinThisMapAction_label=Pin This Map
RecentFileViewer_UnpinThisMap_label=Unpin This Map
@@ -62,7 +64,7 @@ CheckUpdatesJob_NoUpdate_message=No updates found. You are using the latest vers
CheckUpdatesJob_NewUpdate_message=A new version of XMind is available. Download now?
CheckUpdatesJob_NewUpdate_info_message=Version: {0}, Size: {1}
CheckUpdatesJob_NewUpdate_moreDownloads_text=More downloads
-ConfirmDeleteTemplateDialog_message_withTemplateName=Are you sure you want to delete this template ''{0}''?
+ConfirmDeleteTemplateDialog_message_withTemplateName=You are deleting the template ''{0}''.
ConfirmDeleteTemplateDialog_title=XMind - Delete Template
ConfirmToRestart_cancelButton=Cancel
ConfirmToRestart_defaultButton=Restart
@@ -109,15 +111,19 @@ OpenXMindCommandFileJob_failed_fileIsNotReadable=Failed to open XMind command fi
OpenXMindCommandFileJob_failed_noCommandFilePath_text=Failed to open XMind command file: No command file path specified.
OpenXMindCommandFileJob_failed_openXMindCommandFile=Failed to open XMind command file: {0}
OpenXMindCommandFileJob_name=Opening command file: {0}
-WelcomeDialog_item_cloud_description=Access mindmaps across Mac/PCs
+WelcomeDialog_item_slide_title=Slide-based Story
+WelcomeDialog_item_slide_description=Create slideshows from mind maps
WelcomeDialog_item_cloud_title=XMind Cloud
-WelcomeDialog_item_iconFinder_description=Search and drag more than 60,000 icons
-WelcomeDialog_item_iconFinder_title=Iconfinder
-WelcomeDialog_item_share_description=Share maps to Facebook, Twitter, etc.
-WelcomeDialog_item_share_title=New Share
+WelcomeDialog_item_cloud_description=Create folders and sort files in Cloud
+WelcomeDialog_item_high_dpi_title=High DPI Support
+WelcomeDialog_item_high_dpi_description=Better experience on high resolution screens
+WelcomeDialog_item_workspace_description=New design for more efficient map editing
+WelcomeDialog_item_workspace_title=New Workspace
WelcomeDialog_okButton_text=OK
WelcomeDialog_seePolicy_link=See Policy
WelcomeDialog_uploadDataCheck_text=Send usage data. (NO PRIVATE DATA\!)
+WelcomDialog_Welcom_title=Welcome to XMind 8
+WelcomDialog_WhatIsNew_title=What's new?
WelcomeToXMindHandler_welcomeToXMind_templatedName=Welcome to XMind
WizardHandler_menuLabel=
@@ -129,8 +135,8 @@ 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_Homepage=Visit http://www.xmind.net/
+About_Copyright=Copyright (C) 2006 - 2016, XMind Ltd. All rights reserved.
+About_Homepage=http://www.xmind.net/
About_BetaExpiryMessage_withExpiryTime=This beta edition will expire at {0}.\n
LanguagePrefPage_ConfirmToRestart_laterButton=Restart Later
@@ -146,7 +152,7 @@ DashboardTemplatesPage_name=Templates
DashboardBlankPage_message=Choose a Type
DashboardTemplatesPage_message=Choose a Template
-DashboardRecentFiles_message=Recently Opened Files
+DashboardRecentFiles_message=Recent
DashboardThemeChoose_message=Choose a Theme
DashboardThemeCreate_label=Create
@@ -160,3 +166,14 @@ NewFileDashboardPage_GoIntoTemplatesManagerMode_tooltip=Manage Templates
NewFileDashboardPage_GoToEditTemplateMode_label=Manage
NewFileDashboardPage_leftTitleBar_text=New
NewFileDashboardPage_TemplateFilterName_label=XMind Template
+NewFileDashboardPage_Import_button=Import
+
+TemplateViewer_SystemGroup_title=Build-in
+TemplateViewer_UserGroup_title=User
+
+RecentFileBlankPage_description=Recent files will appear as icons here.
+
+RecentFilesLabelProvider_Cloud_text=[Cloud]
+
+XStackRenderer_TopArea_tipLabel=Please open a map to continue the Operation.
+XStackRenderer_BottomArea_Add_button=New Blank Map
diff --git a/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/renderer/XDialogRenderer.java b/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/renderer/XDialogRenderer.java
new file mode 100644
index 000000000..0536e8188
--- /dev/null
+++ b/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/renderer/XDialogRenderer.java
@@ -0,0 +1,463 @@
+package org.xmind.cathy.internal.renderer;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.inject.Inject;
+import javax.inject.Named;
+
+import org.eclipse.e4.core.contexts.IEclipseContext;
+import org.eclipse.e4.core.di.annotations.Optional;
+import org.eclipse.e4.ui.di.UIEventTopic;
+import org.eclipse.e4.ui.internal.workbench.E4Workbench;
+import org.eclipse.e4.ui.model.application.MApplication;
+import org.eclipse.e4.ui.model.application.ui.MElementContainer;
+import org.eclipse.e4.ui.model.application.ui.MUIElement;
+import org.eclipse.e4.ui.model.application.ui.basic.MDialog;
+import org.eclipse.e4.ui.model.application.ui.basic.MPart;
+import org.eclipse.e4.ui.model.application.ui.basic.MWindow;
+import org.eclipse.e4.ui.model.application.ui.basic.MWindowElement;
+import org.eclipse.e4.ui.workbench.IPresentationEngine;
+import org.eclipse.e4.ui.workbench.UIEvents;
+import org.eclipse.e4.ui.workbench.UIEvents.ElementContainer;
+import org.eclipse.e4.ui.workbench.modeling.EPartService;
+import org.eclipse.e4.ui.workbench.modeling.IWindowCloseHandler;
+import org.eclipse.e4.ui.workbench.renderers.swt.SWTPartRenderer;
+import org.eclipse.jface.util.Geometry;
+import org.eclipse.jface.window.IShellProvider;
+import org.eclipse.jface.window.Window;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.DisposeEvent;
+import org.eclipse.swt.events.DisposeListener;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.graphics.Rectangle;
+import org.eclipse.swt.layout.FillLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Menu;
+import org.eclipse.swt.widgets.Monitor;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.swt.widgets.Widget;
+import org.osgi.service.event.Event;
+import org.xmind.ui.internal.e4models.IModelConstants;
+
+public class XDialogRenderer extends SWTPartRenderer {
+
+ private class WindowSizeUpdateJob implements Runnable {
+ public List windowsToUpdate = new ArrayList();
+
+ public void run() {
+ boundsJob = null;
+ while (!windowsToUpdate.isEmpty()) {
+ MWindow window = windowsToUpdate.remove(0);
+ Shell shell = (Shell) window.getWidget();
+ if (shell == null || shell.isDisposed())
+ continue;
+ shell.setBounds(window.getX(), window.getY(), window.getWidth(),
+ window.getHeight());
+ }
+ }
+ }
+
+ WindowSizeUpdateJob boundsJob;
+
+ @Inject
+ private IEclipseContext context;
+
+ @Inject
+ private Display display;
+
+ @Inject
+ private MApplication application;
+
+ @Inject
+ @Optional
+ @Named("localActiveShell")
+ private Shell parentShell;
+
+ @SuppressWarnings("unchecked")
+ @Inject
+ @Optional
+ private void subscribeTopicChildAdded(
+ @UIEventTopic(ElementContainer.TOPIC_CHILDREN) Event event) {
+ Object changedObject = event.getProperty(UIEvents.EventTags.ELEMENT);
+ if (!(changedObject instanceof MDialog)) {
+ return;
+ }
+ if (UIEvents.isADD(event)) {
+ processContents((MElementContainer) changedObject);
+ postProcess((MDialog) changedObject);
+ }
+ }
+
+ @Inject
+ @Optional
+ private void subscribeTopicWindowChanged(
+ @UIEventTopic(UIEvents.Window.TOPIC_ALL) Event event) {
+ Object objElement = event.getProperty(UIEvents.EventTags.ELEMENT);
+ if (!(objElement instanceof MDialog)) {
+ return;
+ }
+
+ // Is this listener interested ?
+ MDialog dialogModel = (MDialog) objElement;
+ if (dialogModel.getRenderer() != XDialogRenderer.this) {
+ return;
+ }
+
+ // No widget == nothing to update
+ Shell theShell = (Shell) dialogModel.getWidget();
+ if (theShell == null) {
+ return;
+ }
+
+ String attName = (String) event.getProperty(UIEvents.EventTags.ATTNAME);
+
+ if (UIEvents.Window.X.equals(attName)
+ || UIEvents.Window.Y.equals(attName)
+ || UIEvents.Window.WIDTH.equals(attName)
+ || UIEvents.Window.HEIGHT.equals(attName)) {
+ if (boundsJob == null) {
+ boundsJob = new WindowSizeUpdateJob();
+ boundsJob.windowsToUpdate.add(dialogModel);
+ theShell.getDisplay().asyncExec(boundsJob);
+ } else {
+ if (!boundsJob.windowsToUpdate.contains(dialogModel))
+ boundsJob.windowsToUpdate.add(dialogModel);
+ }
+ }
+ }
+
+ @Override
+ public Object createWidget(MUIElement element, Object parent) {
+ final Widget newWidget;
+
+ if (!(element instanceof MDialog)
+ || (parent != null && !(parent instanceof Control)))
+ return null;
+
+ MDialog dialogModel = (MDialog) element;
+
+ MApplication appModel = dialogModel.getContext()
+ .get(MApplication.class);
+ Boolean rtlMode = (Boolean) appModel.getTransientData()
+ .get(E4Workbench.RTL_MODE);
+ int rtlStyle = (rtlMode != null && rtlMode.booleanValue())
+ ? SWT.RIGHT_TO_LEFT : 0;
+
+ Shell parentShell = parent == null ? null
+ : ((Control) parent).getShell();
+
+ final Shell wbwShell;
+
+ int styleOverride = getStyleOverride(dialogModel) | rtlStyle;
+ if (parentShell == null) {
+ int style = styleOverride == -1 ? SWT.SHELL_TRIM | rtlStyle
+ : styleOverride;
+ wbwShell = new Shell(display, style);
+ dialogModel.getTags().add("topLevel"); //$NON-NLS-1$
+ } else {
+ int style = SWT.TITLE | SWT.RESIZE | SWT.MAX | SWT.CLOSE | rtlStyle;
+ style = styleOverride == -1 ? style : styleOverride;
+ if (dialogModel.getTags()
+ .contains(IPresentationEngine.WINDOW_TOP_LEVEL))
+ wbwShell = new Shell(display, style);
+ else
+ wbwShell = new Shell(parentShell, style);
+ }
+
+ wbwShell.setBackgroundMode(SWT.INHERIT_DEFAULT);
+
+ Rectangle modelBounds = wbwShell.getBounds();
+ modelBounds.x = dialogModel.getX();
+ modelBounds.y = dialogModel.getY();
+ modelBounds.height = dialogModel.getHeight();
+ modelBounds.width = dialogModel.getWidth();
+
+ // Force the shell onto the display if it would be invisible otherwise
+ Rectangle displayBounds = Display.getCurrent().getPrimaryMonitor()
+ .getBounds();
+ if (!modelBounds.intersects(displayBounds)) {
+ Rectangle clientArea = Display.getCurrent().getPrimaryMonitor()
+ .getClientArea();
+ modelBounds.x = clientArea.x;
+ modelBounds.y = clientArea.y;
+ }
+ wbwShell.setBounds(modelBounds);
+
+ setCSSInfo(dialogModel, wbwShell);
+
+ wbwShell.setLayout(new FillLayout(SWT.VERTICAL));
+ newWidget = wbwShell;
+ bindWidget(element, newWidget);
+
+ // set up context
+ IEclipseContext localContext = getContext(dialogModel);
+ localContext.set(Shell.class, wbwShell);
+ localContext.set(E4Workbench.LOCAL_ACTIVE_SHELL, wbwShell);
+ localContext.set(IShellProvider.class, new IShellProvider() {
+ public Shell getShell() {
+ return wbwShell;
+ }
+ });
+ localContext.set(IWindowCloseHandler.class, new IWindowCloseHandler() {
+ public boolean close(MWindow window) {
+ return closeDetachedWindow(window);
+ }
+ });
+
+ if (dialogModel.getLabel() != null)
+ wbwShell.setText(dialogModel.getLocalizedLabel());
+
+ if (dialogModel.getIconURI() != null
+ && dialogModel.getIconURI().length() > 0) {
+ wbwShell.setImage(getImage(dialogModel));
+ } else {
+ wbwShell.setImages(Window.getDefaultImages());
+ }
+
+ return newWidget;
+ }
+
+ private boolean closeDetachedWindow(MWindow window) {
+ EPartService partService = window.getContext().get(EPartService.class);
+ List parts = modelService.findElements(window, null, MPart.class,
+ null);
+ // this saves one part at a time, not ideal but better than not saving
+ // at all
+ for (MPart part : parts) {
+ if (!partService.savePart(part, true)) {
+ // user cancelled the operation, return false
+ return false;
+ }
+ }
+
+ // hide every part individually, following 3.x behaviour
+ for (MPart part : parts) {
+ partService.hidePart(part);
+ }
+ return true;
+ }
+
+ @Override
+ public void hookControllerLogic(final MUIElement me) {
+ super.hookControllerLogic(me);
+ Widget widget = (Widget) me.getWidget();
+
+ if (widget instanceof Shell && me instanceof MWindow) {
+ final Shell shell = (Shell) widget;
+ shell.addDisposeListener(new DisposeListener() {
+
+ public void widgetDisposed(DisposeEvent e) {
+ //Save user dialog bounds
+ String splitSymbol = ","; //$NON-NLS-1$
+ Rectangle bounds = shell.getBounds();
+ String location = bounds.x + splitSymbol + bounds.y
+ + splitSymbol + bounds.width + splitSymbol
+ + bounds.height;
+ me.getPersistedState().put(
+ IModelConstants.KEY_DIALOG_PART_CUSTOM_LOCATION,
+ location);
+
+ MWindow window = (MWindow) me;
+ IWindowCloseHandler closeHandler = window.getContext()
+ .get(IWindowCloseHandler.class);
+ // if there's no handler or the handler permits the close
+ // request, clean-up as necessary
+ if (closeHandler == null || closeHandler.close(window)) {
+ Object parentModel = shell.getParent()
+ .getData(OWNING_ME);
+ if (parentModel instanceof MWindow) {
+ List children = ((MWindow) parentModel)
+ .getChildren();
+ if (children.contains(window)) {
+ children.remove(window);
+ }
+ } else {
+ MWindow trimmedWindow = application.getChildren()
+ .get(0);
+ List windows = trimmedWindow.getWindows();
+ if (windows.contains(window)) {
+ windows.remove(window);
+ }
+ }
+ }
+ }
+ });
+ }
+ }
+
+ @Override
+ public void processContents(MElementContainer me) {
+ if (!(((MUIElement) me) instanceof MDialog))
+ return;
+ MDialog wbwModel = (MDialog) ((MUIElement) me);
+ super.processContents(me);
+
+ // Populate the main menu
+ IPresentationEngine renderer = context.get(IPresentationEngine.class);
+ if (wbwModel.getMainMenu() != null) {
+ renderer.createGui(wbwModel.getMainMenu(), me.getWidget(), null);
+ Shell shell = (Shell) me.getWidget();
+ shell.setMenuBar((Menu) wbwModel.getMainMenu().getWidget());
+ }
+
+ // create Detached Windows
+ for (MWindow dw : wbwModel.getWindows()) {
+ renderer.createGui(dw, me.getWidget(), wbwModel.getContext());
+ }
+ }
+
+ @Override
+ public void postProcess(MUIElement shellME) {
+ if (!(shellME instanceof MDialog))
+ return;
+ MDialog dialogModel = (MDialog) shellME;
+ super.postProcess(shellME);
+
+ Shell shell = (Shell) shellME.getWidget();
+ String location = shellME.getPersistedState()
+ .get(IModelConstants.KEY_DIALOG_PART_CUSTOM_LOCATION);
+ location = location == null ? "" : location; //$NON-NLS-1$
+ String[] locations = location.split(","); //$NON-NLS-1$
+
+ if (locations.length < 4) {
+ String[] tempLocations = new String[4];
+ for (int i = 0; i < locations.length; i++)
+ tempLocations[i] = locations[i];
+ locations = tempLocations;
+ }
+
+ Point size = shell.computeSize(SWT.DEFAULT, SWT.DEFAULT, true);
+ if (isNone(locations[2])) {
+ locations[2] = String.valueOf(size.x);
+ }
+ if (isNone(locations[3])) {
+ locations[3] = String.valueOf(size.y);
+ }
+ size = new Point(Integer.valueOf(locations[2]),
+ Integer.valueOf(locations[3]));
+ Point initLocation = getInitialLocation(shell, size);
+ Rectangle bounds = getConstrainedShellBounds(shell,
+ new Rectangle(initLocation.x, initLocation.y, size.x, size.y));
+ if (isNone(locations[0]) && isNone(locations[1])) {
+ locations[0] = String.valueOf(bounds.x);
+ locations[1] = String.valueOf(bounds.y);
+ }
+
+ dialogModel.setX(Integer.valueOf(locations[0]));
+ dialogModel.setY(Integer.valueOf(locations[1]));
+ dialogModel.setWidth(Integer.valueOf(locations[2]));
+ dialogModel.setHeight(Integer.valueOf(locations[3]));
+
+ StringBuffer sb = new StringBuffer();
+ sb.append(locations[0]);
+ sb.append(","); //$NON-NLS-1$
+ sb.append(locations[1]);
+ sb.append(","); //$NON-NLS-1$
+ sb.append(locations[2]);
+ sb.append(","); //$NON-NLS-1$
+ sb.append(locations[3]);
+
+ dialogModel.getPersistedState().put(
+ IModelConstants.KEY_DIALOG_PART_CUSTOM_LOCATION, sb.toString());
+
+ shell.layout(true);
+ forceLayout(shell);
+ if (shellME.isVisible()) {
+ shell.open();
+ } else {
+ shell.setVisible(false);
+ }
+ }
+
+ private boolean isNone(String value) {
+ return value == null || "".equals(value); //$NON-NLS-1$
+ }
+
+ private Point getInitialLocation(Shell shell, Point initialSize) {
+ Composite parent = shell.getParent();
+
+ Monitor monitor = shell.getDisplay().getPrimaryMonitor();
+ if (parent != null) {
+ monitor = parent.getMonitor();
+ }
+
+ Rectangle monitorBounds = monitor.getClientArea();
+ Point centerPoint;
+ if (parent != null) {
+ centerPoint = Geometry.centerPoint(parent.getBounds());
+ } else {
+ centerPoint = Geometry.centerPoint(monitorBounds);
+ }
+
+ return new Point(centerPoint.x - (initialSize.x / 2),
+ centerPoint.y - (initialSize.y / 2));
+ }
+
+ protected Rectangle getConstrainedShellBounds(Shell shell,
+ Rectangle preferredSize) {
+ Rectangle result = new Rectangle(preferredSize.x, preferredSize.y,
+ preferredSize.width, preferredSize.height);
+
+ Monitor mon = getClosestMonitor(shell.getDisplay(),
+ Geometry.centerPoint(result));
+
+ Rectangle bounds = mon.getClientArea();
+
+ if (result.height > bounds.height) {
+ result.height = bounds.height;
+ }
+
+ if (result.width > bounds.width) {
+ result.width = bounds.width;
+ }
+
+ result.x = Math.max(bounds.x,
+ Math.min(result.x, bounds.x + bounds.width - result.width));
+ result.y = Math.max(bounds.y,
+ Math.min(result.y, bounds.y + bounds.height - result.height));
+
+ return result;
+ }
+
+ private static Monitor getClosestMonitor(Display toSearch, Point toFind) {
+ int closest = Integer.MAX_VALUE;
+
+ Monitor[] monitors = toSearch.getMonitors();
+ Monitor result = monitors[0];
+
+ for (int idx = 0; idx < monitors.length; idx++) {
+ Monitor current = monitors[idx];
+
+ Rectangle clientArea = current.getClientArea();
+
+ if (clientArea.contains(toFind)) {
+ return current;
+ }
+
+ int distance = Geometry
+ .distanceSquared(Geometry.centerPoint(clientArea), toFind);
+ if (distance < closest) {
+ closest = distance;
+ result = current;
+ }
+ }
+
+ return result;
+ }
+
+ private void forceLayout(Shell shell) {
+ int i = 0;
+ while (shell.isLayoutDeferred()) {
+ shell.setLayoutDeferred(false);
+ i++;
+ }
+ while (i > 0) {
+ shell.setLayoutDeferred(true);
+ i--;
+ }
+ }
+
+}
diff --git a/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/renderer/XMenuManagerRenderer.java b/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/renderer/XMenuManagerRenderer.java
new file mode 100644
index 000000000..8a6712a3e
--- /dev/null
+++ b/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/renderer/XMenuManagerRenderer.java
@@ -0,0 +1,65 @@
+package org.xmind.cathy.internal.renderer;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import javax.inject.Inject;
+
+import org.eclipse.e4.ui.internal.workbench.ContributionsAnalyzer;
+import org.eclipse.e4.ui.model.application.MApplication;
+import org.eclipse.e4.ui.model.application.ui.menu.MMenu;
+import org.eclipse.e4.ui.model.application.ui.menu.MMenuContribution;
+import org.eclipse.e4.ui.model.application.ui.menu.MMenuElement;
+import org.eclipse.e4.ui.workbench.renderers.swt.MenuManagerRenderer;
+
+public class XMenuManagerRenderer extends MenuManagerRenderer {
+
+ private static final String[] retainedIconMenus = {
+ "org.xmind.ui.toolbar.mindmap.topic.menu", //$NON-NLS-1$
+ "org.xmind.ui.toolbar.export.export.menu", //$NON-NLS-1$
+ "org.xmind.ui.toolbar.mindmap.insert.menu" //$NON-NLS-1$
+ };
+
+ @Inject
+ private MApplication application;
+
+ @Override
+ public void processContributions(MMenu menuModel, String elementId,
+ boolean isMenuBar, boolean isPopup) {
+ if (elementId == null) {
+ return;
+ }
+
+ List elements = menuModel.getChildren();
+ for (MMenuElement menuItem : elements) {
+ if (menuItem instanceof MMenuElement) {
+ if (!checkRetainedIconMenu(menuModel)) {
+ ((MMenuElement) menuItem).setIconURI(null);
+ }
+ menuItem.setTooltip(""); //$NON-NLS-1$
+ }
+ }
+
+ final ArrayList toContribute = new ArrayList();
+ ContributionsAnalyzer.XXXgatherMenuContributions(menuModel,
+ application.getMenuContributions(), elementId, toContribute,
+ null, isPopup);
+ for (MMenuContribution contri : toContribute) {
+ List children = contri.getChildren();
+ for (MMenuElement me : children) {
+ if (!checkRetainedIconMenu(menuModel)) {
+ ((MMenuElement) me).setIconURI(null);
+ }
+ me.setTooltip(""); //$NON-NLS-1$
+ }
+ }
+ super.processContributions(menuModel, elementId, isMenuBar, isPopup);
+ }
+
+ private boolean checkRetainedIconMenu(MMenu menuModel) {
+ return Arrays.asList(retainedIconMenus)
+ .contains(menuModel.getElementId());
+ }
+
+}
diff --git a/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/renderer/XRightStackRenderer.java b/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/renderer/XRightStackRenderer.java
new file mode 100644
index 000000000..a3606e2e0
--- /dev/null
+++ b/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/renderer/XRightStackRenderer.java
@@ -0,0 +1,116 @@
+package org.xmind.cathy.internal.renderer;
+
+import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
+import javax.inject.Inject;
+
+import org.eclipse.e4.core.services.events.IEventBroker;
+import org.eclipse.e4.ui.model.application.ui.MElementContainer;
+import org.eclipse.e4.ui.model.application.ui.MUIElement;
+import org.eclipse.e4.ui.model.application.ui.advanced.MPlaceholder;
+import org.eclipse.e4.ui.model.application.ui.basic.MPart;
+import org.eclipse.e4.ui.model.application.ui.basic.MPartStack;
+import org.eclipse.e4.ui.model.application.ui.basic.MStackElement;
+import org.eclipse.e4.ui.workbench.IPresentationEngine;
+import org.eclipse.e4.ui.workbench.renderers.swt.LazyStackRenderer;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.StackLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+
+public class XRightStackRenderer extends LazyStackRenderer {
+
+ @Inject
+ private IPresentationEngine renderer;
+
+ @Inject
+ private IEventBroker eventBroker;
+
+ @Override
+ public Object createWidget(MUIElement element, Object parent) {
+ if (!(element instanceof MPartStack) || !(parent instanceof Composite))
+ return null;
+
+ MPartStack viewStack = (MPartStack) element;
+
+ Composite parentComposite = (Composite) parent;
+ Composite viewContainer = null;
+
+ // Ensure that all rendered PartStacks have an Id
+ if (element.getElementId() == null
+ || element.getElementId().length() == 0) {
+ String generatedId = "RightStack@" //$NON-NLS-1$
+ + Integer.toHexString(element.hashCode());
+ element.setElementId(generatedId);
+ }
+
+ int styleOverride = getStyleOverride(viewStack);
+ int style = styleOverride == -1 ? SWT.NONE : styleOverride;
+ //TODO Should use custom composite?
+ viewContainer = new Composite(parentComposite, style);
+ viewContainer.setLayout(new StackLayout());
+
+ bindWidget(element, viewContainer);
+
+ return viewContainer;
+ }
+
+ @Override
+ protected void showTab(MUIElement element) {
+ super.showTab(element);
+
+ if (element instanceof MPartStack
+ && element.getRenderer() == XRightStackRenderer.this) {
+ MPartStack stackModel = (MPartStack) element;
+ MUIElement curSel = stackModel.getSelectedElement();
+ MPart part = (MPart) ((curSel instanceof MPlaceholder)
+ ? ((MPlaceholder) curSel).getRef() : curSel);
+ if (curSel instanceof MPlaceholder) {
+ part.setCurSharedRef((MPlaceholder) curSel);
+ }
+ }
+
+ // an invisible element won't have the correct widget hierarchy
+ if (!element.isVisible()) {
+ return;
+ }
+
+ final Composite viewContainer = (Composite) getParentWidget(element);
+ Control ctrl = (Control) element.getWidget();
+ if (ctrl != null && ctrl.getParent() != viewContainer) {
+ ctrl.setParent(viewContainer);
+ } else if (ctrl == null) {
+ renderer.createGui(element);
+ }
+
+ ctrl = (Control) element.getWidget();
+
+ if (ctrl instanceof Composite) {
+ ((Composite) ctrl).layout(false, true);
+ }
+ ((StackLayout) viewContainer.getLayout()).topControl = ctrl;
+ viewContainer.layout(true, true);
+
+ }
+
+ @Override
+ public void childRendered(final MElementContainer parentElement,
+ MUIElement element) {
+ super.childRendered(parentElement, element);
+
+ if (!(((MUIElement) parentElement) instanceof MPartStack)
+ || !(element instanceof MStackElement))
+ return;
+ showTab(element);
+ }
+
+ @PostConstruct
+ public void init() {
+ super.init(eventBroker);
+ }
+
+ @PreDestroy
+ public void contextDisposed() {
+ super.contextDisposed(eventBroker);
+ }
+}
diff --git a/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/renderer/XRightTrimBarLayout.java b/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/renderer/XRightTrimBarLayout.java
new file mode 100644
index 000000000..bf400bf0f
--- /dev/null
+++ b/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/renderer/XRightTrimBarLayout.java
@@ -0,0 +1,127 @@
+package org.xmind.cathy.internal.renderer;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.e4.ui.internal.workbench.swt.AbstractPartRenderer;
+import org.eclipse.e4.ui.model.application.ui.MUIElement;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.graphics.Rectangle;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Layout;
+import org.xmind.cathy.internal.ICathyConstants;
+
+public class XRightTrimBarLayout extends Layout {
+
+ private static final int MARGIN_LEFT = -2;
+ private static final int MARGIN_RIGHT = -2;
+ private static final int MARGIN_TOP = 20;
+ private static final int MARGIN_BOTTOM = 0;
+
+ @Override
+ protected Point computeSize(Composite composite, int wHint, int hHint,
+ boolean flushCache) {
+ int width = 0;
+ Control[] children = composite.getChildren();
+ for (Control child : children) {
+ Point size = child.computeSize(SWT.DEFAULT, SWT.DEFAULT, true);
+ width = Math.max(width, size.x);
+ }
+ width = width + MARGIN_LEFT + MARGIN_RIGHT;
+ return new Point(width, hHint);
+ }
+
+ @Override
+ protected void layout(Composite composite, boolean flushCache) {
+ Rectangle bounds = composite.getBounds();
+ bounds.x = MARGIN_LEFT;
+ bounds.y = MARGIN_TOP;
+ bounds.width -= (MARGIN_LEFT + MARGIN_RIGHT);
+ bounds.height -= (MARGIN_TOP + MARGIN_BOTTOM);
+
+ int curX = bounds.x;
+ int curY = bounds.y;
+
+ List beginingControls = new ArrayList();
+ List centerControls = new ArrayList();
+ List endControls = new ArrayList();
+
+ int centerControlsHeight = 0;
+ int endControlsHeight = 0;
+
+ Control[] children = composite.getChildren();
+ for (Control child : children) {
+ if (isBegining(child)) {
+ beginingControls.add(child);
+ } else if (isCenter(child)) {
+ centerControls.add(child);
+ centerControlsHeight += child.computeSize(SWT.DEFAULT,
+ SWT.DEFAULT).y;
+ } else if (isEnd(child)) {
+ endControls.add(child);
+ endControlsHeight += child.computeSize(SWT.DEFAULT,
+ SWT.DEFAULT).y;
+ } else {
+ centerControls.add(child);
+ centerControlsHeight += child.computeSize(SWT.DEFAULT,
+ SWT.DEFAULT).y;
+ }
+ }
+
+ for (Control bc : beginingControls) {
+ Point size = bc.computeSize(SWT.DEFAULT, SWT.DEFAULT);
+ bc.setBounds(curX, curY, size.x, size.y);
+ curY += size.y;
+ }
+
+ curY = Math.max(curY, (bounds.height - centerControlsHeight) / 2);
+
+ for (Control cc : centerControls) {
+ Point size = cc.computeSize(SWT.DEFAULT, SWT.DEFAULT);
+ cc.setBounds(curX, curY, size.x, size.y);
+ curY += size.y;
+ }
+
+ curY = Math.max(curY, bounds.y + bounds.height - endControlsHeight);
+
+ for (Control ec : endControls) {
+ Point size = ec.computeSize(SWT.DEFAULT, SWT.DEFAULT);
+ ec.setBounds(curX, curY, size.x, size.y);
+ curY += size.y;
+ }
+
+ }
+
+ private boolean isBegining(Control ctrl) {
+ MUIElement element = (MUIElement) ctrl
+ .getData(AbstractPartRenderer.OWNING_ME);
+ if (element != null && element.getTags()
+ .contains(ICathyConstants.TAG_TRIMBAR_LAYOUT_BEGINING))
+ return true;
+
+ return false;
+ }
+
+ private boolean isCenter(Control ctrl) {
+ MUIElement element = (MUIElement) ctrl
+ .getData(AbstractPartRenderer.OWNING_ME);
+ if (element != null && element.getTags()
+ .contains(ICathyConstants.TAG_TRIMBAR_LAYOUT_CENTER))
+ return true;
+
+ return false;
+ }
+
+ private boolean isEnd(Control ctrl) {
+ MUIElement element = (MUIElement) ctrl
+ .getData(AbstractPartRenderer.OWNING_ME);
+ if (element != null && element.getTags()
+ .contains(ICathyConstants.TAG_TRIMBAR_LAYOUT_END))
+ return true;
+
+ return false;
+ }
+
+}
diff --git a/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/renderer/XSashLayout.java b/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/renderer/XSashLayout.java
new file mode 100644
index 000000000..4d9e8027d
--- /dev/null
+++ b/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/renderer/XSashLayout.java
@@ -0,0 +1,191 @@
+package org.xmind.cathy.internal.renderer;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.e4.ui.model.application.ui.MGenericTile;
+import org.eclipse.e4.ui.model.application.ui.MUIElement;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.graphics.Rectangle;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Layout;
+import org.eclipse.swt.widgets.Shell;
+
+public class XSashLayout extends Layout {
+
+ int suggestedSizeForViewStack = 310;
+ int suggestedDownDistanceForViewStack = 22;
+
+ int marginLeft = 0;
+ int marginRight = 0;
+ int marginTop = 0;
+ int marginBottom = 0;
+ int sashWidth = 0;
+
+ MUIElement root;
+
+ class SashRect {
+ Rectangle rect;
+ MGenericTile container;
+ MUIElement left;
+ MUIElement right;
+
+ public SashRect(Rectangle rect, MGenericTile container,
+ MUIElement left, MUIElement right) {
+ this.container = container;
+ this.rect = rect;
+ this.left = left;
+ this.right = right;
+ }
+ }
+
+ public XSashLayout(MUIElement root) {
+ this.root = root;
+ }
+
+ @Override
+ protected void layout(Composite composite, boolean flushCache) {
+ if (root == null)
+ return;
+
+ Rectangle bounds = composite.getBounds();
+ if (composite instanceof Shell)
+ bounds = ((Shell) composite).getClientArea();
+ else {
+ bounds.x = 0;
+ bounds.y = 0;
+ }
+
+ bounds.width -= (marginLeft + marginRight);
+ bounds.height -= (marginTop + marginBottom);
+ bounds.x += marginLeft;
+ bounds.y += marginTop;
+
+ tileSubNodes(bounds, root);
+ }
+
+ @Override
+ protected Point computeSize(Composite composite, int wHint, int hHint,
+ boolean flushCache) {
+ return new Point(600, 400);
+ }
+
+ private int totalScalableSectionWeight(MGenericTile node) {
+ int total = 0;
+ for (MUIElement subNode : node.getChildren()) {
+ if (subNode.isToBeRendered() && subNode.isVisible()) {
+ Object renderer = subNode.getRenderer();
+ if (renderer != null
+ && renderer.getClass() != XRightStackRenderer.class) {
+ total += getWeight(subNode);
+ }
+ }
+ }
+ return total;
+ }
+
+ private void tileSubNodes(Rectangle bounds, MUIElement node) {
+ if (node != root)
+ setRectangle(node, bounds);
+
+ if (!(node instanceof MGenericTile))
+ return;
+
+ MGenericTile sashContainer = (MGenericTile) node;
+ List visibleChildren = getVisibleChildren(sashContainer);
+ int childCount = visibleChildren.size();
+
+ // How many pixels do we have?
+ int availableWidth = sashContainer.isHorizontal() ? bounds.width
+ : bounds.height;
+
+ // Subtract off the room for the sashes
+ availableWidth -= ((childCount - 1) * sashWidth);
+
+ int availableScalableSectionWidth = availableWidth;
+
+ // Get the total of the weights
+ double totalScalableSectionWeight = totalScalableSectionWeight(
+ sashContainer);
+ for (MUIElement subNode : visibleChildren) {
+ Object renderer = subNode.getRenderer();
+ if (renderer != null
+ && renderer.getClass() == XRightStackRenderer.class) {
+ availableScalableSectionWidth -= suggestedSizeForViewStack;
+ }
+ }
+ int tilePos = sashContainer.isHorizontal() ? bounds.x : bounds.y;
+
+ MUIElement prev = null;
+ for (MUIElement subNode : visibleChildren) {
+ // Add a 'sash' between this node and the 'prev'
+ if (prev != null) {
+ tilePos += sashWidth;
+ }
+
+ // Calc the new size as a %'age of the total
+ int weight = getWeight(subNode);
+ double ratio = weight / totalScalableSectionWeight;
+ int newSize = (int) ((availableScalableSectionWidth * ratio) + 0.5);
+ Object renderer = subNode.getRenderer();
+
+ int y = bounds.y;
+ int height = bounds.height;
+ if (renderer != null
+ && renderer.getClass() == XRightStackRenderer.class) {
+ newSize = suggestedSizeForViewStack;
+ y = y + suggestedDownDistanceForViewStack;
+ height = height - suggestedDownDistanceForViewStack - 1;
+ }
+
+ Rectangle subBounds = sashContainer.isHorizontal()
+ ? new Rectangle(tilePos, y, newSize, height)
+ : new Rectangle(bounds.x, tilePos, bounds.width, newSize);
+ tilePos += newSize;
+
+ tileSubNodes(subBounds, subNode);
+ prev = subNode;
+ }
+ }
+
+ /**
+ * @param node
+ * @param bounds
+ */
+ private void setRectangle(MUIElement node, Rectangle bounds) {
+ if (node.getWidget() instanceof Control) {
+ Control ctrl = (Control) node.getWidget();
+ ctrl.setBounds(bounds);
+ } else if (node.getWidget() instanceof Rectangle) {
+ Rectangle theRect = (Rectangle) node.getWidget();
+ theRect.x = bounds.x;
+ theRect.y = bounds.y;
+ theRect.width = bounds.width;
+ theRect.height = bounds.height;
+ }
+ }
+
+ private List getVisibleChildren(MGenericTile sashContainer) {
+ List visKids = new ArrayList();
+ for (MUIElement child : sashContainer.getChildren()) {
+ if (child.isToBeRendered() && child.isVisible())
+ visKids.add(child);
+ }
+ return visKids;
+ }
+
+ private static int getWeight(MUIElement element) {
+ String info = element.getContainerData();
+ if (info == null || info.length() == 0) {
+ return 0;
+ }
+
+ try {
+ int value = Integer.parseInt(info);
+ return value;
+ } catch (NumberFormatException e) {
+ return 0;
+ }
+ }
+}
diff --git a/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/renderer/XSashRenderer.java b/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/renderer/XSashRenderer.java
new file mode 100644
index 000000000..b0cac9c09
--- /dev/null
+++ b/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/renderer/XSashRenderer.java
@@ -0,0 +1,173 @@
+package org.xmind.cathy.internal.renderer;
+
+import javax.inject.Inject;
+
+import org.eclipse.e4.core.di.annotations.Optional;
+import org.eclipse.e4.ui.di.UIEventTopic;
+import org.eclipse.e4.ui.model.application.ui.MElementContainer;
+import org.eclipse.e4.ui.model.application.ui.MUIElement;
+import org.eclipse.e4.ui.model.application.ui.basic.MPartSashContainer;
+import org.eclipse.e4.ui.model.application.ui.basic.MPartSashContainerElement;
+import org.eclipse.e4.ui.workbench.UIEvents;
+import org.eclipse.e4.ui.workbench.renderers.swt.SWTPartRenderer;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.DisposeEvent;
+import org.eclipse.swt.events.DisposeListener;
+import org.eclipse.swt.graphics.Rectangle;
+import org.eclipse.swt.widgets.Composite;
+import org.osgi.service.event.Event;
+
+public class XSashRenderer extends SWTPartRenderer {
+
+ private static final int UNDEFINED_WEIGHT = -1;
+ private static final int DEFAULT_WEIGHT = 5000;
+
+ private int processedContent = 0;
+
+ @SuppressWarnings("unchecked")
+ @Inject
+ @Optional
+ private void subscribeTopicOrientationChanged(
+ @UIEventTopic(UIEvents.GenericTile.TOPIC_HORIZONTAL) Event event) {
+ // Ensure that this event is for a MPartSashContainer
+ MUIElement element = (MUIElement) event
+ .getProperty(UIEvents.EventTags.ELEMENT);
+ if (element.getRenderer() != XSashRenderer.this) {
+ return;
+ }
+ forceLayout((MElementContainer) element);
+ }
+
+ @SuppressWarnings("unchecked")
+ @Inject
+ @Optional
+ private void subscribeTopicSashWeightChanged(
+ @UIEventTopic(UIEvents.UIElement.TOPIC_CONTAINERDATA) Event event) {
+ // Ensure that this event is for a MPartSashContainer
+ MUIElement element = (MUIElement) event
+ .getProperty(UIEvents.EventTags.ELEMENT);
+ if (element.getRenderer() != XSashRenderer.this) {
+ return;
+ }
+ forceLayout((MElementContainer) element);
+ }
+
+ /**
+ * @param pscModel
+ */
+ protected void forceLayout(MElementContainer pscModel) {
+ if (processedContent != 0) {
+ return;
+ }
+ // layout the containing Composite
+ while (!(pscModel.getWidget() instanceof Composite))
+ pscModel = pscModel.getParent();
+
+ Composite s = (Composite) pscModel.getWidget();
+ s.layout(true, true);
+ }
+
+ @Override
+ public Object createWidget(final MUIElement element, Object parent) {
+ MUIElement elementParent = element.getParent();
+ if (elementParent == null && element.getCurSharedRef() != null)
+ elementParent = element.getCurSharedRef();
+
+ if (elementParent != null && elementParent.getRenderer() == this) {
+ Rectangle newRect = new Rectangle(0, 0, 0, 0);
+
+ // If my layout's container gets disposed 'unbind' the sash elements
+ if (parent instanceof Composite) {
+ ((Composite) parent).addDisposeListener(new DisposeListener() {
+ public void widgetDisposed(DisposeEvent e) {
+ element.setWidget(null);
+ element.setRenderer(null);
+ }
+ });
+ }
+ return newRect;
+ }
+
+ // Check to see if this is a new PSC added 'above' the previous 'root'
+ // sash
+ Composite sashComposite = null;
+ MPartSashContainer psc = (MPartSashContainer) element;
+ for (MPartSashContainerElement psce : psc.getChildren()) {
+ if (psce instanceof MPartSashContainer
+ && psce.getWidget() instanceof Composite) {
+ // 'Adopt' the previous root's layout / composite
+ sashComposite = (Composite) psce.getWidget();
+ bindWidget(psce, new Rectangle(0, 0, 0, 0));
+ }
+ }
+ // This is a 'root' sash container, create a composite
+ if (sashComposite == null)
+ sashComposite = new Composite((Composite) parent, SWT.NONE);
+ sashComposite.setLayout(new XSashLayout(element));
+
+ return sashComposite;
+ }
+
+ @Override
+ public void childRendered(MElementContainer parentElement,
+ MUIElement element) {
+ super.childRendered(parentElement, element);
+
+ // Ensure that the element's 'containerInfo' is initialized
+ int weight = getWeight(element);
+ if (weight == UNDEFINED_WEIGHT) {
+ element.setContainerData(Integer.toString(DEFAULT_WEIGHT));
+ }
+ forceLayout(parentElement);
+ }
+
+ @Override
+ public void processContents(MElementContainer container) {
+ try {
+ processedContent++;
+ super.processContents(container);
+ } finally {
+ processedContent--;
+ if (processedContent == 0) {
+ forceLayout(container);
+ }
+ }
+ }
+
+ @Override
+ public void hideChild(MElementContainer parentElement,
+ MUIElement child) {
+ super.hideChild(parentElement, child);
+
+ forceLayout(parentElement);
+ }
+
+ @Override
+ public Object getUIContainer(MUIElement element) {
+ // OK, find the 'root' of the sash container
+ MUIElement parentElement = element.getParent();
+ while (parentElement.getRenderer() == this
+ && !(parentElement.getWidget() instanceof Composite))
+ parentElement = parentElement.getParent();
+
+ if (parentElement.getWidget() instanceof Composite)
+ return parentElement.getWidget();
+
+ return null;
+ }
+
+ private static int getWeight(MUIElement element) {
+ String info = element.getContainerData();
+ if (info == null || info.length() == 0) {
+ element.setContainerData(Integer.toString(10000));
+ info = element.getContainerData();
+ }
+
+ try {
+ int value = Integer.parseInt(info);
+ return value;
+ } catch (NumberFormatException e) {
+ return UNDEFINED_WEIGHT;
+ }
+ }
+}
diff --git a/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/renderer/XStackRenderer.java b/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/renderer/XStackRenderer.java
new file mode 100644
index 000000000..34db2368d
--- /dev/null
+++ b/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/renderer/XStackRenderer.java
@@ -0,0 +1,127 @@
+package org.xmind.cathy.internal.renderer;
+
+import org.eclipse.e4.ui.model.application.ui.MUIElement;
+import org.eclipse.e4.ui.workbench.renderers.swt.StackRenderer;
+import org.eclipse.jface.resource.JFaceResources;
+import org.eclipse.jface.resource.LocalResourceManager;
+import org.eclipse.jface.resource.ResourceManager;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CTabFolder;
+import org.eclipse.swt.events.ControlEvent;
+import org.eclipse.swt.events.ControlListener;
+import org.eclipse.swt.events.PaintEvent;
+import org.eclipse.swt.events.PaintListener;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.ui.PlatformUI;
+import org.xmind.cathy.internal.CathyPlugin;
+import org.xmind.cathy.internal.WorkbenchMessages;
+import org.xmind.ui.internal.utils.CommandUtils;
+import org.xmind.ui.resources.ColorUtils;
+
+public class XStackRenderer extends StackRenderer {
+
+ private ResourceManager resources;
+
+ private Composite nullContent;
+
+ @Override
+ public Object createWidget(MUIElement element, Object parent) {
+ final CTabFolder ctf = (CTabFolder) super.createWidget(element, parent);
+ resources = new LocalResourceManager(JFaceResources.getResources(),
+ ctf);
+ nullContent = createNullContentTipArea(ctf);
+ nullContent.moveBelow(null);
+
+ ctf.addPaintListener(new PaintListener() {
+
+ @Override
+ public void paintControl(PaintEvent e) {
+ nullContent.moveBelow(null);
+ }
+ });
+
+ ctf.addControlListener(new ControlListener() {
+
+ @Override
+ public void controlResized(ControlEvent e) {
+ nullContent.setBounds(ctf.getClientArea());
+ }
+
+ @Override
+ public void controlMoved(ControlEvent e) {
+ nullContent.setBounds(ctf.getClientArea());
+ }
+ });
+
+ return ctf;
+ }
+
+ private Composite createNullContentTipArea(CTabFolder parent) {
+ Composite composite = new Composite(parent, SWT.NONE);
+ composite.setBackground(
+ (Color) resources.get(ColorUtils.toDescriptor("#ffffff"))); //$NON-NLS-1$
+ GridLayout layout = new GridLayout(1, false);
+ composite.setLayout(layout);
+
+ Composite centerArea = new Composite(composite, SWT.NONE);
+ centerArea.setBackground(composite.getBackground());
+ centerArea.setLayoutData(
+ new GridData(SWT.CENTER, SWT.CENTER, true, true));
+ GridLayout layout2 = new GridLayout(1, false);
+ layout2.marginWidth = 0;
+ layout2.marginHeight = 0;
+ layout2.verticalSpacing = 40;
+ centerArea.setLayout(layout2);
+
+ createTopArea(centerArea);
+ createBottomArea(centerArea);
+
+ return composite;
+ }
+
+ private void createTopArea(Composite parent) {
+ Composite composite = new Composite(parent, SWT.NONE);
+ composite.setBackground(parent.getBackground());
+ composite.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false));
+ GridLayout layout = new GridLayout(1, false);
+ layout.marginWidth = 0;
+ layout.marginHeight = 0;
+ layout.verticalSpacing = 20;
+ composite.setLayout(layout);
+
+ Label imageLabel = new Label(composite, SWT.NONE);
+ imageLabel.setBackground(composite.getBackground());
+ imageLabel.setLayoutData(
+ new GridData(SWT.CENTER, SWT.CENTER, true, false));
+ imageLabel.setImage((Image) resources.get(
+ CathyPlugin.imageDescriptorFromPlugin(CathyPlugin.PLUGIN_ID,
+ "icons/views/null_editor_tip.png"))); //$NON-NLS-1$
+
+ }
+
+ private void createBottomArea(Composite parent) {
+ Button button = new Button(parent, SWT.PUSH);
+ button.setText(WorkbenchMessages.XStackRenderer_BottomArea_Add_button);
+ GridData layoutData = new GridData(SWT.CENTER, SWT.CENTER, false,
+ false);
+ layoutData.widthHint = Math.max(128,
+ button.computeSize(SWT.DEFAULT, SWT.DEFAULT).x + 10);
+ button.setLayoutData(layoutData);
+ button.addSelectionListener(new SelectionAdapter() {
+ @Override
+ public void widgetSelected(SelectionEvent e) {
+ CommandUtils.executeCommand("org.xmind.ui.command.newWorkbook", //$NON-NLS-1$
+ PlatformUI.getWorkbench().getActiveWorkbenchWindow());
+ }
+ });
+ }
+
+}
diff --git a/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/renderer/XToolBarManagerRenderer.java b/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/renderer/XToolBarManagerRenderer.java
index 4086cb85c..0396de0ae 100644
--- a/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/renderer/XToolBarManagerRenderer.java
+++ b/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/renderer/XToolBarManagerRenderer.java
@@ -31,7 +31,10 @@ public Object createWidget(final MUIElement element, Object parent) {
Control renderedCtrl = newTB;
MUIElement parentElement = element.getParent();
if (parentElement instanceof MTrimBar) {
- element.getTags().add(IPresentationEngine.DRAGGABLE);
+ //default can't be draggable
+// if (!element.getTags().contains(IPresentationEngine.NO_MOVE)) {
+// element.getTags().add(IPresentationEngine.DRAGGABLE);
+// }
setCSSInfo(element, newTB);
@@ -43,8 +46,12 @@ public Object createWidget(final MUIElement element, Object parent) {
CSSRenderingUtils cssUtils = parentContext
.get(CSSRenderingUtils.class);
if (cssUtils != null) {
- renderedCtrl = (Composite) cssUtils.frameMeIfPossible(newTB,
- null, vertical, true);
+ MUIElement modelElement = (MUIElement) newTB
+ .getData(AbstractPartRenderer.OWNING_ME);
+ boolean draggable = ((modelElement != null) && (modelElement
+ .getTags().contains(IPresentationEngine.DRAGGABLE)));
+ renderedCtrl = cssUtils.frameMeIfPossible(newTB, null, vertical,
+ draggable);
}
}
diff --git a/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/renderer/XTrimmedPartLayout.java b/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/renderer/XTrimmedPartLayout.java
index 84addd106..3f51a339a 100644
--- a/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/renderer/XTrimmedPartLayout.java
+++ b/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/renderer/XTrimmedPartLayout.java
@@ -4,6 +4,7 @@
import java.util.Map;
import org.eclipse.e4.ui.workbench.renderers.swt.TrimmedPartLayout;
+import org.eclipse.jface.util.Util;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.DisposeEvent;
import org.eclipse.swt.events.DisposeListener;
@@ -57,7 +58,8 @@ protected void layout(Composite composite, boolean flushCache) {
// 'Top' spans the entire area
if (top != null && top.isVisible()) {
- Point topSize = top.computeSize(caRect.width, SWT.DEFAULT, true);
+ Point topSize = top.computeSize(
+ caRect.width - (Util.isMac() ? 12 : 0), SWT.DEFAULT, true); /// -12 for mac margin
caRect.y += topSize.y;
caRect.height -= topSize.y;
@@ -194,6 +196,18 @@ public void removeContainer(Object child) {
@Override
public Composite getTrimComposite(Composite parent, int side) {
+ if (side == SWT.RIGHT) {
+ if (right == null) {
+ right = new Composite(parent, SWT.NONE);
+ right.setLayout(new XRightTrimBarLayout());
+ right.addDisposeListener(new DisposeListener() {
+ public void widgetDisposed(DisposeEvent e) {
+ right = null;
+ }
+ });
+ }
+ return right;
+ }
Composite trim = super.getTrimComposite(parent, side);
if (trim != null && clientArea != null && !clientArea.isDisposed()) {
trim.setVisible(clientArea.isVisible());
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 3743d7a1c..639087a88 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
@@ -2,30 +2,75 @@
import org.eclipse.e4.ui.internal.workbench.swt.AbstractPartRenderer;
import org.eclipse.e4.ui.model.application.ui.MUIElement;
+import org.eclipse.e4.ui.model.application.ui.basic.MDialog;
+import org.eclipse.e4.ui.model.application.ui.basic.MPartSashContainer;
+import org.eclipse.e4.ui.model.application.ui.basic.MPartStack;
import org.eclipse.e4.ui.model.application.ui.basic.MTrimmedWindow;
+import org.eclipse.e4.ui.model.application.ui.menu.MMenu;
import org.eclipse.e4.ui.model.application.ui.menu.MToolBar;
-import org.eclipse.e4.ui.workbench.renderers.swt.ToolBarManagerRenderer;
+import org.eclipse.e4.ui.workbench.renderers.swt.LazyStackRenderer;
import org.eclipse.e4.ui.workbench.renderers.swt.WorkbenchRendererFactory;
public class XWorkbenchRendererFactory extends WorkbenchRendererFactory {
private XWBWRenderer xwbwRenderer;
- private ToolBarManagerRenderer xtoolbarRenderer;
+ private XToolBarManagerRenderer xtoolbarRenderer;
+ private XDialogRenderer xdialogRenderer;
+ private XRightStackRenderer xviewStackRenderer;
+ private XSashRenderer xsashRenderer;
+ private XMenuManagerRenderer xMenuManagerRenderer;
+ private LazyStackRenderer stackRenderer;
public AbstractPartRenderer getRenderer(MUIElement uiElement,
Object parent) {
- if (uiElement instanceof MToolBar) {
+ boolean viewPartStack = (uiElement instanceof MPartStack)
+ && (uiElement.getTags().contains("RightStack")) //$NON-NLS-1$
+ && (uiElement.getElementId() != null);
+ boolean editorPartStack = (uiElement instanceof MPartStack)
+ && (uiElement.getTags().contains("EditorStack")) //$NON-NLS-1$
+ && (uiElement.getElementId() != null);
+ if (viewPartStack) {
+ if (xviewStackRenderer == null) {
+ xviewStackRenderer = new XRightStackRenderer();
+ initRenderer(xviewStackRenderer);
+ }
+ return xviewStackRenderer;
+ } else if (uiElement instanceof MPartSashContainer) {
+ if (xsashRenderer == null) {
+ xsashRenderer = new XSashRenderer();
+ initRenderer(xsashRenderer);
+ }
+ return xsashRenderer;
+ } else if (uiElement instanceof MToolBar) {
if (xtoolbarRenderer == null) {
xtoolbarRenderer = new XToolBarManagerRenderer();
initRenderer(xtoolbarRenderer);
}
return xtoolbarRenderer;
+ } else if (uiElement instanceof MMenu) {
+ if (xMenuManagerRenderer == null) {
+ xMenuManagerRenderer = new XMenuManagerRenderer();
+ initRenderer(xMenuManagerRenderer);
+ }
+ return xMenuManagerRenderer;
+
} else if (uiElement instanceof MTrimmedWindow) {
if (xwbwRenderer == null) {
xwbwRenderer = new XWBWRenderer();
initRenderer(xwbwRenderer);
}
return xwbwRenderer;
+ } else if (uiElement instanceof MDialog) {
+ if (xdialogRenderer == null)
+ xdialogRenderer = new XDialogRenderer();
+ initRenderer(xdialogRenderer);
+ return xdialogRenderer;
+ } else if (uiElement instanceof MPartStack && editorPartStack) {
+ if (stackRenderer == null) {
+ stackRenderer = new XStackRenderer();
+ initRenderer(stackRenderer);
+ }
+ return stackRenderer;
}
return super.getRenderer(uiElement, parent);
}
diff --git a/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/ui/workbench/addons/minmax/MinMaxAddon.java b/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/ui/workbench/addons/minmax/MinMaxAddon.java
new file mode 100644
index 000000000..eb388eb41
--- /dev/null
+++ b/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/ui/workbench/addons/minmax/MinMaxAddon.java
@@ -0,0 +1,800 @@
+package org.xmind.cathy.internal.ui.workbench.addons.minmax;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+import javax.inject.Inject;
+
+import org.eclipse.core.commands.ParameterizedCommand;
+import org.eclipse.e4.core.contexts.IEclipseContext;
+import org.eclipse.e4.core.di.annotations.Optional;
+import org.eclipse.e4.core.services.events.IEventBroker;
+import org.eclipse.e4.ui.di.UIEventTopic;
+import org.eclipse.e4.ui.internal.workbench.swt.AbstractPartRenderer;
+import org.eclipse.e4.ui.model.application.MAddon;
+import org.eclipse.e4.ui.model.application.MApplication;
+import org.eclipse.e4.ui.model.application.ui.MGenericStack;
+import org.eclipse.e4.ui.model.application.ui.MUIElement;
+import org.eclipse.e4.ui.model.application.ui.SideValue;
+import org.eclipse.e4.ui.model.application.ui.advanced.MArea;
+import org.eclipse.e4.ui.model.application.ui.advanced.MPerspective;
+import org.eclipse.e4.ui.model.application.ui.advanced.MPerspectiveStack;
+import org.eclipse.e4.ui.model.application.ui.advanced.MPlaceholder;
+import org.eclipse.e4.ui.model.application.ui.basic.MPart;
+import org.eclipse.e4.ui.model.application.ui.basic.MPartStack;
+import org.eclipse.e4.ui.model.application.ui.basic.MStackElement;
+import org.eclipse.e4.ui.model.application.ui.basic.MTrimBar;
+import org.eclipse.e4.ui.model.application.ui.basic.MTrimElement;
+import org.eclipse.e4.ui.model.application.ui.basic.MTrimmedWindow;
+import org.eclipse.e4.ui.model.application.ui.basic.MWindow;
+import org.eclipse.e4.ui.model.application.ui.menu.MHandledToolItem;
+import org.eclipse.e4.ui.model.application.ui.menu.MToolBar;
+import org.eclipse.e4.ui.model.application.ui.menu.MToolBarElement;
+import org.eclipse.e4.ui.model.application.ui.menu.MToolControl;
+import org.eclipse.e4.ui.workbench.IPresentationEngine;
+import org.eclipse.e4.ui.workbench.UIEvents;
+import org.eclipse.e4.ui.workbench.UIEvents.EventTags;
+import org.eclipse.e4.ui.workbench.modeling.EModelService;
+import org.eclipse.e4.ui.workbench.modeling.EPartService;
+import org.eclipse.swt.custom.CTabFolder;
+import org.eclipse.swt.custom.CTabFolder2Adapter;
+import org.eclipse.swt.custom.CTabFolderEvent;
+import org.eclipse.swt.events.MouseAdapter;
+import org.eclipse.swt.events.MouseEvent;
+import org.eclipse.swt.events.MouseListener;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.swt.widgets.ToolItem;
+import org.eclipse.swt.widgets.Widget;
+import org.osgi.service.event.Event;
+import org.xmind.cathy.internal.ICathyConstants;
+import org.xmind.ui.internal.e4models.IModelConstants;
+
+/**
+ * Workbench addon that provides methods to hide, show parts in the window
+ */
+public class MinMaxAddon {
+
+ static final String ID_SUFFIX = "(minimized)"; //$NON-NLS-1$
+ static final String STACK_VISIBLE = "StackVisible"; //$NON-NLS-1$
+ static final String STACK_HIDDEN = "StackHidden"; //$NON-NLS-1$
+ /*
+ * TrimStack exist for PartStack
+ */
+ static final String TRIM_STACK_EXIST = "TrimStackExist"; //$NON-NLS-1$
+
+ @Inject
+ IEventBroker eventBroker;
+
+ @Inject
+ EModelService modelService;
+
+ @Inject
+ EPartService partService;
+
+ @Inject
+ private IEclipseContext context;
+
+ @Inject
+ MAddon minMaxAddon;
+
+ @Inject
+ MApplication application;
+
+ private SelectionListener toolItemSelectionListener = new SelectionListener() {
+
+ public void widgetSelected(SelectionEvent e) {
+ widgetDefaultSelected(e);
+ }
+
+ public void widgetDefaultSelected(SelectionEvent e) {
+ ToolItem selectedToolItem = (ToolItem) e.widget;
+ MUIElement uiElement = (MUIElement) selectedToolItem
+ .getData(AbstractPartRenderer.OWNING_ME);
+
+ if (uiElement.getTags() != null && uiElement.getTags()
+ .contains(IModelConstants.DIRECT_COMMAD_TAG))
+ return;
+
+ MUIElement rightTrimBar = modelService
+ .find(ICathyConstants.ID_TRIMBAR_RIGHT, application);
+ if (rightTrimBar instanceof MTrimBar) {
+ List children = ((MTrimBar) rightTrimBar)
+ .getChildren();
+ for (MTrimElement trimElement : children) {
+ if (trimElement instanceof MToolBar) {
+ List toolItems = ((MToolBar) trimElement)
+ .getChildren();
+ for (MToolBarElement toolBarElement : toolItems) {
+ if (toolBarElement instanceof MHandledToolItem
+ && toolBarElement != uiElement) {
+ MHandledToolItem handledToolItem = (MHandledToolItem) toolBarElement;
+ handledToolItem.setSelected(false);
+
+ Map parameters = handledToolItem.getWbCommand()
+ .getParameterMap();
+ String partId = (String) parameters.get(
+ IModelConstants.KEY_MODEL_PART_COMMAND_PARAMETER_PART_ID);
+ if (partId != null) {
+ MPart p = partService.findPart(partId);
+ if (p != null) {
+ p.setVisible(false);
+ partService.hidePart(p);
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+
+ }
+ };
+
+ private CTabFolder2Adapter CTFButtonListener = new CTabFolder2Adapter() {
+ private MUIElement getElementToChange(CTabFolderEvent event) {
+ CTabFolder ctf = (CTabFolder) event.widget;
+ MUIElement element = (MUIElement) ctf
+ .getData(AbstractPartRenderer.OWNING_ME);
+ if (element instanceof MArea)
+ return element.getCurSharedRef();
+
+ MUIElement parentElement = element.getParent();
+ while (parentElement != null && !(parentElement instanceof MArea))
+ parentElement = parentElement.getParent();
+
+ return parentElement != null ? parentElement.getCurSharedRef()
+ : element;
+ }
+
+ @Override
+ public void maximize(CTabFolderEvent event) {
+ setState(getElementToChange(event), STACK_VISIBLE);
+ }
+
+ @Override
+ public void minimize(CTabFolderEvent event) {
+ setState(getElementToChange(event), TRIM_STACK_EXIST);
+ setState(getElementToChange(event), STACK_HIDDEN);
+ }
+
+ @Override
+ public void restore(CTabFolderEvent event) {
+ setState(getElementToChange(event), STACK_VISIBLE);
+ }
+ };
+
+ private MouseListener doubleClickListener = new MouseAdapter() {
+
+ private MUIElement getElementToChange(MouseEvent event) {
+ Widget widget = (Widget) event.widget;
+ MUIElement element = (MUIElement) widget
+ .getData(AbstractPartRenderer.OWNING_ME);
+ if (element instanceof MArea) {
+ // set the state on the placeholder
+ return element.getCurSharedRef();
+ }
+
+ MUIElement parentElement = element.getParent();
+ while (parentElement != null && !(parentElement instanceof MArea))
+ parentElement = parentElement.getParent();
+
+ return parentElement != null ? parentElement.getCurSharedRef()
+ : element;
+ }
+
+ public void mouseDoubleClick(MouseEvent e) {
+ if (e.button == 1) {
+ MUIElement elementToChange = getElementToChange(e);
+ if (!elementToChange.getTags().contains(STACK_VISIBLE)) {
+ setState(elementToChange, STACK_VISIBLE);
+ }
+ }
+ }
+ };
+
+ private void setState(MUIElement element, String state) {
+ if (STACK_VISIBLE.equals(state)) {
+ element.getTags().remove(STACK_HIDDEN);
+ element.getTags().remove(STACK_VISIBLE);
+ element.getTags().add(STACK_VISIBLE);
+ } else if (STACK_HIDDEN.equals(state)) {
+ element.getTags().remove(STACK_HIDDEN);
+ element.getTags().remove(STACK_VISIBLE);
+ element.getTags().add(STACK_HIDDEN);
+ } else if (TRIM_STACK_EXIST.equals(state)) {
+ element.getTags().remove(TRIM_STACK_EXIST);
+ element.getTags().add(TRIM_STACK_EXIST);
+ }
+ }
+
+ @Inject
+ @Optional
+ private void subscribeAppStartUpCompleted(
+ @UIEventTopic(UIEvents.UILifeCycle.APP_STARTUP_COMPLETE) Event event,
+ @Optional MApplication application) {
+ fixToolItemOfRightTrimBarStatus(application);
+ }
+
+ private void fixToolItemOfRightTrimBarStatus(MApplication application) {
+ if (application == null)
+ return;
+
+ MTrimmedWindow tw = null;
+ List windows = application.getChildren();
+ for (MWindow win : windows) {
+ if (win instanceof MTrimmedWindow) {
+ tw = (MTrimmedWindow) win;
+ break;
+ }
+ }
+ if (tw == null)
+ return;
+
+ MUIElement rightPartStack = modelService
+ .find(ICathyConstants.ID_PARTSTACK_RIGHT, tw);
+ MStackElement selectedPartStackElement = null;
+ if (rightPartStack instanceof MPartStack) {
+ selectedPartStackElement = ((MPartStack) rightPartStack)
+ .getSelectedElement();
+ }
+
+ MTrimBar rightTrimBar = modelService.getTrim((MTrimmedWindow) tw,
+ SideValue.RIGHT);
+ if (rightTrimBar != null) {
+ List children = ((MTrimBar) rightTrimBar)
+ .getChildren();
+ for (MTrimElement trimElement : children) {
+ if (trimElement instanceof MToolBar) {
+ List toolBarElements = ((MToolBar) trimElement)
+ .getChildren();
+ for (MToolBarElement te : toolBarElements) {
+ if (te instanceof MHandledToolItem) {
+ MHandledToolItem handledToolItem = (MHandledToolItem) te;
+
+ Object widget = te.getWidget();
+ if (widget instanceof ToolItem) {
+ ((ToolItem) widget).removeSelectionListener(
+ toolItemSelectionListener);
+ ((ToolItem) widget).addSelectionListener(
+ toolItemSelectionListener);
+ }
+
+ ParameterizedCommand pc = handledToolItem
+ .getWbCommand();
+ if (pc != null) {
+ Map parameterMap = pc.getParameterMap();
+ String partId = (String) parameterMap.get(
+ IModelConstants.KEY_MODEL_PART_COMMAND_PARAMETER_PART_ID);
+ boolean selected = selectedPartStackElement != null
+ && selectedPartStackElement
+ .getElementId().equals(partId);
+ handledToolItem.setSelected(selected);
+ Map persistedState = handledToolItem
+ .getPersistedState();
+ String iconURI = persistedState.get(selected
+ ? IModelConstants.PERSISTED_STATE_KEY_SELECTED_ICONURI
+ : IModelConstants.PERSISTED_STATE_KEY_UNSELECTED_ICONURI);
+ if (iconURI != null)
+ handledToolItem.setIconURI(iconURI);
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+
+ @Inject
+ @Optional
+ private void subscribeTopicWidget(
+ @UIEventTopic(UIEvents.UIElement.TOPIC_WIDGET) Event event) {
+ final MUIElement changedElement = (MUIElement) event
+ .getProperty(EventTags.ELEMENT);
+ if (!(changedElement instanceof MPartStack)
+ && !(changedElement instanceof MArea))
+ return;
+
+ Control control = (Control) changedElement.getWidget();
+ if (control == null || control.isDisposed())
+ return;
+
+ control.removeMouseListener(doubleClickListener);// Prevent multiple instances
+ control.addMouseListener(doubleClickListener);
+
+ if (control instanceof CTabFolder) {
+ ((CTabFolder) control).removeCTabFolder2Listener(CTFButtonListener); // Prevent multiple instances
+ ((CTabFolder) control).addCTabFolder2Listener(CTFButtonListener);
+ }
+ }
+
+ /**
+ * Handles removals from the perspective
+ *
+ * @param event
+ */
+
+ @Inject
+ @Optional
+ private void subscribeTopicChildren(
+ @UIEventTopic(UIEvents.ElementContainer.TOPIC_CHILDREN) Event event) {
+ final MUIElement changedElement = (MUIElement) event
+ .getProperty(EventTags.ELEMENT);
+ MWindow window = modelService.getTopLevelWindowFor(changedElement);
+
+ // this method is intended to update the minimized stacks in a trim
+ // if the removed element is no perspective and the top level window
+ // is not a trimmed window, we don't need to do anything here
+ if (!(changedElement instanceof MPerspectiveStack) || window == null
+ || !(window instanceof MTrimmedWindow)) {
+ return;
+ }
+
+ if (UIEvents.isREMOVE(event)) {
+ for (Object removedElement : UIEvents.asIterable(event,
+ UIEvents.EventTags.OLD_VALUE)) {
+ MUIElement removed = (MUIElement) removedElement;
+ String perspectiveId = removed.getElementId();
+
+ MTrimBar bar = modelService.getTrim((MTrimmedWindow) window,
+ SideValue.TOP);
+
+ // gather up any minimized stacks for this perspective...
+ List toRemove = new ArrayList();
+ for (MUIElement child : bar.getChildren()) {
+ String trimElementId = child.getElementId();
+ if (child instanceof MToolControl
+ && trimElementId.contains(perspectiveId)) {
+ toRemove.add((MToolControl) child);
+ }
+ }
+
+ // ...and remove them
+ for (MToolControl minStack : toRemove) {
+ minStack.setToBeRendered(false);
+ bar.getChildren().remove(minStack);
+ }
+ }
+ }
+ }
+
+ /**
+ * Handles changes of the perspective
+ *
+ * @param event
+ */
+
+ @Inject
+ @Optional
+ private void subscribeTopicSelectedElement(
+ @UIEventTopic(UIEvents.ElementContainer.TOPIC_SELECTEDELEMENT) Event event,
+ @Optional MApplication application) {
+ final MUIElement changedElement = (MUIElement) event
+ .getProperty(EventTags.ELEMENT);
+
+ if (changedElement instanceof MPartStack
+ && ICathyConstants.ID_PARTSTACK_RIGHT
+ .equals(changedElement.getElementId())) {
+ fixToolItemOfRightTrimBarStatus(application);
+ return;
+ }
+
+ if (!(changedElement instanceof MPerspectiveStack))
+ return;
+
+ MPerspectiveStack ps = (MPerspectiveStack) changedElement;
+ MWindow window = modelService.getTopLevelWindowFor(ps);
+
+ List tcList = modelService.findElements(window, null,
+ MToolControl.class, null);
+
+ final MPerspective curPersp = ps.getSelectedElement();
+ if (curPersp != null) {
+ List tags = new ArrayList();
+ tags.add(TRIM_STACK_EXIST);
+ List minimizedElements = modelService
+ .findElements(curPersp, null, MUIElement.class, tags);
+ // Show any minimized stack from the current perspective
+ String perspId = '(' + curPersp.getElementId() + ')';
+ for (MUIElement ele : minimizedElements) {
+ String fullId = ele.getElementId() + perspId;
+
+ for (MToolControl tc : tcList) {
+ if (fullId.equals(tc.getElementId())) {
+ tc.setToBeRendered(true);
+ }
+ }
+ }
+ }
+
+ // Hide any minimized stacks from the old perspective
+ if (event.getProperty(EventTags.OLD_VALUE) instanceof MPerspective) {
+ MPerspective oldPersp = (MPerspective) event
+ .getProperty(EventTags.OLD_VALUE);
+ String perspId = '(' + oldPersp.getElementId() + ')';
+ for (MToolControl tc : tcList) {
+ if (tc.getObject() instanceof XTrimStack
+ && tc.getElementId().contains(perspId)) {
+ XTrimStack ts = (XTrimStack) tc.getObject();
+ ts.setStateForShowStack(false);
+ tc.setToBeRendered(false);
+ }
+ }
+ }
+
+ final Shell winShell = (Shell) window.getWidget();
+ winShell.getDisplay().asyncExec(new Runnable() {
+ public void run() {
+ if (!winShell.isDisposed()) {
+ winShell.layout(true, true);
+ }
+ }
+ });
+ }
+
+ /**
+ * Handles changes in tags
+ *
+ * @param event
+ */
+
+ @Inject
+ @Optional
+ private void subscribeTopicTagsChanged(
+ @UIEventTopic(UIEvents.ApplicationElement.TOPIC_TAGS) Event event) {
+ Object changedObj = event.getProperty(EventTags.ELEMENT);
+
+ if (!(changedObj instanceof MUIElement))
+ return;
+
+ final MUIElement changedElement = (MUIElement) changedObj;
+
+ if (UIEvents.isADD(event)) {
+ if (UIEvents.contains(event, UIEvents.EventTags.NEW_VALUE,
+ STACK_HIDDEN)) {
+ hideStack(changedElement);
+ } else if (UIEvents.contains(event, UIEvents.EventTags.NEW_VALUE,
+ STACK_VISIBLE)) {
+ showStack(changedElement);
+ } else if (UIEvents.contains(event, UIEvents.EventTags.NEW_VALUE,
+ TRIM_STACK_EXIST)) {
+ createTrim(changedElement);
+ changedElement.setVisible(false);
+ }
+ }
+ }
+
+ /**
+ * Handles changes in the id of the element If a perspective ID changes fix
+ * any TrimStacks that reference the old id to point at the new id. This
+ * keeps trim stacks attached to the correct perspective when a perspective
+ * is saved with a new name.
+ *
+ * @param event
+ */
+
+ @Inject
+ @Optional
+ private void subscribeTopicElementId(
+ @UIEventTopic(UIEvents.ApplicationElement.TOPIC_ELEMENTID) Event event) {
+ Object changedObject = event.getProperty(EventTags.ELEMENT);
+
+ // Only care about MPerspective id changes
+ if (!(changedObject instanceof MPerspective))
+ return;
+
+ MPerspective perspective = (MPerspective) changedObject;
+
+ String newID = (String) event.getProperty(UIEvents.EventTags.NEW_VALUE);
+ String oldID = (String) event.getProperty(UIEvents.EventTags.OLD_VALUE);
+
+ // pattern is trimStackID(perspectiveID)
+ newID = '(' + newID + ')';
+ oldID = '(' + oldID + ')';
+
+ // Search the trim for the window containing the perspective
+ MWindow perspWin = modelService.getTopLevelWindowFor(perspective);
+ if (perspWin == null)
+ return;
+
+ List trimStacks = modelService.findElements(perspWin,
+ null, MToolControl.class, null);
+ for (MToolControl trimStack : trimStacks) {
+ // Only care about MToolControls that are TrimStacks
+ if (XTrimStack.CONTRIBUTION_URI_XTRIMSTACK
+ .equals(trimStack.getContributionURI()))
+ trimStack.setElementId(
+ trimStack.getElementId().replace(oldID, newID));
+ }
+ }
+
+ /**
+ * Handles the event that the perspective is saved
+ *
+ * @param event
+ */
+
+ @Inject
+ @Optional
+ private void subscribeTopicPerspSaved(
+ @UIEventTopic(UIEvents.UILifeCycle.PERSPECTIVE_SAVED) Event event) {
+ final MPerspective savedPersp = (MPerspective) event
+ .getProperty(EventTags.ELEMENT);
+ String cache = getTrimCache(savedPersp);
+ minMaxAddon.getPersistedState().put(savedPersp.getElementId(), cache);
+ }
+
+ private String getTrimCache(MPerspective savedPersp) {
+ MWindow topWin = modelService.getTopLevelWindowFor(savedPersp);
+ String perspIdStr = '(' + savedPersp.getElementId() + ')';
+
+ String cache = getWinCache(topWin, perspIdStr);
+ for (MWindow dw : savedPersp.getWindows()) {
+ cache += getWinCache(dw, perspIdStr);
+ }
+
+ return cache;
+ }
+
+ private String getWinCache(MWindow win, String perspIdStr) {
+ String winStr = ""; //$NON-NLS-1$
+
+ List stackList = modelService.findElements(win, null,
+ MPartStack.class, null);
+ for (MPartStack stack : stackList) {
+ winStr += getStackTrimLoc(stack, perspIdStr);
+ }
+ return winStr;
+ }
+
+ private String getStackTrimLoc(MPartStack stack, String perspIdStr) {
+ MWindow stackWin = modelService.getTopLevelWindowFor(stack);// getContainingWindow(stack);
+ MUIElement tcElement = modelService
+ .find(stack.getElementId() + perspIdStr, stackWin);
+ if (tcElement == null)
+ return ""; //$NON-NLS-1$
+
+ MTrimBar bar = (MTrimBar) ((MUIElement) tcElement.getParent());
+ int sideVal = bar.getSide().getValue();
+ int index = bar.getChildren().indexOf(tcElement);
+ return stack.getElementId() + ' ' + sideVal + ' ' + index + "#"; //$NON-NLS-1$
+ }
+
+ /**
+ * Handles the event that the perspective is reset
+ *
+ * @param event
+ */
+ @Inject
+ @Optional
+ private void subscribeTopicPerspReset(
+ @UIEventTopic(UIEvents.UILifeCycle.PERSPECTIVE_RESET) Event event,
+ @Optional MApplication application) {
+ final MPerspective resetPersp = (MPerspective) event
+ .getProperty(EventTags.ELEMENT);
+
+ //Any stack which has TrimStackExist tag should have a created trim
+ List minimizedElements = modelService.findElements(
+ resetPersp, null, MUIElement.class,
+ Arrays.asList(TRIM_STACK_EXIST));
+ for (MUIElement element : minimizedElements) {
+ createTrim(element);
+ }
+
+ fixToolItemOfRightTrimBarStatus(application);
+
+ }
+
+ /**
+ * Handles the event that the perspective is opened
+ *
+ * @param event
+ */
+ @Inject
+ @Optional
+ private void subscribeTopicPerspOpened(
+ @UIEventTopic(UIEvents.UILifeCycle.PERSPECTIVE_OPENED) Event event) {
+ final MPerspective openedPersp = (MPerspective) event
+ .getProperty(EventTags.ELEMENT);
+
+ //Any stack which has TrimStackExist tag should have a created trim
+ List allStacks = modelService.findElements(openedPersp,
+ null, MGenericStack.class, Arrays.asList(TRIM_STACK_EXIST));
+ for (MGenericStack stack : allStacks) {
+ createTrim(stack);
+ }
+ }
+
+ boolean isEmptyPerspectiveStack(MUIElement element) {
+ if (!(element instanceof MPerspectiveStack))
+ return false;
+ MPerspectiveStack ps = (MPerspectiveStack) element;
+ return ps.getChildren().size() == 0;
+ }
+
+ void hideStack(MUIElement element) {
+ // Can't create trim for a non-rendered element
+ if (!element.isToBeRendered())
+ return;
+
+ if (isEmptyPerspectiveStack(element)) {
+ element.setVisible(false);
+ return;
+ }
+
+ createTrim(element);
+ element.setVisible(false);
+ }
+
+ void showStack(final MUIElement element) {
+ if (!element.isToBeRendered())
+ return;
+
+ List elementsToHide = getElementsToHide(element);
+ for (MUIElement toMinimize : elementsToHide) {
+ setState(toMinimize, STACK_HIDDEN);
+ }
+ element.setVisible(true);
+ }
+
+ private List getElementsToHide(MUIElement element) {
+ MWindow win = getWindowFor(element);
+ MPerspective persp = modelService.getActivePerspective(win);
+
+ List elementsToHide = new ArrayList();
+ int loc = modelService.getElementLocation(element);
+ if ((loc & EModelService.OUTSIDE_PERSPECTIVE) != 0) {
+ // Hide all other global stacks
+ List globalStacks = modelService.findElements(win, null,
+ MPartStack.class, null, EModelService.OUTSIDE_PERSPECTIVE);
+ for (MPartStack gStack : globalStacks) {
+ if (gStack == element || !gStack.isToBeRendered())
+ continue;
+
+ if (gStack.getWidget() != null
+ && !gStack.getTags().contains(STACK_HIDDEN)) {
+ elementsToHide.add(gStack);
+ }
+ }
+
+ // Hide the Perspective Stack
+ MUIElement perspStack = null;
+ if (persp == null) {
+ // special case for windows with no perspectives (eg bug 372614:
+ // intro part with no perspectives). We know we're outside
+ // of the perspective stack, so find it top-down
+ List pStacks = modelService.findElements(win,
+ null, MPerspectiveStack.class, null);
+ perspStack = (pStacks.size() > 0) ? pStacks.get(0) : null;
+ } else {
+ perspStack = persp.getParent();
+ }
+ if (perspStack != null) {
+ if (perspStack.getElementId() == null
+ || perspStack.getElementId().length() == 0)
+ perspStack.setElementId("PerspectiveStack"); //$NON-NLS-1$
+
+ elementsToHide.add(perspStack);
+ }
+ } else {
+ List stacks = modelService.findElements(
+ persp == null ? win : persp, null, MPartStack.class, null,
+ EModelService.PRESENTATION);
+ for (MPartStack theStack : stacks) {
+ if (theStack == element || !theStack.isToBeRendered())
+ continue;
+
+ // Exclude stacks in DW's
+ if (getWindowFor(theStack) != win)
+ continue;
+
+ loc = modelService.getElementLocation(theStack);
+ if (loc != EModelService.IN_SHARED_AREA
+ && theStack.getWidget() != null && theStack.isVisible()
+ && !theStack.getTags().contains(STACK_HIDDEN)) {
+ elementsToHide.add(theStack);
+ }
+ }
+
+ // Find any 'standalone' views *not* in a stack
+ List standaloneTag = new ArrayList();
+ standaloneTag.add(IPresentationEngine.STANDALONE);
+ List standaloneViews = modelService.findElements(
+ persp == null ? win : persp, null, MPlaceholder.class,
+ standaloneTag, EModelService.PRESENTATION);
+ for (MPlaceholder part : standaloneViews) {
+ if (!part.isToBeRendered())
+ continue;
+ elementsToHide.add(part);
+ }
+ }
+
+ return elementsToHide;
+ }
+
+ /**
+ * Return the MWindow containing this element (if any). This may either be a
+ * 'top level' window -or- a detached window. This allows the min.max code
+ * to only affect elements in the window containing the element.
+ *
+ * @param element
+ * The element to check
+ * @return the window containing the element.
+ */
+ private MWindow getWindowFor(MUIElement element) {
+ MUIElement parent = element.getParent();
+
+ // We rely here on the fact that a DW's 'getParent' will return
+ // null since it's not in the 'children' hierarchy
+ while (parent != null && !(parent instanceof MWindow))
+ parent = parent.getParent();
+
+ // A detached window will end up with getParent() == null
+ return (MWindow) parent;
+ }
+
+ private void createTrim(MUIElement element) {
+ MWindow win = getWindowFor(element);
+ if (!(win instanceof MTrimmedWindow)) {
+ return;
+ }
+
+ MTrimmedWindow window = (MTrimmedWindow) win;
+ Shell winShell = (Shell) window.getWidget();
+
+ // Is there already a TrimControl there ?
+ String trimId = element.getElementId()
+ + getMinimizedElementSuffix(element);
+ MToolControl trimStack = (MToolControl) modelService.find(trimId,
+ window);
+
+ if (trimStack == null) {
+ trimStack = modelService.createModelElement(MToolControl.class);
+ trimStack.setElementId(trimId);
+ trimStack
+ .setContributionURI(XTrimStack.CONTRIBUTION_URI_XTRIMSTACK);
+ trimStack.getTags().add("XTrimStack"); //$NON-NLS-1$
+ trimStack.getTags().add(ICathyConstants.TAG_TRIMBAR_LAYOUT_CENTER);
+
+ MTrimBar bar = modelService.getTrim(window, SideValue.RIGHT);
+ bar.getChildren().add(trimStack);
+ bar.setVisible(true);
+
+ // get the parent trim bar, see bug 320756
+ if (bar.getWidget() == null) {
+ // ask it to be rendered
+ bar.setToBeRendered(true);
+
+ // create the widget
+ context.get(IPresentationEngine.class).createGui(bar, winShell,
+ window.getContext());
+ }
+ } else {
+ // get the parent trim bar, see bug 320756
+ MUIElement parent = trimStack.getParent();
+ parent.setVisible(true);
+ if (parent.getWidget() == null) {
+ // ask it to be rendered
+ parent.setToBeRendered(true);
+ // create the widget
+ context.get(IPresentationEngine.class).createGui(parent,
+ winShell, window.getContext());
+ }
+ }
+ trimStack.setToBeRendered(true);
+ }
+
+ private String getMinimizedElementSuffix(MUIElement element) {
+ String id = ID_SUFFIX;
+ MPerspective persp = modelService.getPerspectiveFor(element);
+ if (persp != null) {
+ id = '(' + persp.getElementId() + ')';
+ }
+ return id;
+ }
+
+}
diff --git a/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/ui/workbench/addons/minmax/XTrimStack.java b/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/ui/workbench/addons/minmax/XTrimStack.java
new file mode 100644
index 000000000..6e2e4b1d4
--- /dev/null
+++ b/bundles/org.xmind.cathy/src/org/xmind/cathy/internal/ui/workbench/addons/minmax/XTrimStack.java
@@ -0,0 +1,608 @@
+package org.xmind.cathy.internal.ui.workbench.addons.minmax;
+
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
+import javax.inject.Inject;
+
+import org.eclipse.e4.core.di.annotations.Optional;
+import org.eclipse.e4.core.services.events.IEventBroker;
+import org.eclipse.e4.ui.di.UIEventTopic;
+import org.eclipse.e4.ui.internal.workbench.swt.CSSRenderingUtils;
+import org.eclipse.e4.ui.model.application.ui.MElementContainer;
+import org.eclipse.e4.ui.model.application.ui.MGenericStack;
+import org.eclipse.e4.ui.model.application.ui.MUIElement;
+import org.eclipse.e4.ui.model.application.ui.MUILabel;
+import org.eclipse.e4.ui.model.application.ui.SideValue;
+import org.eclipse.e4.ui.model.application.ui.advanced.MPerspective;
+import org.eclipse.e4.ui.model.application.ui.advanced.MPerspectiveStack;
+import org.eclipse.e4.ui.model.application.ui.advanced.MPlaceholder;
+import org.eclipse.e4.ui.model.application.ui.basic.MPart;
+import org.eclipse.e4.ui.model.application.ui.basic.MPartStack;
+import org.eclipse.e4.ui.model.application.ui.basic.MTrimBar;
+import org.eclipse.e4.ui.model.application.ui.basic.MWindow;
+import org.eclipse.e4.ui.model.application.ui.menu.MToolControl;
+import org.eclipse.e4.ui.workbench.IPresentationEngine;
+import org.eclipse.e4.ui.workbench.UIEvents;
+import org.eclipse.e4.ui.workbench.UIEvents.EventTags;
+import org.eclipse.e4.ui.workbench.modeling.EModelService;
+import org.eclipse.e4.ui.workbench.modeling.EPartService;
+import org.eclipse.e4.ui.workbench.renderers.swt.TrimmedPartLayout;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.DisposeEvent;
+import org.eclipse.swt.events.DisposeListener;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Event;
+import org.eclipse.swt.widgets.Listener;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.swt.widgets.ToolBar;
+import org.eclipse.swt.widgets.ToolItem;
+
+/**
+ * Class for representing window trim containing minimized views and shared
+ * areas
+ */
+public class XTrimStack {
+
+ /**
+ * Contribution URI for this class
+ */
+ public static String CONTRIBUTION_URI_XTRIMSTACK = "bundleclass://org.xmind.cathy/org.xmind.cathy.internal.ui.workbench.addons.minmax.XTrimStack"; //$NON-NLS-1$
+
+ private ToolBar trimStackTB;
+
+ private MUIElement mGenericStack;
+
+ /**
+ * A map of created images from a part's icon URI path.
+ */
+ private Map imageMap = new HashMap();
+
+ // Listens to ESC and closes the active fast view
+ private Listener escapeListener = new Listener() {
+ public void handleEvent(Event event) {
+ if (event.character == SWT.ESC) {
+ setStateForShowStack(false);
+ partService.requestActivation();
+ }
+ }
+ };
+
+ @Inject
+ EModelService modelService;
+
+ @Inject
+ EPartService partService;
+
+ @Inject
+ MWindow window;
+
+ @Inject
+ MToolControl toolControl;
+
+ @Inject
+ protected IEventBroker eventBroker;
+
+ @SuppressWarnings("unchecked")
+ @Inject
+ @Optional
+ private void handleTransientDataEvents(
+ @UIEventTopic(UIEvents.ApplicationElement.TOPIC_TRANSIENTDATA) org.osgi.service.event.Event event) {
+ // Prevent exceptions on shutdown
+ if (trimStackTB == null || trimStackTB.isDisposed())
+ return;
+
+ Object changedElement = event.getProperty(UIEvents.EventTags.ELEMENT);
+ if (!(changedElement instanceof MUIElement)) {
+ return;
+ }
+
+ String key;
+ if (UIEvents.isREMOVE(event)) {
+ key = ((Entry) event
+ .getProperty(UIEvents.EventTags.OLD_VALUE)).getKey();
+ } else {
+ key = ((Entry) event
+ .getProperty(UIEvents.EventTags.NEW_VALUE)).getKey();
+ }
+
+ if (key.equals(IPresentationEngine.OVERRIDE_ICON_IMAGE_KEY)) {
+ ToolItem toolItem = getChangedToolItem((MUIElement) changedElement);
+ if (toolItem != null)
+ toolItem.setImage(getImage((MUILabel) toolItem.getData()));
+ } else if (key
+ .equals(IPresentationEngine.OVERRIDE_TITLE_TOOL_TIP_KEY)) {
+ ToolItem toolItem = getChangedToolItem((MUIElement) changedElement);
+ if (toolItem != null)
+ toolItem.setToolTipText(
+ getLabelText((MUILabel) toolItem.getData()));
+ }
+ }
+
+ private ToolItem getChangedToolItem(MUIElement changedElement) {
+ ToolItem[] toolItems = trimStackTB.getItems();
+ for (ToolItem toolItem : toolItems) {
+ if (changedElement.equals(toolItem.getData())) {
+ return toolItem;
+ }
+ }
+ return null;
+ }
+
+ // Listener attached to every ToolItem in a TrimStack. Responsible for activating the
+ // appropriate part.
+ private SelectionListener toolItemSelectionListener = new SelectionListener() {
+ public void widgetSelected(SelectionEvent e) {
+ ToolItem toolItem = (ToolItem) e.widget;
+ MUIElement uiElement = (MUIElement) toolItem.getData();
+
+ // Clicking on the already showing item ? NOTE: the selection will already have been
+ // turned off by the time the event arrives
+ if (!toolItem.getSelection()) {
+ partService.requestActivation();
+ setStateForShowStack(false);
+ return;
+ }
+
+ if (uiElement instanceof MPart) {
+ partService.activate((MPart) uiElement);
+ } else if (uiElement instanceof MPerspective) {
+ uiElement.getParent().setSelectedElement(uiElement);
+ }
+ setStateForShowStack(true);
+ }
+
+ public void widgetDefaultSelected(SelectionEvent e) {
+ widgetSelected(e);
+ }
+ };
+
+ /**
+ * Add or remove someone of MGenericStack's children
+ *
+ * @param event
+ */
+ @Inject
+ @Optional
+ private void handleChildrenEvents(
+ @UIEventTopic(UIEvents.ElementContainer.TOPIC_CHILDREN) org.osgi.service.event.Event event) {
+
+ if (mGenericStack == null || trimStackTB == null)
+ return;
+
+ Object changedObj = event.getProperty(UIEvents.EventTags.ELEMENT);
+
+ if (changedObj == mGenericStack) {
+ trimStackTB.getDisplay().asyncExec(new Runnable() {
+ public void run() {
+ updateTrimStackItems();
+ }
+ });
+ }
+ }
+
+ /**
+ * Someone of MGenericStack's children changes state
+ *
+ * @param event
+ */
+ @Inject
+ @Optional
+ private void handleToBeRenderedEvents(
+ @UIEventTopic(UIEvents.UIElement.TOPIC_TOBERENDERED) org.osgi.service.event.Event event) {
+
+ if (mGenericStack == null || trimStackTB == null)
+ return;
+
+ MUIElement changedElement = (MUIElement) event
+ .getProperty(UIEvents.EventTags.ELEMENT);
+
+ MUIElement parentElement = changedElement.getParent();
+ if (parentElement == mGenericStack) {
+ trimStackTB.getDisplay().asyncExec(new Runnable() {
+ public void run() {
+ updateTrimStackItems();
+ }
+ });
+ }
+ }
+
+ /**
+ * Handle changes in tags of stack
+ *
+ * @param event
+ */
+ @Inject
+ @Optional
+ private void subscribeTopicTagsChanged(
+ @UIEventTopic(UIEvents.ApplicationElement.TOPIC_TAGS) org.osgi.service.event.Event event) {
+ Object changedObj = event.getProperty(EventTags.ELEMENT);
+ if (changedObj != mGenericStack)
+ return;
+
+ if (UIEvents.isADD(event)) {
+ if (UIEvents.contains(event, UIEvents.EventTags.NEW_VALUE,
+ MinMaxAddon.STACK_HIDDEN)) {
+ fixToolItemSelection();
+ } else if (UIEvents.contains(event, UIEvents.EventTags.NEW_VALUE,
+ MinMaxAddon.STACK_VISIBLE)) {
+ fixToolItemSelection();
+ }
+ }
+ }
+
+ @Inject
+ @Optional
+ private void handleWidgeEvents(
+ @UIEventTopic(UIEvents.UIElement.TOPIC_WIDGET) org.osgi.service.event.Event event) {
+ Object changedObj = event.getProperty(UIEvents.EventTags.ELEMENT);
+ if (changedObj != mGenericStack)
+ return;
+
+ if (mGenericStack.getWidget() != null) {
+ trimStackTB.getDisplay().asyncExec(new Runnable() {
+ public void run() {
+ updateTrimStackItems();
+ }
+ });
+ }
+ }
+
+ /**
+ * Someone of MGenericStack's children was selected
+ *
+ * @param event
+ */
+ @Inject
+ @Optional
+ private void handleBringToTopEvents(
+ @UIEventTopic(UIEvents.UILifeCycle.BRINGTOTOP) org.osgi.service.event.Event event) {
+ MUIElement changedElement = (MUIElement) event
+ .getProperty(UIEvents.EventTags.ELEMENT);
+
+ // Open if shared area
+ if (getLeafPart(mGenericStack) == changedElement
+ && !(mGenericStack instanceof MPerspectiveStack)) {
+ setStateForShowStack(true);
+ return;
+ }
+
+ MUIElement selectedElement = null;
+
+ if (mGenericStack instanceof MPlaceholder) {
+ selectedElement = ((MPlaceholder) mGenericStack).getRef();
+ } else if (mGenericStack instanceof MPartStack) {
+ selectedElement = ((MPartStack) mGenericStack).getSelectedElement();
+ }
+
+ if (selectedElement == null)
+ return;
+
+ if (selectedElement instanceof MPlaceholder)
+ selectedElement = ((MPlaceholder) selectedElement).getRef();
+
+ if (changedElement != selectedElement)
+ return;
+
+ setStateForShowStack(true);
+ }
+
+ @Inject
+ @Optional
+ private void handleAppShutDownAndStartedEvents(
+ @UIEventTopic(UIEvents.UILifeCycle.APP_SHUTDOWN_STARTED) org.osgi.service.event.Event event) {
+ setStateForShowStack(false);
+ }
+
+ @PostConstruct
+ void createWidget(Composite parent, MToolControl me,
+ CSSRenderingUtils cssUtils) {
+ if (mGenericStack == null) {
+ mGenericStack = findElement();
+ }
+
+ MUIElement meParent = me.getParent();
+ int orientation = SWT.HORIZONTAL;
+ if (meParent instanceof MTrimBar) {
+ MTrimBar bar = (MTrimBar) meParent;
+ if (bar.getSide() == SideValue.RIGHT
+ || bar.getSide() == SideValue.LEFT)
+ orientation = SWT.VERTICAL;
+ }
+ trimStackTB = new ToolBar(parent, orientation | SWT.FLAT | SWT.WRAP);
+ trimStackTB.addDisposeListener(new DisposeListener() {
+ public void widgetDisposed(DisposeEvent e) {
+ setStateForShowStack(false);
+
+ trimStackTB = null;
+ }
+ });
+
+ updateTrimStackItems();
+ }
+
+ @PreDestroy
+ void destroy() {
+ for (Image image : imageMap.values()) {
+ image.dispose();
+ }
+ }
+
+ public MUIElement getMinimizedElement() {
+ return mGenericStack;
+ }
+
+ //Find stack
+ private MUIElement findElement() {
+ MUIElement result;
+ List ps = modelService.findElements(window, null,
+ MPerspectiveStack.class, null);
+ if (ps.size() == 0) {
+ String toolControlId = toolControl.getElementId();
+ int index = toolControlId.indexOf('(');
+ String stackId = toolControlId.substring(0, index);
+ result = modelService.find(stackId, window);
+ } else {
+ String toolControlId = toolControl.getElementId();
+ int index = toolControlId.indexOf('(');
+ String stackId = toolControlId.substring(0, index);
+ String perspId = toolControlId.substring(index + 1,
+ toolControlId.length() - 1);
+
+ MPerspective persp = null;
+ List perspectives = modelService
+ .findElements(ps.get(0), perspId, MPerspective.class, null);
+ if (perspectives != null && !perspectives.isEmpty()) {
+ persp = perspectives.get(0);
+ }
+
+ if (persp != null) {
+ result = modelService.find(stackId, persp);
+ } else {
+ result = modelService.find(stackId, window);
+ }
+ }
+
+ return result;
+ }
+
+ private String getLabelText(MUILabel label) {
+ // Use override text if available
+ if (label instanceof MUIElement) {
+ String text = getOverrideTitleToolTip((MUIElement) label);
+ if (text != null && text.length() > 0)
+ return text;
+ }
+
+ String string = label.getLocalizedLabel();
+ return string == null ? "" : string; //$NON-NLS-1$
+ }
+
+ private Image getImage(MUILabel element) {
+ // Use override image if available
+ if (element instanceof MUIElement) {
+ Image image = getOverrideImage((MUIElement) element);
+ if (image != null)
+ return image;
+ }
+
+ String iconURI = element.getIconURI();
+ if (iconURI != null && iconURI.length() > 0) {
+ Image image = imageMap.get(iconURI);
+ if (image == null) {
+ image = imageDescriptorFromURI(iconURI).createImage();
+ imageMap.put(iconURI, image);
+ }
+ return image;
+ }
+
+ return null;
+ }
+
+ public ImageDescriptor imageDescriptorFromURI(String iconPath) {
+ try {
+ URI uri = new URI(iconPath);
+ return ImageDescriptor.createFromURL(new URL(uri.toString()));
+ } catch (MalformedURLException e) {
+ } catch (URISyntaxException e) {
+ }
+ return null;
+ }
+
+ private MUILabel getLabelElement(MUIElement element) {
+ if (element instanceof MPlaceholder)
+ element = ((MPlaceholder) element).getRef();
+
+ return (MUILabel) (element instanceof MUILabel ? element : null);
+ }
+
+ private void updateTrimStackItems() {
+ // Prevent exceptions on shutdown
+ if (trimStackTB == null || trimStackTB.isDisposed())
+ return;
+
+ while (trimStackTB.getItemCount() > 0) {
+ trimStackTB.getItem(trimStackTB.getItemCount() - 1).dispose();
+ }
+
+ if (mGenericStack instanceof MPlaceholder) {
+ MPlaceholder ph = (MPlaceholder) mGenericStack;
+ if (ph.getRef() instanceof MPart) {
+ MPart part = (MPart) ph.getRef();
+ ToolItem ti = new ToolItem(trimStackTB, SWT.CHECK);
+ ti.setData(part);
+ ti.setImage(getImage(part));
+ ti.setToolTipText(getLabelText(part));
+ ti.addSelectionListener(toolItemSelectionListener);
+ }
+ } else if (mGenericStack instanceof MGenericStack) {
+ // Handle *both* PartStacks and PerspectiveStacks here...
+ MGenericStack theStack = (MGenericStack) mGenericStack;
+
+ for (MUIElement stackElement : theStack.getChildren()) {
+ boolean trimStackExists = stackElement.getTags()
+ .contains(MinMaxAddon.TRIM_STACK_EXIST);
+ if (stackElement instanceof MPlaceholder) {
+ MUIElement part = ((MPlaceholder) stackElement).getRef();
+ trimStackExists = part.getTags()
+ .contains(MinMaxAddon.TRIM_STACK_EXIST);
+ }
+ if (/* stackElement.isToBeRendered() || FIXME */ trimStackExists) {
+ MUILabel labelElement = getLabelElement(stackElement);
+ ToolItem newItem = new ToolItem(trimStackTB, SWT.CHECK);
+ newItem.setData(labelElement);
+ newItem.setImage(getImage(labelElement));
+ newItem.setToolTipText(getLabelText(labelElement));
+ newItem.addSelectionListener(toolItemSelectionListener);
+ }
+ }
+ }
+
+ trimStackTB.pack();
+ trimStackTB.getShell().layout(new Control[] { trimStackTB }, SWT.DEFER);
+ fixToolItemSelection();
+ }
+
+ /**
+ * Sets whether this stack should be visible or hidden
+ *
+ * @param show
+ * whether the stack should be visible
+ */
+ public void setStateForShowStack(boolean show) {
+ Control ctrl = (Control) mGenericStack.getWidget();
+
+ Composite clientAreaComposite = getCAComposite();
+ if (clientAreaComposite == null || clientAreaComposite.isDisposed())
+ return;
+
+ if (show) {
+ mGenericStack.getTags().remove(MinMaxAddon.STACK_HIDDEN);
+ mGenericStack.getTags().remove(MinMaxAddon.STACK_VISIBLE);
+ mGenericStack.getTags().add(MinMaxAddon.STACK_VISIBLE);
+
+ ctrl.removeListener(SWT.Traverse, escapeListener);
+ ctrl.addListener(SWT.Traverse, escapeListener);
+ } else {
+ if (ctrl != null && !ctrl.isDisposed())
+ ctrl.removeListener(SWT.Traverse, escapeListener);
+ mGenericStack.getTags().remove(MinMaxAddon.STACK_HIDDEN);
+ mGenericStack.getTags().remove(MinMaxAddon.STACK_VISIBLE);
+ mGenericStack.getTags().add(MinMaxAddon.STACK_HIDDEN);
+ }
+ }
+
+ private void fixToolItemSelection() {
+ if (trimStackTB == null || trimStackTB.isDisposed())
+ return;
+
+ boolean toHide = mGenericStack.getTags()
+ .contains(MinMaxAddon.STACK_HIDDEN);
+ boolean toShow = mGenericStack.getTags()
+ .contains(MinMaxAddon.STACK_VISIBLE);
+ if (toHide) {
+ // Not open...no selection
+ for (ToolItem item : trimStackTB.getItems()) {
+ item.setSelection(false);
+ }
+ } else if (toShow) {
+ if (mGenericStack instanceof MPlaceholder) {
+ trimStackTB.getItem(1).setSelection(true);
+ } else if (isPerspectiveStack()) {
+ MPerspectiveStack pStack = (MPerspectiveStack) mGenericStack;
+ MUIElement selElement = pStack.getSelectedElement();
+ for (ToolItem item : trimStackTB.getItems()) {
+ item.setSelection(item.getData() == selElement);
+ }
+ } else {
+ MPartStack partStack = (MPartStack) mGenericStack;
+ MUIElement selElement = partStack.getSelectedElement();
+ if (selElement instanceof MPlaceholder)
+ selElement = ((MPlaceholder) selElement).getRef();
+
+ for (ToolItem item : trimStackTB.getItems()) {
+ boolean isSel = item.getData() == selElement;
+ item.setSelection(isSel);
+ }
+ }
+ }
+ }
+
+ private boolean isPerspectiveStack() {
+ return mGenericStack instanceof MPerspectiveStack;
+ }
+
+ private MPart getLeafPart(MUIElement element) {
+ if (element instanceof MPlaceholder)
+ return getLeafPart(((MPlaceholder) element).getRef());
+
+ if (element instanceof MElementContainer)
+ return getLeafPart(
+ ((MElementContainer) element).getSelectedElement());
+
+ if (element instanceof MPart)
+ return (MPart) element;
+
+ return null;
+ }
+
+ private Composite getCAComposite() {
+ if (trimStackTB == null)
+ return null;
+
+ // Get the shell's client area composite
+ Shell theShell = trimStackTB.getShell();
+ if (theShell.getLayout() instanceof TrimmedPartLayout) {
+ TrimmedPartLayout tpl = (TrimmedPartLayout) theShell.getLayout();
+ if (!tpl.clientArea.isDisposed())
+ return tpl.clientArea;
+ }
+ return null;
+ }
+
+ private Image getOverrideImage(MUIElement element) {
+ Image result = null;
+
+ Object imageObject = element.getTransientData()
+ .get(IPresentationEngine.OVERRIDE_ICON_IMAGE_KEY);
+ if (imageObject != null && imageObject instanceof Image
+ && !((Image) imageObject).isDisposed())
+ result = (Image) imageObject;
+ return result;
+ }
+
+ private String getOverrideTitleToolTip(MUIElement element) {
+ String result = null;
+
+ Object stringObject = element.getTransientData()
+ .get(IPresentationEngine.OVERRIDE_TITLE_TOOL_TIP_KEY);
+ if (stringObject != null && stringObject instanceof String)
+ result = (String) stringObject;
+
+ if (result == null || result.length() == 0)
+ return null;
+
+ if (element instanceof MUILabel) {
+ String label = ((MUILabel) element).getLocalizedLabel();
+ if (label != null && label.length() > 0) {
+ result = label + ' ' + '(' + result + ')';
+ }
+ }
+
+ return result;
+ }
+
+}
diff --git a/bundles/org.xmind.cathy/src/org/xmind/ui/internal/e4handlers/XResourceHandler.java b/bundles/org.xmind.cathy/src/org/xmind/ui/internal/e4handlers/XResourceHandler.java
new file mode 100644
index 000000000..b8298e33e
--- /dev/null
+++ b/bundles/org.xmind.cathy/src/org/xmind/ui/internal/e4handlers/XResourceHandler.java
@@ -0,0 +1,355 @@
+package org.xmind.ui.internal.e4handlers;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.net.URLConnection;
+import java.util.Collections;
+import java.util.Map;
+
+import javax.annotation.PostConstruct;
+import javax.inject.Inject;
+import javax.inject.Named;
+
+import org.eclipse.core.internal.runtime.PlatformURLPluginConnection;
+import org.eclipse.core.runtime.URIUtil;
+import org.eclipse.e4.core.contexts.ContextInjectionFactory;
+import org.eclipse.e4.core.contexts.IEclipseContext;
+import org.eclipse.e4.core.di.annotations.Optional;
+import org.eclipse.e4.core.services.log.Logger;
+import org.eclipse.e4.ui.internal.workbench.CommandLineOptionModelProcessor;
+import org.eclipse.e4.ui.internal.workbench.E4Workbench;
+import org.eclipse.e4.ui.internal.workbench.E4XMIResourceFactory;
+import org.eclipse.e4.ui.internal.workbench.ModelAssembler;
+import org.eclipse.e4.ui.internal.workbench.URIHelper;
+import org.eclipse.e4.ui.model.application.MApplication;
+import org.eclipse.e4.ui.model.application.MApplicationElement;
+import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
+import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.advanced.impl.AdvancedPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
+import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
+import org.eclipse.e4.ui.workbench.IModelResourceHandler;
+import org.eclipse.e4.ui.workbench.IWorkbench;
+import org.eclipse.emf.common.util.TreeIterator;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.URIConverter;
+import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.osgi.service.datalocation.Location;
+import org.osgi.framework.Bundle;
+import org.xmind.cathy.internal.CathyPlugin;
+
+/**
+ * This class is responsible to load and save the model
+ */
+@SuppressWarnings("restriction")
+public class XResourceHandler implements IModelResourceHandler {
+
+ private static final String WORKBENCH_XMI = "workbench.xmi"; //$NON-NLS-1$
+ private ResourceSetImpl resourceSetImpl;
+ private Resource resource;
+
+ @Inject
+ private Logger logger;
+
+ @Inject
+ private IEclipseContext context;
+
+ @Inject
+ @Named(E4Workbench.INITIAL_WORKBENCH_MODEL_URI)
+ private URI applicationDefinitionInstance;
+
+ @Inject
+ @Optional
+ @Named(E4Workbench.INSTANCE_LOCATION)
+ private Location instanceLocation;
+
+ /**
+ * Dictates whether the model should be stored using EMF or with the merging
+ * algorithm. https://bugs.eclipse.org/bugs/show_bug.cgi?id=295524
+ */
+ final private boolean saveAndRestore;
+ final private boolean clearPersistedState;
+
+ /**
+ * Constructor.
+ *
+ * @param saveAndRestore
+ * @param clearPersistedState
+ */
+ @Inject
+ public XResourceHandler(
+ @Named(IWorkbench.PERSIST_STATE) boolean saveAndRestore,
+ @Named(IWorkbench.CLEAR_PERSISTED_STATE) boolean clearPersistedState) {
+ this.saveAndRestore = saveAndRestore;
+ this.clearPersistedState = clearPersistedState;
+ }
+
+ @PostConstruct
+ void init() {
+ resourceSetImpl = new ResourceSetImpl();
+ resourceSetImpl.getResourceFactoryRegistry().getExtensionToFactoryMap()
+ .put(Resource.Factory.Registry.DEFAULT_EXTENSION,
+ new E4XMIResourceFactory());
+
+ resourceSetImpl.getPackageRegistry().put(ApplicationPackageImpl.eNS_URI,
+ ApplicationPackageImpl.eINSTANCE);
+ resourceSetImpl.getPackageRegistry().put(CommandsPackageImpl.eNS_URI,
+ CommandsPackageImpl.eINSTANCE);
+ resourceSetImpl.getPackageRegistry().put(UiPackageImpl.eNS_URI,
+ UiPackageImpl.eINSTANCE);
+ resourceSetImpl.getPackageRegistry().put(MenuPackageImpl.eNS_URI,
+ MenuPackageImpl.eINSTANCE);
+ resourceSetImpl.getPackageRegistry().put(BasicPackageImpl.eNS_URI,
+ BasicPackageImpl.eINSTANCE);
+ resourceSetImpl.getPackageRegistry().put(AdvancedPackageImpl.eNS_URI,
+ AdvancedPackageImpl.eINSTANCE);
+ resourceSetImpl.getPackageRegistry().put(
+ org.eclipse.e4.ui.model.application.descriptor.basic.impl.BasicPackageImpl.eNS_URI,
+ org.eclipse.e4.ui.model.application.descriptor.basic.impl.BasicPackageImpl.eINSTANCE);
+
+ }
+
+ /**
+ * @return {@code true} if the current application model has top-level
+ * windows.
+ */
+ public boolean hasTopLevelWindows() {
+ return hasTopLevelWindows(resource);
+ }
+
+ /**
+ * @return {@code true} if the specified application model has top-level
+ * windows.
+ */
+ private boolean hasTopLevelWindows(Resource applicationResource) {
+ if (applicationResource == null
+ || applicationResource.getContents() == null) {
+ // If the application resource doesn't exist or has no contents, then it has no
+ // top-level windows (and we are in an error state).
+ return false;
+ }
+ MApplication application = (MApplication) applicationResource
+ .getContents().get(0);
+ return !application.getChildren().isEmpty();
+ }
+
+ @Override
+ public Resource loadMostRecentModel() {
+ File workbenchData = null;
+ URI restoreLocation = null;
+
+ if (saveAndRestore) {
+ workbenchData = getWorkbenchSaveLocation();
+ restoreLocation = URI
+ .createFileURI(workbenchData.getAbsolutePath());
+ }
+
+ if (clearPersistedState && workbenchData != null
+ && workbenchData.exists()) {
+ workbenchData.delete();
+ }
+
+ // last stored time-stamp
+ long restoreLastModified = restoreLocation == null ? 0L
+ : new File(restoreLocation.toFileString()).lastModified();
+
+ // See bug 380663, bug 381219
+ // long lastApplicationModification = getLastApplicationModification();
+ // boolean restore = restoreLastModified > lastApplicationModification;
+ boolean restore = restoreLastModified > 0;
+ boolean initialModel;
+
+ resource = null;
+ if (restore && saveAndRestore) {
+ resource = loadResource(restoreLocation);
+ // If the saved model does not have any top-level windows, Eclipse will exit
+ // immediately, so throw out the persisted state and reinitialize with the defaults.
+ if (!hasTopLevelWindows(resource)) {
+ if (logger != null) {
+ logger.error(new Exception(), // log a stack trace to help debug the corruption
+ "The persisted workbench has no top-level windows, so reinitializing with defaults."); //$NON-NLS-1$
+ }
+ resource = null;
+ }
+ }
+ if (resource == null) {
+ Resource applicationResource = loadResource(
+ applicationDefinitionInstance);
+ MApplication theApp = (MApplication) applicationResource
+ .getContents().get(0);
+ resource = createResourceWithApp(theApp);
+ //Prevent 3.x workbench from using WorkbenchMigrationProcessor to migrate org.eclipse.ui.workbench/workbench.xml
+// context.set(E4Workbench.NO_SAVED_MODEL_FOUND, Boolean.TRUE);
+ initialModel = true;
+ } else {
+ initialModel = false;
+ }
+
+ // Add model items described in the model extension point
+ // This has to be done before commands are put into the context
+ MApplication appElement = (MApplication) resource.getContents().get(0);
+
+ this.context.set(MApplication.class, appElement);
+ ModelAssembler contribProcessor = ContextInjectionFactory
+ .make(ModelAssembler.class, context);
+ contribProcessor.processModel(initialModel);
+
+ if (!hasTopLevelWindows(resource) && logger != null) {
+ logger.error(new Exception(), // log a stack trace to help debug the
+ // corruption
+ "Initializing from the application definition instance yields no top-level windows! " //$NON-NLS-1$
+ + "Continuing execution, but the missing windows may cause other initialization failures."); //$NON-NLS-1$
+ }
+
+ if (!clearPersistedState) {
+ CommandLineOptionModelProcessor processor = ContextInjectionFactory
+ .make(CommandLineOptionModelProcessor.class, context);
+ processor.process();
+ }
+
+ return resource;
+ }
+
+ @Override
+ public void save() throws IOException {
+ if (saveAndRestore)
+ resource.save(null);
+ }
+
+ /**
+ * Creates a resource with an app Model, used for saving copies of the main
+ * app model.
+ *
+ * @param theApp
+ * the application model to add to the resource
+ * @return a resource with a proper save path with the model as contents
+ */
+ @Override
+ public Resource createResourceWithApp(MApplication theApp) {
+ Resource res = createResource();
+ res.getContents().add((EObject) theApp);
+ return res;
+ }
+
+ private Resource createResource() {
+ if (saveAndRestore) {
+ URI saveLocation = URI.createFileURI(
+ getWorkbenchSaveLocation().getAbsolutePath());
+ return resourceSetImpl.createResource(saveLocation);
+ }
+ return resourceSetImpl.createResource(URI.createURI(WORKBENCH_XMI));
+ }
+
+ private File getWorkbenchSaveLocation() {
+ File workbenchData = new File(getBaseLocation(), WORKBENCH_XMI);
+ return workbenchData;
+ }
+
+ private File getBaseLocation() {
+ File baseLocation;
+ try {
+ baseLocation = new File(URIUtil.toURI(instanceLocation.getURL()));
+ } catch (URISyntaxException e) {
+ throw new RuntimeException(e);
+ }
+ baseLocation = new File(baseLocation, ".metadata"); //$NON-NLS-1$
+ baseLocation = new File(baseLocation, ".plugins"); //$NON-NLS-1$
+ baseLocation = new File(baseLocation, "org.xmind.cathy"); //$NON-NLS-1$
+ baseLocation = new File(baseLocation, "e4Model"); //$NON-NLS-1$
+ baseLocation = new File(baseLocation,
+ CathyPlugin.getDefault().getBundle().getVersion().toString());
+ return baseLocation;
+ }
+
+ // Ensures that even models with error are loaded!
+ private Resource loadResource(URI uri) {
+ Resource resource;
+ try {
+ resource = getResource(uri);
+ } catch (Exception e) {
+ // TODO We could use diagnostics for better analyzing the error
+ logger.error(e, "Unable to load resource " + uri.toString()); //$NON-NLS-1$
+ return null;
+ }
+
+ // TODO once we switch from deltas, we only need this once on the default model?
+ String contributorURI = URIHelper.EMFtoPlatform(uri);
+ if (contributorURI != null) {
+ TreeIterator it = EcoreUtil
+ .getAllContents(resource.getContents());
+ while (it.hasNext()) {
+ EObject o = it.next();
+ if (o instanceof MApplicationElement) {
+ ((MApplicationElement) o).setContributorURI(contributorURI);
+ }
+ }
+ }
+ return resource;
+ }
+
+ private Resource getResource(URI uri) throws Exception {
+ Resource resource;
+ if (saveAndRestore) {
+ resource = resourceSetImpl.getResource(uri, true);
+ } else {
+ // Workaround for java.lang.IllegalStateException: No instance data can be specified
+ // thrown by org.eclipse.core.internal.runtime.DataArea.assertLocationInitialized
+ // The DataArea.assertLocationInitialized is called by ResourceSetImpl.getResource(URI,
+ // boolean)
+ resource = resourceSetImpl.createResource(uri);
+ resource.load(new URL(uri.toString()).openStream(),
+ resourceSetImpl.getLoadOptions());
+ }
+
+ return resource;
+ }
+
+ protected long getLastApplicationModification() {
+ long appLastModified = 0L;
+ ResourceSetImpl resourceSetImpl = new ResourceSetImpl();
+
+ Map attributes = resourceSetImpl.getURIConverter()
+ .getAttributes(applicationDefinitionInstance,
+ Collections.singletonMap(
+ URIConverter.OPTION_REQUESTED_ATTRIBUTES,
+ Collections.singleton(
+ URIConverter.ATTRIBUTE_TIME_STAMP)));
+
+ Object timestamp = attributes.get(URIConverter.ATTRIBUTE_TIME_STAMP);
+ if (timestamp instanceof Long) {
+ appLastModified = ((Long) timestamp).longValue();
+ } else if (applicationDefinitionInstance.isPlatformPlugin()) {
+ try {
+ java.net.URL url = new java.net.URL(
+ applicationDefinitionInstance.toString());
+ // can't just use 'url.openConnection()' as it usually returns a
+ // PlatformURLPluginConnection which doesn't expose the
+ // last-modification time. So we try to resolve the file through
+ // the bundle to obtain a BundleURLConnection instead.
+ Object[] obj = PlatformURLPluginConnection
+ .parse(url.getFile().trim(), url);
+ Bundle b = (Bundle) obj[0];
+ // first try to resolve as an bundle file entry, then as a resource using
+ // the bundle's classpath
+ java.net.URL resolved = b.getEntry((String) obj[1]);
+ if (resolved == null) {
+ resolved = b.getResource((String) obj[1]);
+ }
+ if (resolved != null) {
+ URLConnection openConnection = resolved.openConnection();
+ appLastModified = openConnection.getLastModified();
+ }
+ } catch (Exception e) {
+ // ignore
+ }
+ }
+
+ return appLastModified;
+ }
+}
diff --git a/bundles/org.xmind.core.command.remote/.settings/org.eclipse.jdt.core.prefs b/bundles/org.xmind.core.command.remote/.settings/org.eclipse.jdt.core.prefs
index 6e789d95f..9e961115c 100644
--- a/bundles/org.xmind.core.command.remote/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.xmind.core.command.remote/.settings/org.eclipse.jdt.core.prefs
@@ -15,6 +15,7 @@ org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
@@ -28,8 +29,10 @@ org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_for_loop_header=0
org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameterized_type_references=0
org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
@@ -39,11 +42,13 @@ org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration
org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_type_arguments=0
+org.eclipse.jdt.core.formatter.alignment_for_type_parameters=0
org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
org.eclipse.jdt.core.formatter.blank_lines_after_package=1
org.eclipse.jdt.core.formatter.blank_lines_before_field=0
-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=1
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
org.eclipse.jdt.core.formatter.blank_lines_before_method=1
@@ -97,6 +102,7 @@ org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_enum_constant=insert
org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
@@ -291,12 +297,24 @@ org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=true
org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
+org.eclipse.jdt.core.formatter.parentheses_positions_in_annotation=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_catch_clause=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_enum_constant_declaration=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_for_statment=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_if_while_statement=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_lambda_declaration=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_method_delcaration=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_method_invocation=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_switch_statement=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_try_clause=common_lines
org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
org.eclipse.jdt.core.formatter.tabulation.char=space
org.eclipse.jdt.core.formatter.tabulation.size=4
org.eclipse.jdt.core.formatter.use_on_off_tags=false
org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_assignment_operator=false
org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_conditional_operator=true
org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
org.eclipse.jdt.core.incompatibleJDKLevel=ignore
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 0759392da..e8a80c475 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.6.51.qualifier
+Bundle-Version: 3.7.0.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.6.0,3.7.0)";visibility:=reexport
+ org.xmind.core.command;bundle-version="[3.7.0,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 af16a0cd0..45792043d 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.0org.xmind.cathy.pluginsorg.xmind.core.command.remote
- 3.6.51-SNAPSHOT
+ 3.7.0-SNAPSHOTeclipse-pluginorg.xmind.relengorg.xmind.cathy.releng
- 3.6.51-SNAPSHOT
+ 3.7.0-SNAPSHOT../../
diff --git a/bundles/org.xmind.core.command/.settings/org.eclipse.jdt.core.prefs b/bundles/org.xmind.core.command/.settings/org.eclipse.jdt.core.prefs
index 2a7d08cf8..5d49216ca 100644
--- a/bundles/org.xmind.core.command/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.xmind.core.command/.settings/org.eclipse.jdt.core.prefs
@@ -103,6 +103,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
@@ -116,8 +117,10 @@ org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_for_loop_header=0
org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameterized_type_references=0
org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
@@ -127,11 +130,13 @@ org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration
org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_type_arguments=0
+org.eclipse.jdt.core.formatter.alignment_for_type_parameters=0
org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
org.eclipse.jdt.core.formatter.blank_lines_after_package=1
org.eclipse.jdt.core.formatter.blank_lines_before_field=0
-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=1
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
org.eclipse.jdt.core.formatter.blank_lines_before_method=1
@@ -185,6 +190,7 @@ org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_enum_constant=insert
org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
@@ -379,12 +385,24 @@ org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=true
org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
+org.eclipse.jdt.core.formatter.parentheses_positions_in_annotation=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_catch_clause=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_enum_constant_declaration=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_for_statment=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_if_while_statement=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_lambda_declaration=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_method_delcaration=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_method_invocation=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_switch_statement=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_try_clause=common_lines
org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
org.eclipse.jdt.core.formatter.tabulation.char=space
org.eclipse.jdt.core.formatter.tabulation.size=4
org.eclipse.jdt.core.formatter.use_on_off_tags=false
org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_assignment_operator=false
org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_conditional_operator=true
org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
org.eclipse.jdt.core.incompatibleJDKLevel=ignore
diff --git a/bundles/org.xmind.core.command/META-INF/MANIFEST.MF b/bundles/org.xmind.core.command/META-INF/MANIFEST.MF
index f9468ab23..88a8e346c 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.6.51.qualifier
+Bundle-Version: 3.7.0.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 cfb7f1cf6..ed154836d 100644
--- a/bundles/org.xmind.core.command/pom.xml
+++ b/bundles/org.xmind.core.command/pom.xml
@@ -5,12 +5,12 @@
4.0.0org.xmind.cathy.pluginsorg.xmind.core.command
- 3.6.51-SNAPSHOT
+ 3.7.0-SNAPSHOTeclipse-pluginorg.xmind.relengorg.xmind.cathy.releng
- 3.6.51-SNAPSHOT
+ 3.7.0-SNAPSHOT../../
diff --git a/bundles/org.xmind.core.io/.settings/org.eclipse.jdt.core.prefs b/bundles/org.xmind.core.io/.settings/org.eclipse.jdt.core.prefs
index f51dc3a8d..0e11c7b5b 100644
--- a/bundles/org.xmind.core.io/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.xmind.core.io/.settings/org.eclipse.jdt.core.prefs
@@ -72,6 +72,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=ignore
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
@@ -85,8 +86,10 @@ org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_for_loop_header=0
org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameterized_type_references=0
org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
@@ -96,11 +99,13 @@ org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration
org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_type_arguments=0
+org.eclipse.jdt.core.formatter.alignment_for_type_parameters=0
org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
org.eclipse.jdt.core.formatter.blank_lines_after_package=1
org.eclipse.jdt.core.formatter.blank_lines_before_field=0
-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=1
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
org.eclipse.jdt.core.formatter.blank_lines_before_method=1
@@ -154,6 +159,7 @@ org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_enum_constant=insert
org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert
@@ -349,12 +355,24 @@ org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=true
org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
+org.eclipse.jdt.core.formatter.parentheses_positions_in_annotation=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_catch_clause=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_enum_constant_declaration=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_for_statment=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_if_while_statement=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_lambda_declaration=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_method_delcaration=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_method_invocation=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_switch_statement=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_try_clause=common_lines
org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
org.eclipse.jdt.core.formatter.tabulation.char=space
org.eclipse.jdt.core.formatter.tabulation.size=4
org.eclipse.jdt.core.formatter.use_on_off_tags=false
org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_assignment_operator=false
org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_conditional_operator=true
org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
org.eclipse.jdt.core.incompatibleJDKLevel=ignore
diff --git a/bundles/org.xmind.core.io/.settings/org.eclipse.jdt.ui.prefs b/bundles/org.xmind.core.io/.settings/org.eclipse.jdt.ui.prefs
index 7dece21ad..5ff980f2f 100644
--- a/bundles/org.xmind.core.io/.settings/org.eclipse.jdt.ui.prefs
+++ b/bundles/org.xmind.core.io/.settings/org.eclipse.jdt.ui.prefs
@@ -1,4 +1,3 @@
eclipse.preferences.version=1
formatter_profile=_XMind Code Formatter
formatter_settings_version=12
-org.eclipse.jdt.ui.text.custom_code_templates=
diff --git a/bundles/org.xmind.core.io/META-INF/MANIFEST.MF b/bundles/org.xmind.core.io/META-INF/MANIFEST.MF
index 9f550ae1e..402906a08 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.6.51.qualifier
+Bundle-Version: 3.7.0.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 3e4751744..8610d3993 100644
--- a/bundles/org.xmind.core.io/pom.xml
+++ b/bundles/org.xmind.core.io/pom.xml
@@ -5,12 +5,12 @@
4.0.0org.xmind.cathy.pluginsorg.xmind.core.io
- 3.6.51-SNAPSHOT
+ 3.7.0-SNAPSHOTeclipse-pluginorg.xmind.relengorg.xmind.cathy.releng
- 3.6.51-SNAPSHOT
+ 3.7.0-SNAPSHOT../../
diff --git a/bundles/org.xmind.core.licensing/.settings/org.eclipse.jdt.core.prefs b/bundles/org.xmind.core.licensing/.settings/org.eclipse.jdt.core.prefs
index 5da2977b9..082f08668 100644
--- a/bundles/org.xmind.core.licensing/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.xmind.core.licensing/.settings/org.eclipse.jdt.core.prefs
@@ -109,6 +109,7 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
@@ -122,8 +123,10 @@ org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_for_loop_header=0
org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameterized_type_references=0
org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
@@ -133,11 +136,13 @@ org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration
org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_type_arguments=0
+org.eclipse.jdt.core.formatter.alignment_for_type_parameters=0
org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
org.eclipse.jdt.core.formatter.blank_lines_after_package=1
org.eclipse.jdt.core.formatter.blank_lines_before_field=0
-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=1
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
org.eclipse.jdt.core.formatter.blank_lines_before_method=1
@@ -191,6 +196,7 @@ org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_enum_constant=insert
org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
@@ -385,12 +391,24 @@ org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=true
org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
+org.eclipse.jdt.core.formatter.parentheses_positions_in_annotation=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_catch_clause=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_enum_constant_declaration=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_for_statment=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_if_while_statement=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_lambda_declaration=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_method_delcaration=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_method_invocation=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_switch_statement=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_try_clause=common_lines
org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
org.eclipse.jdt.core.formatter.tabulation.char=space
org.eclipse.jdt.core.formatter.tabulation.size=4
org.eclipse.jdt.core.formatter.use_on_off_tags=false
org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_assignment_operator=false
org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_conditional_operator=true
org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
org.eclipse.jdt.core.incompatibleJDKLevel=ignore
diff --git a/bundles/org.xmind.core.licensing/.settings/org.eclipse.jdt.ui.prefs b/bundles/org.xmind.core.licensing/.settings/org.eclipse.jdt.ui.prefs
index 4dedfe7bf..082f3415f 100644
--- a/bundles/org.xmind.core.licensing/.settings/org.eclipse.jdt.ui.prefs
+++ b/bundles/org.xmind.core.licensing/.settings/org.eclipse.jdt.ui.prefs
@@ -2,8 +2,6 @@ eclipse.preferences.version=1
editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
formatter_profile=_XMind Code Formatter
formatter_settings_version=12
-org.eclipse.jdt.ui.javadoc=true
-org.eclipse.jdt.ui.text.custom_code_templates=/**\n * @return the ${bare_field_name}\n *//**\n * @param ${param} the ${bare_field_name} to set\n *//**\n * ${tags}\n *//* ******************************************************************************\n * Copyright (c) 2006-2016 XMind Ltd. and others.\n * \n * This file is a part of XMind 3. XMind releases 3 and\n * above are dual-licensed under the Eclipse Public License (EPL),\n * which is available at http\://www.eclipse.org/legal/epl-v10.html\n * and the GNU Lesser General Public License (LGPL), \n * which is available at http\://www.gnu.org/licenses/lgpl.html\n * See http\://www.xmind.net/license.html for details.\n * \n * Contributors\:\n * XMind Ltd. - initial API and implementation\n *******************************************************************************/\n/**\n * \n *//**\n * @author Frank Shaka\n *\n * ${tags}\n *//**\n * \n *//**\n * ${tags}\n *//* (non-Javadoc)\n * ${see_to_overridden}\n *//**\n * ${tags}\n * ${see_to_target}\n */${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}\n\n\n\n// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();// ${todo} Auto-generated method stub\n${body_statement}${body_statement}\n// ${todo} Auto-generated constructor stubreturn ${field};${field} \= ${param};
sp_cleanup.add_default_serial_version_id=true
sp_cleanup.add_generated_serial_version_id=false
sp_cleanup.add_missing_annotations=true
diff --git a/bundles/org.xmind.core.licensing/META-INF/MANIFEST.MF b/bundles/org.xmind.core.licensing/META-INF/MANIFEST.MF
index 64ea7be3b..783a145d0 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.6.51.qualifier
+Bundle-Version: 3.7.0.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 cc7ddbc27..cb5f07535 100644
--- a/bundles/org.xmind.core.licensing/pom.xml
+++ b/bundles/org.xmind.core.licensing/pom.xml
@@ -5,12 +5,12 @@
4.0.0org.xmind.cathy.pluginsorg.xmind.core.licensing
- 3.6.51-SNAPSHOT
+ 3.7.0-SNAPSHOTeclipse-pluginorg.xmind.relengorg.xmind.cathy.releng
- 3.6.51-SNAPSHOT
+ 3.7.0-SNAPSHOT../../
diff --git a/bundles/org.xmind.core.net/.settings/org.eclipse.jdt.core.prefs b/bundles/org.xmind.core.net/.settings/org.eclipse.jdt.core.prefs
index be9f785d0..d3a3f618c 100644
--- a/bundles/org.xmind.core.net/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.xmind.core.net/.settings/org.eclipse.jdt.core.prefs
@@ -104,6 +104,7 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
@@ -117,8 +118,10 @@ org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_for_loop_header=0
org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameterized_type_references=0
org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
@@ -128,11 +131,13 @@ org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration
org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_type_arguments=0
+org.eclipse.jdt.core.formatter.alignment_for_type_parameters=0
org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
org.eclipse.jdt.core.formatter.blank_lines_after_package=1
org.eclipse.jdt.core.formatter.blank_lines_before_field=0
-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=1
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
org.eclipse.jdt.core.formatter.blank_lines_before_method=1
@@ -186,6 +191,7 @@ org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_enum_constant=insert
org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
@@ -380,12 +386,24 @@ org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=true
org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
+org.eclipse.jdt.core.formatter.parentheses_positions_in_annotation=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_catch_clause=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_enum_constant_declaration=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_for_statment=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_if_while_statement=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_lambda_declaration=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_method_delcaration=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_method_invocation=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_switch_statement=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_try_clause=common_lines
org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
org.eclipse.jdt.core.formatter.tabulation.char=space
org.eclipse.jdt.core.formatter.tabulation.size=4
org.eclipse.jdt.core.formatter.use_on_off_tags=false
org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_assignment_operator=false
org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_conditional_operator=true
org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
org.eclipse.jdt.core.incompatibleJDKLevel=ignore
diff --git a/bundles/org.xmind.core.net/META-INF/MANIFEST.MF b/bundles/org.xmind.core.net/META-INF/MANIFEST.MF
index c60e41128..c32371100 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.6.51.qualifier
+Bundle-Version: 3.7.0.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 b637aa63c..9e92b86ac 100644
--- a/bundles/org.xmind.core.net/pom.xml
+++ b/bundles/org.xmind.core.net/pom.xml
@@ -5,12 +5,12 @@
4.0.0org.xmind.cathy.pluginsorg.xmind.core.net
- 3.6.51-SNAPSHOT
+ 3.7.0-SNAPSHOTeclipse-pluginorg.xmind.relengorg.xmind.cathy.releng
- 3.6.51-SNAPSHOT
+ 3.7.0-SNAPSHOT../../
diff --git a/bundles/org.xmind.core.net/src/org/xmind/core/net/http/HttpRequest.java b/bundles/org.xmind.core.net/src/org/xmind/core/net/http/HttpRequest.java
index 3c7bcb082..f56afa234 100644
--- a/bundles/org.xmind.core.net/src/org/xmind/core/net/http/HttpRequest.java
+++ b/bundles/org.xmind.core.net/src/org/xmind/core/net/http/HttpRequest.java
@@ -16,6 +16,8 @@
*/
package org.xmind.core.net.http;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.InterruptedIOException;
@@ -49,15 +51,19 @@
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.OperationCanceledException;
import org.eclipse.core.runtime.SubMonitor;
+import org.json.JSONException;
import org.json.JSONObject;
+import org.json.JSONTokener;
import org.xmind.core.net.Field;
import org.xmind.core.net.FieldSet;
import org.xmind.core.net.internal.Activator;
+import org.xmind.core.net.internal.EncodingUtils;
import org.xmind.core.net.internal.FixedLengthInputStream;
-import org.xmind.core.net.internal.LoggedInputStream;
-import org.xmind.core.net.internal.LoggedOutputStream;
+import org.xmind.core.net.internal.LoggingOutputStream;
import org.xmind.core.net.internal.MonitoredInputStream;
import org.xmind.core.net.internal.MonitoredOutputStream;
+import org.xmind.core.net.internal.TeeInputStream;
+import org.xmind.core.net.internal.TeeOutputStream;
/**
* @author Frank Shaka
@@ -305,6 +311,8 @@ public class HttpRequest {
private PrintStream logStream;
+ private byte[] responseBuffer;
+
public HttpRequest(URL url, String method, FieldSet headers,
HttpEntity entity, FieldSet settings,
IResponseHandler responseHandler) {
@@ -315,8 +323,7 @@ public HttpRequest(URL url, String method, FieldSet headers,
this.requestHeaders = new FieldSet(headers);
this.requestEntity = entity;
this.settings = new FieldSet(settings);
- this.responseHandler = responseHandler == null ? new HttpResponse()
- : responseHandler;
+ this.responseHandler = responseHandler;
this.statusCode = HTTP_PREPARING;
this.statusMessage = null;
this.responseHeaders = new FieldSet();
@@ -327,6 +334,7 @@ public HttpRequest(URL url, String method, FieldSet headers,
|| System.getProperty(Activator.CONFIG_DEBUG_HTTP_REQUESTS,
null) != null;
this.logStream = forceDebugging ? System.out : null;
+ this.responseBuffer = null;
}
public HttpRequest(boolean https, String host, int port, String path,
@@ -378,15 +386,26 @@ public IResponseHandler getResponseHandler() {
}
public String getResponseAsString() {
- if (responseHandler instanceof HttpResponse)
- return ((HttpResponse) responseHandler).asString();
- return null;
+ if (responseBuffer == null)
+ return null;
+ return EncodingUtils.toDefaultString(responseBuffer);
}
public JSONObject getResponseAsJSON() {
- if (responseHandler instanceof HttpResponse)
- return ((HttpResponse) responseHandler).asJSONObject();
- return null;
+ if (responseBuffer == null)
+ return null;
+ ByteArrayInputStream input = new ByteArrayInputStream(responseBuffer);
+ try {
+ return new JSONObject(new JSONTokener(input));
+ } catch (JSONException e) {
+ // not a valid JSON object
+ return null;
+ } finally {
+ try {
+ input.close();
+ } catch (IOException e) {
+ }
+ }
}
/**
@@ -463,7 +482,7 @@ public void run() {
private void doExecute(IProgressMonitor monitor,
HttpURLConnection[] _connection)
- throws InterruptedException, IOException {
+ throws InterruptedException, IOException {
if (monitor.isCanceled())
return;
@@ -524,9 +543,18 @@ private void doExecute(IProgressMonitor monitor,
if (monitor.isCanceled())
throw new InterruptedException();
} catch (IOException e) {
- readResponse(monitor, connection, connection.getErrorStream(),
- connection.getResponseCode(),
- connection.getResponseMessage());
+ InputStream errorStream = connection.getErrorStream();
+ if (errorStream == null) {
+ e.printStackTrace();
+ log("Error stream is NULL, response state: {0} {1}", //$NON-NLS-1$
+ connection.getResponseCode(),
+ connection.getResponseMessage());
+ throw new InterruptedException();
+ } else {
+ readResponse(monitor, connection, errorStream,
+ connection.getResponseCode(),
+ connection.getResponseMessage());
+ }
if (monitor.isCanceled())
throw new InterruptedException();
} finally {
@@ -612,7 +640,8 @@ private void writeBody(IProgressMonitor monitor, URLConnection connection)
OutputStream output = new MonitoredOutputStream(
connection.getOutputStream(), monitor);
if (debugging && logStream != null) {
- output = new LoggedOutputStream(output, logStream);
+ output = new TeeOutputStream(output,
+ new LoggingOutputStream(logStream));
}
try {
requestEntity.writeTo(output);
@@ -661,25 +690,35 @@ private void readResponse(IProgressMonitor monitor,
totalBytes);
}
- final HttpEntity responseEntity;
if (readStream != null) {
- InputStream responseStream = new MonitoredInputStream(readStream,
- monitor);
if (debugging && logStream != null) {
- responseStream = new LoggedInputStream(responseStream,
- logStream);
+ readStream = new TeeInputStream(readStream,
+ new LoggingOutputStream(logStream));
}
- responseEntity = new StreamedEntity(responseStream, totalBytes);
- } else {
- responseEntity = null;
- }
- if (responseEntity != null) {
- try {
- responseHandler.handleResponseEntity(monitor, this,
- responseEntity);
- } catch (OperationCanceledException e) {
- throw new InterruptedException();
+ ByteArrayOutputStream bufferStream = new ByteArrayOutputStream(
+ (int) totalBytes);
+ readStream = new TeeInputStream(readStream, bufferStream);
+ readStream = new MonitoredInputStream(readStream, monitor);
+
+ if (responseHandler != null) {
+ final HttpEntity responseEntity = new StreamedEntity(readStream,
+ totalBytes);
+ try {
+ responseHandler.handleResponseEntity(monitor, this,
+ responseEntity);
+ } catch (OperationCanceledException e) {
+ throw new InterruptedException();
+ }
}
+
+ /// read until the end of stream to receive all response content
+ /// TODO potential dead lock?
+ byte[] temp = new byte[1024];
+ while (readStream.read(temp) != -1) {
+ /// do nothing and wait until the stream is consumed
+ }
+
+ responseBuffer = bufferStream.toByteArray();
}
if (debugging && logStream != null) {
@@ -793,8 +832,8 @@ public static void relaxHostChecking(HttpURLConnection conn)
static synchronized SSLSocketFactory prepFactory(
HttpsURLConnection httpsConnection)
- throws NoSuchAlgorithmException, KeyStoreException,
- KeyManagementException {
+ throws NoSuchAlgorithmException, KeyStoreException,
+ KeyManagementException {
if (factory == null) {
SSLContext ctx = SSLContext.getInstance("TLS"); //$NON-NLS-1$
diff --git a/bundles/org.xmind.core.net/src/org/xmind/core/net/http/HttpResponse.java b/bundles/org.xmind.core.net/src/org/xmind/core/net/http/HttpResponse.java
deleted file mode 100644
index 4be96d553..000000000
--- a/bundles/org.xmind.core.net/src/org/xmind/core/net/http/HttpResponse.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/* ******************************************************************************
- * Copyright (c) 2006-2016 XMind Ltd. and others.
- *
- * This file is a part of XMind 3. XMind releases 3 and
- * above are dual-licensed under the Eclipse Public License (EPL),
- * which is available at http://www.eclipse.org/legal/epl-v10.html
- * and the GNU Lesser General Public License (LGPL),
- * which is available at http://www.gnu.org/licenses/lgpl.html
- * See http://www.xmind.net/license.html for details.
- *
- * Contributors:
- * XMind Ltd. - initial API and implementation
- *******************************************************************************/
-/**
- *
- */
-package org.xmind.core.net.http;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.json.JSONTokener;
-import org.xmind.core.net.internal.EncodingUtils;
-
-/**
- * @author Frank Shaka
- * @since 3.6.50
- */
-public class HttpResponse implements IResponseHandler {
-
- private byte[] bytes = null;
-
- public void handleResponseEntity(IProgressMonitor monitor,
- HttpRequest request, HttpEntity entity)
- throws InterruptedException, IOException {
- ByteArrayOutputStream output = new ByteArrayOutputStream();
- try {
- entity.writeTo(output);
- } finally {
- try {
- output.close();
- } catch (IOException e) {
- }
- }
- bytes = output.toByteArray();
- }
-
- /**
- *
- * @return a string as the response, or null if no response is
- * received
- */
- public String asString() {
- if (bytes == null)
- return null;
- return EncodingUtils.toDefaultString(bytes);
- }
-
- /**
- *
- * @return a JSON object as the response, or null if no valid
- * JSON object is available
- */
- public JSONObject asJSONObject() {
- if (bytes == null)
- return null;
- ByteArrayInputStream input = new ByteArrayInputStream(bytes);
- try {
- return new JSONObject(new JSONTokener(input));
- } catch (JSONException e) {
- // not a valid JSON object
- return null;
- } finally {
- try {
- input.close();
- } catch (IOException e) {
- }
- }
- }
-
-}
diff --git a/bundles/org.xmind.core.net/src/org/xmind/core/net/http/MultipartEntity.java b/bundles/org.xmind.core.net/src/org/xmind/core/net/http/MultipartEntity.java
index e54dbdc51..d3c9eb74e 100644
--- a/bundles/org.xmind.core.net/src/org/xmind/core/net/http/MultipartEntity.java
+++ b/bundles/org.xmind.core.net/src/org/xmind/core/net/http/MultipartEntity.java
@@ -17,7 +17,6 @@
package org.xmind.core.net.http;
import static org.xmind.core.net.internal.EncodingUtils.toAsciiBytes;
-import static org.xmind.core.net.internal.EncodingUtils.toDefaultBytes;
import java.io.IOException;
import java.io.OutputStream;
@@ -28,6 +27,7 @@
import org.xmind.core.net.internal.EncodingUtils;
/**
+ *
* @author Frank Shaka
* @since 3.6.50
*/
@@ -94,7 +94,7 @@ private byte[] getBoundary() {
return boundary;
Random rand = new Random();
byte[] bytes = new byte[rand.nextInt(11) + 30]; // a random size
- // from 30 to 40
+ // from 30 to 40
for (int i = 0; i < bytes.length; i++) {
bytes[i] = BOUNDARY_CHARS[rand.nextInt(BOUNDARY_CHARS.length)];
}
@@ -123,7 +123,7 @@ public long getContentLength() {
length += CONTENT_DISPOSITION.length;
length += QUOTE.length;
- length += toDefaultBytes(toSafeName(part.name)).length;
+ length += toAsciiBytes(toSafeName(part.name)).length;
length += QUOTE.length;
length += CRLF.length;
@@ -133,7 +133,7 @@ public long getContentLength() {
fileName = part.name;
length += FILE_NAME.length;
length += QUOTE.length;
- length += toDefaultBytes(toSafeName(fileName)).length;
+ length += toAsciiBytes(toSafeName(fileName)).length;
length += QUOTE.length;
}
@@ -170,7 +170,7 @@ public void writeTo(OutputStream stream) throws IOException {
stream.write(CONTENT_DISPOSITION);
stream.write(QUOTE);
- stream.write(EncodingUtils.toDefaultBytes(toSafeName(part.name)));
+ stream.write(toAsciiBytes(toSafeName(part.name)));
stream.write(QUOTE);
if (part.value instanceof HttpEntity) {
String fileName = ((HttpEntity) part.value).getFileName();
@@ -178,8 +178,7 @@ public void writeTo(OutputStream stream) throws IOException {
fileName = part.name;
stream.write(FILE_NAME);
stream.write(QUOTE);
- stream.write(
- EncodingUtils.toDefaultBytes(toSafeName(fileName)));
+ stream.write(toAsciiBytes(toSafeName(fileName)));
stream.write(QUOTE);
}
stream.write(CRLF);
@@ -206,7 +205,8 @@ public void writeTo(OutputStream stream) throws IOException {
private static byte[] getContentType(Object value) {
if (value instanceof HttpEntity)
- return toDefaultBytes(((HttpEntity) value).getContentType());
+ return EncodingUtils
+ .toAsciiBytes(((HttpEntity) value).getContentType());
return TEXT_CONTENT_TYPE;
}
diff --git a/bundles/org.xmind.core.net/src/org/xmind/core/net/internal/IRequestStatusChangeListener.java b/bundles/org.xmind.core.net/src/org/xmind/core/net/internal/IRequestStatusChangeListener.java
index 0869e020a..5a5097fbe 100644
--- a/bundles/org.xmind.core.net/src/org/xmind/core/net/internal/IRequestStatusChangeListener.java
+++ b/bundles/org.xmind.core.net/src/org/xmind/core/net/internal/IRequestStatusChangeListener.java
@@ -1,23 +1,19 @@
-/* ******************************************************************************
- * Copyright (c) 2006-2010 XMind Ltd. and others.
- *
- * This file is a part of XMind 3. XMind releases 3 and
- * above are dual-licensed under the Eclipse Public License (EPL),
- * which is available at http://www.eclipse.org/legal/epl-v10.html
- * and the GNU Lesser General Public License (LGPL),
- * which is available at http://www.gnu.org/licenses/lgpl.html
- * See http://www.xmind.net/license.html for details.
- *
- * Contributors:
- * XMind Ltd. - initial API and implementation
+/*
+ * *****************************************************************************
+ * * Copyright (c) 2006-2016 XMind Ltd. and others. This file is a part of XMind
+ * 3. XMind releases 3 and above are dual-licensed under the Eclipse Public
+ * License (EPL), which is available at
+ * http://www.eclipse.org/legal/epl-v10.html and the GNU Lesser General Public
+ * License (LGPL), which is available at http://www.gnu.org/licenses/lgpl.html
+ * See http://www.xmind.net/license.html for details. Contributors: XMind Ltd. -
+ * initial API and implementation
*******************************************************************************/
-
package org.xmind.core.net.internal;
/**
* @author Frank Shaka
- *
*/
+@Deprecated
public interface IRequestStatusChangeListener {
public void requestStatusChanged(XMindNetRequest request, int oldStatus,
diff --git a/bundles/org.xmind.core.net/src/org/xmind/core/net/internal/LoggingOutputStream.java b/bundles/org.xmind.core.net/src/org/xmind/core/net/internal/LoggingOutputStream.java
new file mode 100644
index 000000000..608fcd2ce
--- /dev/null
+++ b/bundles/org.xmind.core.net/src/org/xmind/core/net/internal/LoggingOutputStream.java
@@ -0,0 +1,137 @@
+/* ******************************************************************************
+ * Copyright (c) 2006-2016 XMind Ltd. and others.
+ *
+ * This file is a part of XMind 3. XMind releases 3 and
+ * above are dual-licensed under the Eclipse Public License (EPL),
+ * which is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the GNU Lesser General Public License (LGPL),
+ * which is available at http://www.gnu.org/licenses/lgpl.html
+ * See http://www.xmind.net/license.html for details.
+ *
+ * Contributors:
+ * XMind Ltd. - initial API and implementation
+ *******************************************************************************/
+/**
+ *
+ */
+package org.xmind.core.net.internal;
+
+import java.io.FilterOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+
+/**
+ * Invisible characters are encoded using
+ * Quoted-Printable
+ * codec.
+ *
+ * @author Frank Shaka
+ * @since 3.6.51
+ */
+public class LoggingOutputStream extends FilterOutputStream {
+
+ private static final byte MIN_VISIBLE_CHAR = (byte) 32;
+ private static final byte MAX_VISIBLE_CHAR = (byte) 126;
+
+ private static final byte PREFIX = (byte) '=';
+ private static final byte LF = (byte) '\n';
+ private static final byte CR = (byte) '\r';
+ private static final byte START1 = (byte) '0';
+ private static final byte START2 = (byte) ('A' - 10);
+
+ private byte[] buffer;
+
+ /**
+ * @param out
+ */
+ public LoggingOutputStream(OutputStream out) {
+ super(out);
+ this.buffer = new byte[1024];
+ }
+
+ private int quote(byte[] b, int off, int len) {
+ int buffered = 0;
+ int n;
+ for (int i = 0; i < len; i++) {
+ n = quote(b[i], buffered);
+ buffered += n;
+ }
+ return buffered;
+ }
+
+ private int quote(byte b, int bufferOffset) {
+ if (b != LF && b != CR && (b == PREFIX || b < MIN_VISIBLE_CHAR
+ || b > MAX_VISIBLE_CHAR)) {
+ ensureBufferSize(bufferOffset + 2);
+ buffer[bufferOffset] = PREFIX;
+ buffer[bufferOffset + 1] = toHex((b & 0xF0) >> 4);
+ buffer[bufferOffset + 2] = toHex(b & 0x0F);
+ return 3;
+ } else {
+ ensureBufferSize(bufferOffset);
+ buffer[bufferOffset] = b;
+ return 1;
+ }
+ }
+
+ private static final byte toHex(int x) {
+ if (x < 10) {
+ return (byte) (START1 + x);
+ }
+ return (byte) (START2 + x);
+ }
+
+ /**
+ * @param expectedSize
+ */
+ private void ensureBufferSize(int expectedSize) {
+ if (expectedSize >= buffer.length) {
+ byte[] newBuffer = new byte[(int) (buffer.length * 1.4)];
+ System.arraycopy(buffer, 0, newBuffer, 0, buffer.length);
+ buffer = newBuffer;
+ }
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see java.io.FilterOutputStream#write(byte[])
+ */
+ @Override
+ public void write(byte[] b) throws IOException {
+ int n = quote(b, 0, b.length);
+ try {
+ out.write(buffer, 0, n);
+ out.flush();
+ } catch (IOException e) {
+ }
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see java.io.FilterOutputStream#write(byte[], int, int)
+ */
+ @Override
+ public void write(byte[] b, int off, int len) throws IOException {
+ int n = quote(b, off, len);
+ try {
+ out.write(buffer, 0, n);
+ out.flush();
+ } catch (IOException e) {
+ }
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see java.io.FilterOutputStream#write(int)
+ */
+ @Override
+ public void write(int b) throws IOException {
+ int n = quote((byte) b, 0);
+ try {
+ out.write(buffer, 0, n);
+ out.flush();
+ } catch (IOException e) {
+ }
+ }
+
+}
diff --git a/bundles/org.xmind.core.net/src/org/xmind/core/net/internal/LoggedInputStream.java b/bundles/org.xmind.core.net/src/org/xmind/core/net/internal/TeeInputStream.java
similarity index 69%
rename from bundles/org.xmind.core.net/src/org/xmind/core/net/internal/LoggedInputStream.java
rename to bundles/org.xmind.core.net/src/org/xmind/core/net/internal/TeeInputStream.java
index a3c2a91fe..0911831d4 100644
--- a/bundles/org.xmind.core.net/src/org/xmind/core/net/internal/LoggedInputStream.java
+++ b/bundles/org.xmind.core.net/src/org/xmind/core/net/internal/TeeInputStream.java
@@ -23,70 +23,55 @@
/**
* @author Frank Shaka
- * @since 3.6.50
+ * @since 3.6.51
*/
-public class LoggedInputStream extends FilterInputStream {
+public class TeeInputStream extends FilterInputStream {
- private OutputStream log;
+ private OutputStream out;
/**
* @param in
*/
- public LoggedInputStream(InputStream in, OutputStream log) {
+ public TeeInputStream(InputStream in, OutputStream out) {
super(in);
- this.log = log;
+ this.out = out;
}
/*
* (non-Javadoc)
- *
* @see java.io.FilterInputStream#read()
*/
@Override
public int read() throws IOException {
int b = in.read();
if (b != -1) {
- try {
- log.write(b);
- log.flush();
- } catch (IOException e) {
- }
+ out.write(b);
}
return b;
}
/*
* (non-Javadoc)
- *
* @see java.io.FilterInputStream#read(byte[])
*/
@Override
public int read(byte[] b) throws IOException {
int n = in.read(b);
if (n != -1) {
- try {
- log.write(b, 0, n);
- log.flush();
- } catch (IOException e) {
- }
+ out.write(b, 0, n);
}
return n;
}
/*
* (non-Javadoc)
- *
* @see java.io.FilterInputStream#read(byte[], int, int)
*/
@Override
public int read(byte[] b, int off, int len) throws IOException {
int n = in.read(b, off, len);
if (n != -1) {
- try {
- log.write(b, off, n);
- log.flush();
- } catch (IOException e) {
- }
+ out.write(b, off, n);
}
return n;
}
diff --git a/bundles/org.xmind.core.net/src/org/xmind/core/net/internal/LoggedOutputStream.java b/bundles/org.xmind.core.net/src/org/xmind/core/net/internal/TeeOutputStream.java
similarity index 80%
rename from bundles/org.xmind.core.net/src/org/xmind/core/net/internal/LoggedOutputStream.java
rename to bundles/org.xmind.core.net/src/org/xmind/core/net/internal/TeeOutputStream.java
index 8efc518cf..e72636408 100644
--- a/bundles/org.xmind.core.net/src/org/xmind/core/net/internal/LoggedOutputStream.java
+++ b/bundles/org.xmind.core.net/src/org/xmind/core/net/internal/TeeOutputStream.java
@@ -22,62 +22,58 @@
/**
* @author Frank Shaka
- * @since 3.6.50
+ * @since 3.6.51
*/
-public class LoggedOutputStream extends FilterOutputStream {
+public class TeeOutputStream extends FilterOutputStream {
- private OutputStream log;
+ private OutputStream out2;
/**
* @param out
*/
- public LoggedOutputStream(OutputStream out, OutputStream log) {
+ public TeeOutputStream(OutputStream out, OutputStream out2) {
super(out);
- this.log = log;
+ this.out2 = out2;
}
/*
* (non-Javadoc)
- *
- * @see java.io.FilterOutputStream#flush()
- */
- @Override
- public void flush() throws IOException {
- super.flush();
- log.flush();
- }
-
- /*
- * (non-Javadoc)
- *
* @see java.io.FilterOutputStream#write(byte[])
*/
@Override
public void write(byte[] b) throws IOException {
out.write(b);
- log.write(b);
+ out2.write(b);
}
/*
* (non-Javadoc)
- *
* @see java.io.FilterOutputStream#write(byte[], int, int)
*/
@Override
public void write(byte[] b, int off, int len) throws IOException {
out.write(b, off, len);
- log.write(b, off, len);
+ out2.write(b, off, len);
}
/*
* (non-Javadoc)
- *
* @see java.io.FilterOutputStream#write(int)
*/
@Override
public void write(int b) throws IOException {
out.write(b);
- log.write(b);
+ out2.write(b);
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see java.io.FilterOutputStream#flush()
+ */
+ @Override
+ public void flush() throws IOException {
+ super.flush();
+ out2.flush();
}
}
diff --git a/bundles/org.xmind.core.runtime/.settings/org.eclipse.jdt.core.prefs b/bundles/org.xmind.core.runtime/.settings/org.eclipse.jdt.core.prefs
index f51dc3a8d..0e11c7b5b 100644
--- a/bundles/org.xmind.core.runtime/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.xmind.core.runtime/.settings/org.eclipse.jdt.core.prefs
@@ -72,6 +72,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=ignore
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
@@ -85,8 +86,10 @@ org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_for_loop_header=0
org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameterized_type_references=0
org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
@@ -96,11 +99,13 @@ org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration
org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_type_arguments=0
+org.eclipse.jdt.core.formatter.alignment_for_type_parameters=0
org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
org.eclipse.jdt.core.formatter.blank_lines_after_package=1
org.eclipse.jdt.core.formatter.blank_lines_before_field=0
-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=1
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
org.eclipse.jdt.core.formatter.blank_lines_before_method=1
@@ -154,6 +159,7 @@ org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_enum_constant=insert
org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert
@@ -349,12 +355,24 @@ org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=true
org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
+org.eclipse.jdt.core.formatter.parentheses_positions_in_annotation=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_catch_clause=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_enum_constant_declaration=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_for_statment=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_if_while_statement=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_lambda_declaration=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_method_delcaration=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_method_invocation=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_switch_statement=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_try_clause=common_lines
org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
org.eclipse.jdt.core.formatter.tabulation.char=space
org.eclipse.jdt.core.formatter.tabulation.size=4
org.eclipse.jdt.core.formatter.use_on_off_tags=false
org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_assignment_operator=false
org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_conditional_operator=true
org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
org.eclipse.jdt.core.incompatibleJDKLevel=ignore
diff --git a/bundles/org.xmind.core.runtime/META-INF/MANIFEST.MF b/bundles/org.xmind.core.runtime/META-INF/MANIFEST.MF
index e191d0ac8..d6e05f23e 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.6.51.qualifier
+Bundle-Version: 3.7.0.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.6.0,3.7.0)";visibility:=reexport
+ org.xmind.core;bundle-version="[3.7.0,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 a2d76daa2..45d0c57e8 100644
--- a/bundles/org.xmind.core.runtime/pom.xml
+++ b/bundles/org.xmind.core.runtime/pom.xml
@@ -5,12 +5,12 @@
4.0.0org.xmind.cathy.pluginsorg.xmind.core.runtime
- 3.6.51-SNAPSHOT
+ 3.7.0-SNAPSHOTeclipse-pluginorg.xmind.relengorg.xmind.cathy.releng
- 3.6.51-SNAPSHOT
+ 3.7.0-SNAPSHOT../../
diff --git a/bundles/org.xmind.core.runtime/src/org/xmind/core/internal/CoreAxisProvider.java b/bundles/org.xmind.core.runtime/src/org/xmind/core/internal/CoreAxisProvider.java
index 6af64876e..11d2d17fd 100644
--- a/bundles/org.xmind.core.runtime/src/org/xmind/core/internal/CoreAxisProvider.java
+++ b/bundles/org.xmind.core.runtime/src/org/xmind/core/internal/CoreAxisProvider.java
@@ -67,6 +67,14 @@ public List getChildNodes(Object node, String name) {
return Collections.emptyList();
}
+ public Object getParentNode(Object node) {
+ if (node instanceof ITopic) {
+ ITopic parent = ((ITopic) node).getParent();
+ return parent != null ? parent : ((ITopic) node).getOwnedSheet();
+ }
+ return null;
+ }
+
public Object getAttribute(Object node, String name) {
if (ATTR_TYPE.equals(name)) {
if (node instanceof ITopic)
diff --git a/bundles/org.xmind.core.runtime/src/org/xmind/core/internal/security/PKCS12KeyGenerator.java b/bundles/org.xmind.core.runtime/src/org/xmind/core/internal/security/PKCS12KeyGenerator.java
new file mode 100644
index 000000000..1c77cfcfe
--- /dev/null
+++ b/bundles/org.xmind.core.runtime/src/org/xmind/core/internal/security/PKCS12KeyGenerator.java
@@ -0,0 +1,238 @@
+/* ******************************************************************************
+ * Copyright (c) 2006-2016 XMind Ltd. and others.
+ *
+ * This file is a part of XMind 3. XMind releases 3 and
+ * above are dual-licensed under the Eclipse Public License (EPL),
+ * which is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the GNU Lesser General Public License (LGPL),
+ * which is available at http://www.gnu.org/licenses/lgpl.html
+ * See http://www.xmind.net/license.html for details.
+ *
+ * Contributors:
+ * XMind Ltd. - initial API and implementation
+ *******************************************************************************/
+/**
+ *
+ */
+package org.xmind.core.internal.security;
+
+import java.security.MessageDigest;
+
+/**
+ * Generator for PBE derived keys and ivs as defined by PKCS 12 V1.0.
+ *
+ * The document this implementation is based on can be found at RSA's PKCS12
+ * Page
+ *
+ * NOTE: This algorithm in this class is copied from Bouncycastle's
+ * PKCS12ParametersGenerator in order to decrypt legacy xmind files.
+ *
+ * @author Frank Shaka
+ */
+public class PKCS12KeyGenerator {
+
+ public static final int KEY_MATERIAL = 1;
+ public static final int IV_MATERIAL = 2;
+ public static final int MAC_MATERIAL = 3;
+
+ protected byte[] password;
+ protected byte[] salt;
+ protected int iterationCount;
+
+ private MessageDigest digest;
+
+ private int u;
+ private int v;
+
+ /**
+ * Construct a PKCS 12 Parameters generator. This constructor will accept
+ * any digest which also implements ExtendedDigest.
+ *
+ * @param digest
+ * the digest to be used as the source of derived keys.
+ * @exception IllegalArgumentException
+ * if an unknown digest is passed in.
+ */
+ public PKCS12KeyGenerator(MessageDigest digest) {
+ this.digest = digest;
+ u = digest.getDigestLength();
+ v = 64; //((ExtendedDigest)digest).getByteLength();
+ }
+
+ /**
+ * initialise the PBE generator.
+ *
+ * @param password
+ * the password converted into bytes (see below).
+ * @param salt
+ * the salt to be mixed with the password.
+ * @param iterationCount
+ * the number of iterations the "mixing" function is to be
+ * applied for.
+ */
+ public void init(byte[] password, byte[] salt, int iterationCount) {
+ this.password = password;
+ this.salt = salt;
+ this.iterationCount = iterationCount;
+ }
+
+ /**
+ * return the password byte array.
+ *
+ * @return the password byte array.
+ */
+ public byte[] getPassword() {
+ return password;
+ }
+
+ /**
+ * return the salt byte array.
+ *
+ * @return the salt byte array.
+ */
+ public byte[] getSalt() {
+ return salt;
+ }
+
+ /**
+ * return the iteration count.
+ *
+ * @return the iteration count.
+ */
+ public int getIterationCount() {
+ return iterationCount;
+ }
+
+ /**
+ * converts a password to a byte array according to the scheme in PKCS12
+ * (unicode, big endian, 2 zero pad bytes at the end).
+ *
+ * @param password
+ * a character array representing the password.
+ * @return a byte array representing the password.
+ */
+ public static byte[] PKCS12PasswordToBytes(char[] password) {
+ if (password != null && password.length > 0) {
+ // +1 for extra 2 pad bytes.
+ byte[] bytes = new byte[(password.length + 1) * 2];
+
+ for (int i = 0; i != password.length; i++) {
+ bytes[i * 2] = (byte) (password[i] >>> 8);
+ bytes[i * 2 + 1] = (byte) password[i];
+ }
+
+ return bytes;
+ } else {
+ return new byte[0];
+ }
+ }
+
+ /**
+ * add a + b + 1, returning the result in a. The a value is treated as a
+ * BigInteger of length (b.length * 8) bits. The result is modulo 2^b.length
+ * in case of overflow.
+ */
+ private void adjust(byte[] a, int aOff, byte[] b) {
+ int x = (b[b.length - 1] & 0xff) + (a[aOff + b.length - 1] & 0xff) + 1;
+
+ a[aOff + b.length - 1] = (byte) x;
+ x >>>= 8;
+
+ for (int i = b.length - 2; i >= 0; i--) {
+ x += (b[i] & 0xff) + (a[aOff + i] & 0xff);
+ a[aOff + i] = (byte) x;
+ x >>>= 8;
+ }
+ }
+
+ /**
+ * generation of a derived key ala PKCS12 V1.0.
+ */
+ private byte[] generateDerivedKey(int idByte, int n) {
+ byte[] D = new byte[v];
+ byte[] dKey = new byte[n];
+
+ for (int i = 0; i != D.length; i++) {
+ D[i] = (byte) idByte;
+ }
+
+ byte[] S;
+
+ if ((salt != null) && (salt.length != 0)) {
+ S = new byte[v * ((salt.length + v - 1) / v)];
+
+ for (int i = 0; i != S.length; i++) {
+ S[i] = salt[i % salt.length];
+ }
+ } else {
+ S = new byte[0];
+ }
+
+ byte[] P;
+
+ if ((password != null) && (password.length != 0)) {
+ P = new byte[v * ((password.length + v - 1) / v)];
+
+ for (int i = 0; i != P.length; i++) {
+ P[i] = password[i % password.length];
+ }
+ } else {
+ P = new byte[0];
+ }
+
+ byte[] I = new byte[S.length + P.length];
+
+ System.arraycopy(S, 0, I, 0, S.length);
+ System.arraycopy(P, 0, I, S.length, P.length);
+
+ byte[] B = new byte[v];
+ int c = (n + u - 1) / u;
+ byte[] A;
+
+ for (int i = 1; i <= c; i++) {
+ digest.update(D, 0, D.length);
+ digest.update(I, 0, I.length);
+ A = digest.digest();
+ for (int j = 1; j < iterationCount; j++) {
+ digest.update(A, 0, A.length);
+ A = digest.digest();
+ }
+
+ for (int j = 0; j != B.length; j++) {
+ B[j] = A[j % A.length];
+ }
+
+ for (int j = 0; j != I.length / v; j++) {
+ adjust(I, j * v, B);
+ }
+
+ if (i == c) {
+ System.arraycopy(A, 0, dKey, (i - 1) * u,
+ dKey.length - ((i - 1) * u));
+ } else {
+ System.arraycopy(A, 0, dKey, (i - 1) * u, A.length);
+ }
+ }
+
+ return dKey;
+ }
+
+ /**
+ * Generate a key parameter derived from the password, salt, and iteration
+ * count we are currently initialised with.
+ *
+ * @param keySize
+ * the size of the key we want (in bits)
+ * @return a KeyParameter object.
+ */
+ public byte[] generateDerivedKey(int keySize) {
+ keySize = keySize / 8;
+
+ byte[] dKey = generateDerivedKey(KEY_MATERIAL, keySize);
+ byte[] key = new byte[keySize];
+ System.arraycopy(dKey, 0, key, 0, keySize);
+ return key;
+ }
+
+}
diff --git a/bundles/org.xmind.core.runtime/src/org/xmind/core/internal/security/PasswordProtectedNormalizer.java b/bundles/org.xmind.core.runtime/src/org/xmind/core/internal/security/PasswordProtectedNormalizer.java
index 73eb494ba..27d9e2f24 100644
--- a/bundles/org.xmind.core.runtime/src/org/xmind/core/internal/security/PasswordProtectedNormalizer.java
+++ b/bundles/org.xmind.core.runtime/src/org/xmind/core/internal/security/PasswordProtectedNormalizer.java
@@ -19,6 +19,8 @@
import static org.xmind.core.internal.dom.DOMConstants.ATTR_ALGORITHM_NAME;
import static org.xmind.core.internal.dom.DOMConstants.ATTR_ITERATION_COUNT;
import static org.xmind.core.internal.dom.DOMConstants.ATTR_KEY_DERIVATION_NAME;
+import static org.xmind.core.internal.dom.DOMConstants.ATTR_KEY_IV;
+import static org.xmind.core.internal.dom.DOMConstants.ATTR_KEY_SIZE;
import static org.xmind.core.internal.dom.DOMConstants.ATTR_SALT;
import static org.xmind.core.internal.dom.DOMConstants.TAG_ALGORITHM;
import static org.xmind.core.internal.dom.DOMConstants.TAG_KEY_DERIVATION;
@@ -26,16 +28,24 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
+import java.security.InvalidAlgorithmParameterException;
+import java.security.InvalidKeyException;
+import java.security.Key;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.security.spec.InvalidKeySpecException;
+import java.security.spec.KeySpec;
import java.util.Random;
-import org.bouncycastle.crypto.BufferedBlockCipher;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.PBEParametersGenerator;
-import org.bouncycastle.crypto.digests.MD5Digest;
-import org.bouncycastle.crypto.engines.AESEngine;
-import org.bouncycastle.crypto.generators.PKCS12ParametersGenerator;
-import org.bouncycastle.crypto.modes.CBCBlockCipher;
-import org.bouncycastle.crypto.paddings.PaddedBufferedBlockCipher;
+import javax.crypto.Cipher;
+import javax.crypto.CipherInputStream;
+import javax.crypto.CipherOutputStream;
+import javax.crypto.NoSuchPaddingException;
+import javax.crypto.SecretKeyFactory;
+import javax.crypto.spec.IvParameterSpec;
+import javax.crypto.spec.PBEKeySpec;
+import javax.crypto.spec.SecretKeySpec;
+
import org.xmind.core.Core;
import org.xmind.core.CoreException;
import org.xmind.core.IEncryptionData;
@@ -55,9 +65,11 @@
public class PasswordProtectedNormalizer implements IEntryStreamNormalizer {
private static final String ALGORITHM_NAME = "AES/CBC/PKCS5Padding"; //$NON-NLS-1$
- private static final String KEY_DERIVATION_ALGORITHM_NAME = "PKCS12"; //$NON-NLS-1$
+ private static final String OLD37_KEY_DERIVATION_ALGORITHM_NAME = "PKCS12"; //$NON-NLS-1$
+ private static final String KEY_DERIVATION_ALGORITHM_NAME = "PBKDF2WithHmacSHA512"; //$NON-NLS-1$
private static final String KEY_DERIVATION_ITERATION_COUNT = "1024"; //$NON-NLS-1$
private static final String CHECKSUM_TYPE = "MD5"; //$NON-NLS-1$
+ private static final String KEY_DERIVATION_SIZE = "128"; //$NON-NLS-1$
/**
* The randomizer
@@ -80,7 +92,6 @@ public PasswordProtectedNormalizer(String password) {
/*
* (non-Javadoc)
- *
* @see org.xmind.core.IEntryStreamNormalizer#normalizeOutputStream(java.io.
* OutputStream, org.xmind.core.IFileEntry)
*/
@@ -96,10 +107,14 @@ public OutputStream normalizeOutputStream(OutputStream stream,
encData.setAttribute(generateSalt(), TAG_KEY_DERIVATION, ATTR_SALT);
encData.setAttribute(KEY_DERIVATION_ITERATION_COUNT, TAG_KEY_DERIVATION,
ATTR_ITERATION_COUNT);
+ encData.setAttribute(KEY_DERIVATION_SIZE, TAG_KEY_DERIVATION,
+ ATTR_KEY_SIZE);
+ encData.setAttribute(generateIV(), TAG_KEY_DERIVATION, ATTR_KEY_IV);
encData.setChecksumType(CHECKSUM_TYPE);
- BufferedBlockCipher cipher = createCipher(true, encData, password);
- OutputStream out = new BlockCipherOutputStream(stream, cipher);
+ boolean oldEncrptWay = beforeEncrpt37(encData);
+ Cipher cipher = createCipher(true, oldEncrptWay, encData, password);
+ OutputStream out = new CipherOutputStream(stream, cipher);
if (encData.getChecksumType() != null) {
out = new ChecksumTrackingOutputStream(encData,
new ChecksumOutputStream(out));
@@ -107,9 +122,14 @@ public OutputStream normalizeOutputStream(OutputStream stream,
return out;
}
+ private boolean beforeEncrpt37(IEncryptionData encData) {
+ String keyAlgoName = encData.getAttribute(TAG_KEY_DERIVATION,
+ ATTR_KEY_DERIVATION_NAME);
+ return OLD37_KEY_DERIVATION_ALGORITHM_NAME.equals(keyAlgoName);
+ }
+
/*
* (non-Javadoc)
- *
* @see org.xmind.core.IEntryStreamNormalizer#normalizeInputStream(java.io.
* InputStream, org.xmind.core.IFileEntry)
*/
@@ -119,8 +139,9 @@ public InputStream normalizeInputStream(InputStream stream,
if (encData == null)
return stream;
- BufferedBlockCipher cipher = createCipher(false, encData, password);
- InputStream in = new BlockCipherInputStream(stream, cipher);
+ boolean oldEncrptWay = beforeEncrpt37(encData);
+ Cipher oldCipher = createCipher(false, oldEncrptWay, encData, password);
+ InputStream in = new CipherInputStream(stream, oldCipher);
if (encData.getChecksumType() != null) {
in = new ChecksumVerifiedInputStream(new ChecksumInputStream(in),
encData.getChecksum());
@@ -128,33 +149,72 @@ public InputStream normalizeInputStream(InputStream stream,
return in;
}
- private BufferedBlockCipher createCipher(boolean encrypt,
+ private Cipher createCipher(boolean encrypt, boolean oldWay,
IEncryptionData encData, String password) throws CoreException {
checkEncryptionData(encData);
+ Key aesKey = createKey(oldWay, encData, password);
+ byte[] iv = getIV(encData);
+ IvParameterSpec ivParameter = new IvParameterSpec(iv);
+ Cipher cipher = null;
+ try {
+ cipher = Cipher.getInstance(ALGORITHM_NAME);
+ } catch (NoSuchAlgorithmException e) {
+ throw new CoreException(Core.ERROR_FAIL_INIT_CRYPTOGRAM, e);
+ } catch (NoSuchPaddingException e) {
+ throw new CoreException(Core.ERROR_FAIL_INIT_CRYPTOGRAM, e);
+ }
+ try {
+ cipher.init(encrypt ? Cipher.ENCRYPT_MODE : Cipher.DECRYPT_MODE,
+ aesKey, ivParameter);
+ } catch (InvalidKeyException e) {
+ throw new CoreException(Core.ERROR_WRONG_PASSWORD, e);
+ } catch (InvalidAlgorithmParameterException e) {
+ throw new CoreException(Core.ERROR_FAIL_INIT_CRYPTOGRAM, e);
+ }
+ return cipher;
+ }
- // Create a parameter generator
- PKCS12ParametersGenerator paramGen = new PKCS12ParametersGenerator(
- new MD5Digest());
-
- // Get the password bytes
- byte[] pwBytes = password == null ? new byte[0]
- : PBEParametersGenerator
- .PKCS12PasswordToBytes(password.toCharArray());
-
- // Initialize the parameter generator with password bytes,
- // salt and iteration counts
- paramGen.init(pwBytes, getSalt(encData), getIterationCount(encData));
+ private Key createKey(boolean old, IEncryptionData encData, String password)
+ throws CoreException {
+ byte[] key = old ? getOldKeyByte(encData, password)
+ : getKeyByte(encData, password);
+ return new SecretKeySpec(key, "AES"); //$NON-NLS-1$
+ }
- // Generate a parameter
- CipherParameters param = paramGen.generateDerivedParameters(128);
+ private byte[] getKeyByte(IEncryptionData encData, String password)
+ throws CoreException {
+ SecretKeyFactory keyFactory = null;
+ try {
+ keyFactory = SecretKeyFactory
+ .getInstance(KEY_DERIVATION_ALGORITHM_NAME);
+ } catch (NoSuchAlgorithmException e) {
+ throw new CoreException(Core.ERROR_FAIL_INIT_CRYPTOGRAM, e);
+ }
- // Create a block cipher
- BufferedBlockCipher cipher = new PaddedBufferedBlockCipher(
- new CBCBlockCipher(new AESEngine()));
+ KeySpec keySpec = new PBEKeySpec(password.toCharArray(),
+ getSalt(encData), getIterationCount(encData),
+ getKeySize(encData));
+ try {
+ return keyFactory.generateSecret(keySpec).getEncoded();
+ } catch (InvalidKeySpecException e) {
+ throw new CoreException(Core.ERROR_WRONG_PASSWORD, e);
+ }
+ }
- // Initialize the block cipher
- cipher.init(encrypt, param);
- return cipher;
+ private byte[] getOldKeyByte(IEncryptionData encData, String password)
+ throws CoreException {
+ PKCS12KeyGenerator keyGen = null;
+ try {
+ keyGen = new PKCS12KeyGenerator(MessageDigest.getInstance("MD5")); //$NON-NLS-1$
+ } catch (NoSuchAlgorithmException e) {
+ throw new CoreException(Core.ERROR_FAIL_INIT_CRYPTOGRAM, e);
+ }
+ byte[] pwBytes = password == null ? new byte[0]
+ : PKCS12KeyGenerator
+ .PKCS12PasswordToBytes(password.toCharArray());
+ keyGen.init(pwBytes, getSalt(encData), getIterationCount(encData));
+ byte[] key = keyGen.generateDerivedKey(getKeySize(encData));
+ return key;
}
private void checkEncryptionData(IEncryptionData encData)
@@ -166,8 +226,9 @@ private void checkEncryptionData(IEncryptionData encData)
String keyAlgoName = encData.getAttribute(TAG_KEY_DERIVATION,
ATTR_KEY_DERIVATION_NAME);
- if (keyAlgoName == null
- || !KEY_DERIVATION_ALGORITHM_NAME.equals(keyAlgoName))
+ if (keyAlgoName == null || !(KEY_DERIVATION_ALGORITHM_NAME
+ .equals(keyAlgoName)
+ || OLD37_KEY_DERIVATION_ALGORITHM_NAME.equals(keyAlgoName)))
throw new CoreException(Core.ERROR_FAIL_INIT_CRYPTOGRAM);
}
@@ -183,9 +244,25 @@ private byte[] getSalt(IEncryptionData encData) throws CoreException {
return Base64.base64ToByteArray(saltString);
}
+ private byte[] getIV(IEncryptionData encData) throws CoreException {
+ String ivString = encData.getAttribute(TAG_KEY_DERIVATION, ATTR_KEY_IV);
+ if (ivString == null) {
+ return new byte[16];
+ }
+ return Base64.base64ToByteArray(ivString);
+ }
+
+ private int getKeySize(IEncryptionData encData) throws CoreException {
+ String keySizeString = encData.getAttribute(TAG_KEY_DERIVATION,
+ ATTR_KEY_SIZE);
+ if (keySizeString == null) {
+ return Integer.parseInt(KEY_DERIVATION_SIZE);
+ }
+ return Integer.parseInt(keySizeString);
+ }
+
/*
* (non-Javadoc)
- *
* @see java.lang.Object#equals(java.lang.Object)
*/
@Override
@@ -200,7 +277,6 @@ public boolean equals(Object obj) {
/*
* (non-Javadoc)
- *
* @see java.lang.Object#hashCode()
*/
@Override
@@ -218,10 +294,20 @@ private static String generateSalt() {
return Base64.byteArrayToBase64(generateSaltBytes());
}
+ private static String generateIV() {
+ return Base64.byteArrayToBase64(generateIVBytes());
+ }
+
private static byte[] generateSaltBytes() {
byte[] bytes = new byte[8];
getRandom().nextBytes(bytes);
return bytes;
}
+ private static byte[] generateIVBytes() {
+ byte[] bytes = new byte[16];
+ getRandom().nextBytes(bytes);
+ return bytes;
+ }
+
}
diff --git a/bundles/org.xmind.core.runtime/src/org/xmind/core/internal/xpath/Evaluator.java b/bundles/org.xmind.core.runtime/src/org/xmind/core/internal/xpath/Evaluator.java
index c72f8a905..e1129b749 100644
--- a/bundles/org.xmind.core.runtime/src/org/xmind/core/internal/xpath/Evaluator.java
+++ b/bundles/org.xmind.core.runtime/src/org/xmind/core/internal/xpath/Evaluator.java
@@ -18,6 +18,7 @@ public class Evaluator {
private static final String AXIS_ATTRIBUTE = "attribute"; //$NON-NLS-1$
private static final String AXIS_CHILD = "child"; //$NON-NLS-1$
private static final String AXIS_SELF = "self"; //$NON-NLS-1$
+ private static final String AXIS_PARENT = "parent"; //$NON-NLS-1$
private static final String KIND_TEXT = "text"; //$NON-NLS-1$
private static final String KIND_NODE = "node"; //$NON-NLS-1$
@@ -28,6 +29,7 @@ public class Evaluator {
private static final String TOKEN_PREDICATE_START = "["; //$NON-NLS-1$
private static final String TOKEN_PREDICATE_END = "]"; //$NON-NLS-1$
private static final String TOKEN_SELF = "."; //$NON-NLS-1$
+ private static final String TOKEN_PARENT = ".."; //$NON-NLS-1$
private static final String TOKEN_PAREN_START = "("; //$NON-NLS-1$
private static final String TOKEN_PAREN_END = ")"; //$NON-NLS-1$
private static final String TOKEN_ARGUMENT_SEPARATOR = ","; //$NON-NLS-1$
@@ -186,6 +188,10 @@ public List
*
* @author Frank Shaka
- * @since 3.6.50
*/
public interface IUsageDataSampler {
diff --git a/bundles/org.xmind.core/.settings/org.eclipse.jdt.core.prefs b/bundles/org.xmind.core/.settings/org.eclipse.jdt.core.prefs
index 88e8c61ba..49bffb015 100644
--- a/bundles/org.xmind.core/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.xmind.core/.settings/org.eclipse.jdt.core.prefs
@@ -106,6 +106,7 @@ org.eclipse.jdt.core.compiler.source=1.5
org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL,NORMAL,HIGH
org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,ATTN,Release
+org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
@@ -119,8 +120,10 @@ org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_for_loop_header=0
org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameterized_type_references=0
org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
@@ -130,11 +133,13 @@ org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration
org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_type_arguments=0
+org.eclipse.jdt.core.formatter.alignment_for_type_parameters=0
org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
org.eclipse.jdt.core.formatter.blank_lines_after_package=1
org.eclipse.jdt.core.formatter.blank_lines_before_field=0
-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=1
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
org.eclipse.jdt.core.formatter.blank_lines_before_method=1
@@ -189,6 +194,7 @@ org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
org.eclipse.jdt.core.formatter.indentation.size=4
org.eclipse.jdt.core.formatter.insert_new_line_after_annotation=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_enum_constant=insert
org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert
@@ -384,12 +390,24 @@ org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=true
org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
+org.eclipse.jdt.core.formatter.parentheses_positions_in_annotation=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_catch_clause=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_enum_constant_declaration=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_for_statment=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_if_while_statement=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_lambda_declaration=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_method_delcaration=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_method_invocation=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_switch_statement=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_try_clause=common_lines
org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
org.eclipse.jdt.core.formatter.tabulation.char=space
org.eclipse.jdt.core.formatter.tabulation.size=4
org.eclipse.jdt.core.formatter.use_on_off_tags=false
org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_assignment_operator=false
org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_conditional_operator=true
org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
org.eclipse.jdt.core.incompatibleJDKLevel=ignore
diff --git a/bundles/org.xmind.core/META-INF/MANIFEST.MF b/bundles/org.xmind.core/META-INF/MANIFEST.MF
index 998fa88c5..9229606e4 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.6.51.qualifier
+Bundle-Version: 3.7.0.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 55c7ee9ed..ba6fd0c6a 100644
--- a/bundles/org.xmind.core/pom.xml
+++ b/bundles/org.xmind.core/pom.xml
@@ -5,12 +5,12 @@
4.0.0org.xmind.cathy.pluginsorg.xmind.core
- 3.6.51-SNAPSHOT
+ 3.7.0-SNAPSHOTeclipse-pluginorg.xmind.relengorg.xmind.cathy.releng
- 3.6.51-SNAPSHOT
+ 3.7.0-SNAPSHOT../../
diff --git a/bundles/org.xmind.core/src/org/xmind/core/Core.java b/bundles/org.xmind.core/src/org/xmind/core/Core.java
index ad70055e7..7795b9f6d 100644
--- a/bundles/org.xmind.core/src/org/xmind/core/Core.java
+++ b/bundles/org.xmind.core/src/org/xmind/core/Core.java
@@ -16,8 +16,6 @@
import java.util.Comparator;
import java.util.UUID;
-import org.xmind.core.event.ICoreEventSource;
-import org.xmind.core.event.ICoreEventSource2;
import org.xmind.core.internal.InternalCore;
import org.xmind.core.marker.IMarkerSheetBuilder;
import org.xmind.core.style.IStyleSheetBuilder;
@@ -815,6 +813,8 @@ public class Core {
public static final String NumberingSeparator = "numberingSeparator"; //$NON-NLS-1$
+ public static final String NumberingDepth = "numberingDepth"; //$NON-NLS-1$
+
/**
* Core event type for changing the password of a workbook (value is
* 'passwordChange').
@@ -846,21 +846,12 @@ public class Core {
public static final String WorkbookPreSave = "workbookPreSave"; //$NON-NLS-1$
/**
- *
- * NOTE: Since 3.6.50, this value is the same with 'workbookPreSave', for
- * it's the client's responsibility to determine whether to use
- * {@link ICoreEventSource#registerCoreEventListener(String, org.xmind.core.event.ICoreEventListener)} or
- * {@link ICoreEventSource2#registerOnceCoreEventListener(String, org.xmind.core.event.ICoreEventListener)}.
- *
- *
- *
* Core event type for going to save a workbook (value is
- * 'workbookPreSave'). Similar to {@link #WorkbookPreSave}, but listeners to
- * this type events are notified only once and removed from the event list
- * thereafter. This type of events are commonly used when some pending work
- * that may modify the content of a workbook should be counted before saving
- * the workbook.
- *
+ * 'workbookPreSaveOnce'). Similar to {@link #WorkbookPreSave}, but
+ * listeners to this type events are notified only once and removed from the
+ * event list thereafter. This type of events are commonly used when some
+ * pending work that may modify the content of a workbook should be counted
+ * before saving the workbook.
*
*
*
Source:
@@ -872,7 +863,7 @@ public class Core {
* @see org.xmind.core.IWorkbook#save(java.io.OutputStream)
* @see org.xmind.core.IWorkbook#save(String)
*/
- public static final String WorkbookPreSaveOnce = "workbookPreSave"; //$NON-NLS-1$
+ public static final String WorkbookPreSaveOnce = "workbookPreSaveOnce"; //$NON-NLS-1$
/**
* Core event type for having saved a workbook (value is 'workbookSave').
diff --git a/bundles/org.xmind.core/src/org/xmind/core/IDeserializer.java b/bundles/org.xmind.core/src/org/xmind/core/IDeserializer.java
index 051971eb2..7c46120df 100644
--- a/bundles/org.xmind.core/src/org/xmind/core/IDeserializer.java
+++ b/bundles/org.xmind.core/src/org/xmind/core/IDeserializer.java
@@ -44,6 +44,11 @@
*/
public interface IDeserializer extends ISerializingBase {
+ IManifest getManifest();
+
+ void deserializeManifest(IProgressReporter reporter)
+ throws IOException, CoreException, IllegalStateException;
+
/**
* Returns the deserialized workbook.
*
diff --git a/bundles/org.xmind.core/src/org/xmind/core/IEncryptionData.java b/bundles/org.xmind.core/src/org/xmind/core/IEncryptionData.java
index b872ab8f9..3910cc33b 100644
--- a/bundles/org.xmind.core/src/org/xmind/core/IEncryptionData.java
+++ b/bundles/org.xmind.core/src/org/xmind/core/IEncryptionData.java
@@ -14,7 +14,7 @@
package org.xmind.core;
/**
- * @author Frank Shaka
+ * @author frankshaka
*
*/
public interface IEncryptionData extends IAdaptable {
diff --git a/bundles/org.xmind.core/src/org/xmind/core/IExtensionElement.java b/bundles/org.xmind.core/src/org/xmind/core/IExtensionElement.java
new file mode 100644
index 000000000..c38edb8ab
--- /dev/null
+++ b/bundles/org.xmind.core/src/org/xmind/core/IExtensionElement.java
@@ -0,0 +1,43 @@
+package org.xmind.core;
+
+import java.util.List;
+import java.util.Set;
+
+/**
+ * @author Jason Wong
+ */
+public interface IExtensionElement {
+
+ List getChildren();
+
+ List getChildren(String elementName);
+
+ T createChild(String elementName);
+
+ T getCreatedChild(String elementName);
+
+ T getFirstChild(String elementName);
+
+ T getParent();
+
+ void addChild(T child, int index);
+
+ void deleteChild(T child);
+
+ void deleteChildren(String elementName);
+
+ void deleteChildren();
+
+ String getName();
+
+ Set getAttributeKeys();
+
+ String getAttribute(String attrName);
+
+ void setAttribute(String attrName, String attrValue);
+
+ String getTextContent();
+
+ void setTextContent(String text);
+
+}
diff --git a/bundles/org.xmind.core/src/org/xmind/core/IManifest.java b/bundles/org.xmind.core/src/org/xmind/core/IManifest.java
index 94c2abcf5..b731683fe 100644
--- a/bundles/org.xmind.core/src/org/xmind/core/IManifest.java
+++ b/bundles/org.xmind.core/src/org/xmind/core/IManifest.java
@@ -32,6 +32,10 @@
*/
public interface IManifest extends IWorkbookComponent, IAdaptable {
+ String getPasswordHint();
+
+ void setPasswordHint(String hint);
+
/**
* Lists all existing file entries that has at least one reference.
*
diff --git a/bundles/org.xmind.core/src/org/xmind/core/INumbering.java b/bundles/org.xmind.core/src/org/xmind/core/INumbering.java
index fe242fe27..3cea4f290 100644
--- a/bundles/org.xmind.core/src/org/xmind/core/INumbering.java
+++ b/bundles/org.xmind.core/src/org/xmind/core/INumbering.java
@@ -23,6 +23,8 @@ public interface INumbering extends IAdaptable, ITopicComponent {
String getSeparator();
+ String getDepth();
+
boolean prependsParentNumbers();
void setFormat(String format);
@@ -33,6 +35,8 @@ public interface INumbering extends IAdaptable, ITopicComponent {
void setSeparator(String separator);
+ void setDepth(String depth);
+
void setPrependsParentNumbers(boolean prepend);
String getParentFormat();
@@ -43,4 +47,8 @@ public interface INumbering extends IAdaptable, ITopicComponent {
String getComputedSeparator();
+ int getComputedDepth();
+
+ boolean isInherited(int min);
+
}
\ No newline at end of file
diff --git a/bundles/org.xmind.core/src/org/xmind/core/ISerializerFactory.java b/bundles/org.xmind.core/src/org/xmind/core/ISerializerFactory.java
new file mode 100644
index 000000000..259ddc906
--- /dev/null
+++ b/bundles/org.xmind.core/src/org/xmind/core/ISerializerFactory.java
@@ -0,0 +1,31 @@
+/* ******************************************************************************
+ * Copyright (c) 2006-2016 XMind Ltd. and others.
+ *
+ * This file is a part of XMind 3. XMind releases 3 and
+ * above are dual-licensed under the Eclipse Public License (EPL),
+ * which is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the GNU Lesser General Public License (LGPL),
+ * which is available at http://www.gnu.org/licenses/lgpl.html
+ * See http://www.xmind.net/license.html for details.
+ *
+ * Contributors:
+ * XMind Ltd. - initial API and implementation
+ *******************************************************************************/
+package org.xmind.core;
+
+/**
+ * This class is used to create new serializer instances.
+ *
+ * @author Frank Shaka
+ * @since 3.6.2
+ */
+public interface ISerializerFactory {
+
+ /**
+ * Creates a new serializer instance.
+ *
+ * @return a new serializer instance (never null)
+ */
+ ISerializer newSerializer();
+
+}
diff --git a/bundles/org.xmind.core/src/org/xmind/core/ISettingEntry.java b/bundles/org.xmind.core/src/org/xmind/core/ISettingEntry.java
index 99e113ded..a40f2df72 100644
--- a/bundles/org.xmind.core/src/org/xmind/core/ISettingEntry.java
+++ b/bundles/org.xmind.core/src/org/xmind/core/ISettingEntry.java
@@ -2,11 +2,6 @@
import java.util.Set;
-/**
- *
- * @author Jason Wong
- * @since 3.6.50
- */
public interface ISettingEntry extends IAdaptable, ISheetComponent {
String getPath();
diff --git a/bundles/org.xmind.core/src/org/xmind/core/ISheetSettings.java b/bundles/org.xmind.core/src/org/xmind/core/ISheetSettings.java
index 673b38474..441ddc947 100644
--- a/bundles/org.xmind.core/src/org/xmind/core/ISheetSettings.java
+++ b/bundles/org.xmind.core/src/org/xmind/core/ISheetSettings.java
@@ -4,9 +4,7 @@
import java.util.Set;
/**
- *
* @author Jason Wong
- * @since 3.6.50
*/
public interface ISheetSettings extends IAdaptable, ISheetComponent {
diff --git a/bundles/org.xmind.core/src/org/xmind/core/ITopicExtensionElement.java b/bundles/org.xmind.core/src/org/xmind/core/ITopicExtensionElement.java
index e1d9a03f4..cf052cf99 100644
--- a/bundles/org.xmind.core/src/org/xmind/core/ITopicExtensionElement.java
+++ b/bundles/org.xmind.core/src/org/xmind/core/ITopicExtensionElement.java
@@ -13,45 +13,11 @@
*******************************************************************************/
package org.xmind.core;
-import java.util.List;
-import java.util.Set;
-
-public interface ITopicExtensionElement extends IAdaptable, IWorkbookComponent {
+public interface ITopicExtensionElement extends IAdaptable, IWorkbookComponent,
+ IExtensionElement {
ITopicExtension getExtension();
ITopic getTopic();
- List getChildren();
-
- List getChildren(String elementName);
-
- ITopicExtensionElement createChild(String elementName);
-
- ITopicExtensionElement getCreatedChild(String elementName);
-
- ITopicExtensionElement getFirstChild(String elementName);
-
- ITopicExtensionElement getParent();
-
- void addChild(ITopicExtensionElement child, int index);
-
- void deleteChild(ITopicExtensionElement child);
-
- void deleteChildren(String elementName);
-
- void deleteChildren();
-
- String getName();
-
- Set getAttributeKeys();
-
- String getAttribute(String attrName);
-
- void setAttribute(String attrName, String attrValue);
-
- String getTextContent();
-
- void setTextContent(String text);
-
}
\ No newline at end of file
diff --git a/bundles/org.xmind.core/src/org/xmind/core/IWorkbookBuilder.java b/bundles/org.xmind.core/src/org/xmind/core/IWorkbookBuilder.java
index 74f95377f..51cfe5375 100644
--- a/bundles/org.xmind.core/src/org/xmind/core/IWorkbookBuilder.java
+++ b/bundles/org.xmind.core/src/org/xmind/core/IWorkbookBuilder.java
@@ -166,7 +166,7 @@ IWorkbook loadFromPath(String path, IEncryptionHandler encryptionHandler)
@Deprecated
IWorkbook loadFromPath(String path, IStorage storage,
IEncryptionHandler encryptionHandler)
- throws IOException, CoreException;
+ throws IOException, CoreException;
/**
* Creates a workbook instance and loads its content from the specified
@@ -238,7 +238,7 @@ IWorkbook loadFromFile(File file, IEncryptionHandler encryptionHandler)
@Deprecated
IWorkbook loadFromFile(File file, IStorage storage,
IEncryptionHandler encryptionHandler)
- throws IOException, CoreException;
+ throws IOException, CoreException;
/**
* Creates a workbook instance and loads its content from the specified
@@ -331,7 +331,7 @@ IWorkbook loadFromStream(InputStream in, IStorage storage)
@Deprecated
IWorkbook loadFromStream(InputStream in, IStorage storage,
IEncryptionHandler encryptionHandler)
- throws IOException, CoreException;
+ throws IOException, CoreException;
/**
* Creates a workbook instance and loads its content from the specified
@@ -374,7 +374,7 @@ IWorkbook loadFromInputSource(IInputSource source)
@Deprecated
IWorkbook loadFromInputSource(IInputSource source,
IEncryptionHandler encryptionHandler)
- throws IOException, CoreException;
+ throws IOException, CoreException;
/**
* Creates a workbook instance and loads its content from the specified
@@ -405,7 +405,7 @@ IWorkbook loadFromInputSource(IInputSource source,
@Deprecated
IWorkbook loadFromInputSource(IInputSource source, IStorage storage,
IEncryptionHandler encryptionHandler)
- throws IOException, CoreException;
+ throws IOException, CoreException;
/**
* Creates a new workbook instance and loads its content directly
@@ -469,7 +469,7 @@ IWorkbook loadFromStorage(IStorage storage)
@Deprecated
IWorkbook loadFromStorage(IStorage storage,
IEncryptionHandler encryptionHandler)
- throws IOException, CoreException;
+ throws IOException, CoreException;
/**
* Sets the default encryption handler to use for loadFromXXX methods.
@@ -506,7 +506,7 @@ IWorkbook loadFromStream(InputStream in, String tempLocation)
@Deprecated
IWorkbook loadFromStream(InputStream in, String tempLocation,
IEncryptionHandler encryptionHandler)
- throws IOException, CoreException;
+ throws IOException, CoreException;
/**
* @deprecated See {@link org.xmind.core.IDeserializer}
diff --git a/bundles/org.xmind.core/src/org/xmind/core/IWorkbookExtension.java b/bundles/org.xmind.core/src/org/xmind/core/IWorkbookExtension.java
new file mode 100644
index 000000000..837c20cc4
--- /dev/null
+++ b/bundles/org.xmind.core/src/org/xmind/core/IWorkbookExtension.java
@@ -0,0 +1,22 @@
+package org.xmind.core;
+
+import java.util.List;
+
+/**
+ * @author Jason Wong
+ */
+public interface IWorkbookExtension extends IAdaptable, IWorkbookComponent {
+
+ String getProviderName();
+
+ IWorkbookExtensionElement getContent();
+
+ List getResourceRefs();
+
+ void addResourceRef(IResourceRef ref);
+
+ void removeResourceRef(IResourceRef ref);
+
+ IResourceRef getResourceRef(String resourceId);
+
+}
diff --git a/bundles/org.xmind.core/src/org/xmind/core/IWorkbookExtensionElement.java b/bundles/org.xmind.core/src/org/xmind/core/IWorkbookExtensionElement.java
new file mode 100644
index 000000000..7832cdb8d
--- /dev/null
+++ b/bundles/org.xmind.core/src/org/xmind/core/IWorkbookExtensionElement.java
@@ -0,0 +1,19 @@
+package org.xmind.core;
+
+/**
+ * @author Jason Wong
+ */
+public interface IWorkbookExtensionElement extends IAdaptable,
+ IWorkbookComponent, IExtensionElement {
+
+ IWorkbookExtension getExtension();
+
+ void setResourcePath(String resourcePath);
+
+ String getResourcePath();
+
+ void setObjectId(String objectId);
+
+ String getObjectId();
+
+}
diff --git a/bundles/org.xmind.core/src/org/xmind/core/IWorkbookExtensionManager.java b/bundles/org.xmind.core/src/org/xmind/core/IWorkbookExtensionManager.java
new file mode 100644
index 000000000..020d795ae
--- /dev/null
+++ b/bundles/org.xmind.core/src/org/xmind/core/IWorkbookExtensionManager.java
@@ -0,0 +1,20 @@
+package org.xmind.core;
+
+import java.util.List;
+
+/**
+ * @author Jason Wong
+ */
+public interface IWorkbookExtensionManager extends IWorkbookComponent {
+
+ List getExtensions();
+
+ IWorkbookExtension getExtension(String providerName);
+
+ IWorkbookExtension createExtension(String providerName);
+
+ void deleteExtension(String providerName);
+
+ List getProviders();
+
+}
diff --git a/bundles/org.xmind.core/src/org/xmind/core/IWorkspace.java b/bundles/org.xmind.core/src/org/xmind/core/IWorkspace.java
index b5c5ecb6d..c38c22510 100644
--- a/bundles/org.xmind.core/src/org/xmind/core/IWorkspace.java
+++ b/bundles/org.xmind.core/src/org/xmind/core/IWorkspace.java
@@ -20,9 +20,8 @@
* temporary and preference data.
*
*
- * NOTE:
- * This interface is not intended to be implemented by client. Use
- * the facade method Core.getWorkspace() to get a singleton
+ * NOTE:This interface is not intended to be implemented by client.
+ * Use the facade method Core.getWorkspace() to get a singleton
* instance.
*
*
diff --git a/bundles/org.xmind.core/src/org/xmind/core/internal/Numbering.java b/bundles/org.xmind.core/src/org/xmind/core/internal/Numbering.java
index 23f21041f..2c82e1dd5 100644
--- a/bundles/org.xmind.core/src/org/xmind/core/internal/Numbering.java
+++ b/bundles/org.xmind.core/src/org/xmind/core/internal/Numbering.java
@@ -59,4 +59,43 @@ public String getComputedSeparator() {
return getParentSeparator();
}
+ public int getComputedDepth() {
+ String nf = getNumberFormat();
+ String noneFormat = "org.xmind.numbering.none"; //$NON-NLS-1$
+
+ if (noneFormat.equals(nf))
+ return -1;
+
+ String dv = getDepth();
+ if (dv != null)
+ return Integer.parseInt(dv);
+
+ if (isInherited(1))
+ return getParent().getParent().getNumbering().getComputedDepth()
+ - 1;
+ else if (getNumberFormat() != null)
+ return 3;
+
+ return -1;
+ }
+
+ public boolean isInherited(int min) {
+ ITopic topic = getParent();
+ if (!ITopic.ATTACHED.equals(topic.getType()))
+ return false;
+
+ if (getDepth() != null)
+ return false;
+
+ if ("org.xmind.numbering.none".equals(getNumberFormat())) //$NON-NLS-1$
+ return false;
+
+ ITopic parentTopic = topic.getParent();
+ if (parentTopic == null)
+ return false;
+
+ int pd = parentTopic.getNumbering().getComputedDepth();
+ return pd > min;
+ }
+
}
\ No newline at end of file
diff --git a/bundles/org.xmind.core/src/org/xmind/core/internal/WorkbookExtension.java b/bundles/org.xmind.core/src/org/xmind/core/internal/WorkbookExtension.java
new file mode 100644
index 000000000..65cedfe11
--- /dev/null
+++ b/bundles/org.xmind.core/src/org/xmind/core/internal/WorkbookExtension.java
@@ -0,0 +1,24 @@
+package org.xmind.core.internal;
+
+import java.util.Collections;
+import java.util.List;
+
+import org.xmind.core.IResourceRef;
+import org.xmind.core.IWorkbook;
+import org.xmind.core.IWorkbookExtension;
+
+/**
+ * @author Jason Wong
+ */
+public abstract class WorkbookExtension implements IWorkbookExtension {
+
+ public T getAdapter(Class adapter) {
+ if (IWorkbook.class.equals(adapter))
+ return adapter.cast(getOwnedWorkbook());
+ return null;
+ }
+
+ protected static final List EMPTY_REFS = Collections
+ .emptyList();
+
+}
diff --git a/bundles/org.xmind.core/src/org/xmind/core/internal/WorkbookExtensionElement.java b/bundles/org.xmind.core/src/org/xmind/core/internal/WorkbookExtensionElement.java
new file mode 100644
index 000000000..beb602e0d
--- /dev/null
+++ b/bundles/org.xmind.core/src/org/xmind/core/internal/WorkbookExtensionElement.java
@@ -0,0 +1,20 @@
+package org.xmind.core.internal;
+
+import java.util.List;
+
+import org.xmind.core.IWorkbookExtensionElement;
+
+/**
+ * @author Jason Wong
+ */
+public abstract class WorkbookExtensionElement extends AbstractWorkbookComponent
+ implements IWorkbookExtensionElement {
+
+ public IWorkbookExtensionElement getCreatedChild(String elementName) {
+ List children = getChildren(elementName);
+ if (!children.isEmpty())
+ return children.get(0);
+ return createChild(elementName);
+ }
+
+}
diff --git a/bundles/org.xmind.core/src/org/xmind/core/internal/WorkbookExtensionManager.java b/bundles/org.xmind.core/src/org/xmind/core/internal/WorkbookExtensionManager.java
new file mode 100644
index 000000000..2cce88fac
--- /dev/null
+++ b/bundles/org.xmind.core/src/org/xmind/core/internal/WorkbookExtensionManager.java
@@ -0,0 +1,11 @@
+package org.xmind.core.internal;
+
+import org.xmind.core.IWorkbookExtensionManager;
+
+/**
+ * @author Jason Wong
+ */
+public abstract class WorkbookExtensionManager
+ implements IWorkbookExtensionManager {
+
+}
diff --git a/bundles/org.xmind.core/src/org/xmind/core/internal/dom/BaseNotesContentImpl.java b/bundles/org.xmind.core/src/org/xmind/core/internal/dom/BaseNotesContentImpl.java
index 38f937748..95edb3470 100644
--- a/bundles/org.xmind.core/src/org/xmind/core/internal/dom/BaseNotesContentImpl.java
+++ b/bundles/org.xmind.core/src/org/xmind/core/internal/dom/BaseNotesContentImpl.java
@@ -38,10 +38,9 @@ public BaseNotesContentImpl(Element implementation,
this.ownedWorkbook = ownedWorkbook;
}
- public Object getAdapter(Class adapter) {
- if (adapter == Node.class || adapter == Element.class)
- return implementation;
-
+ public T getAdapter(Class adapter) {
+ if (adapter.isAssignableFrom(Element.class))
+ return adapter.cast(implementation);
return super.getAdapter(adapter);
}
@@ -105,7 +104,6 @@ public IWorkbook getOwnedWorkbook() {
/*
* (non-Javadoc)
- *
* @see org.xmind.core.IWorkbookComponent#isOrphan()
*/
public boolean isOrphan() {
@@ -123,4 +121,4 @@ protected void updateModifiedTime() {
}
}
-}
\ No newline at end of file
+}
diff --git a/bundles/org.xmind.core/src/org/xmind/core/internal/dom/BoundaryImpl.java b/bundles/org.xmind.core/src/org/xmind/core/internal/dom/BoundaryImpl.java
index ab485a05d..09ebc1410 100644
--- a/bundles/org.xmind.core/src/org/xmind/core/internal/dom/BoundaryImpl.java
+++ b/bundles/org.xmind.core/src/org/xmind/core/internal/dom/BoundaryImpl.java
@@ -51,11 +51,11 @@ public Element getImplementation() {
return implementation;
}
- public Object getAdapter(Class adapter) {
- if (adapter == ICoreEventSource.class)
- return this;
- if (adapter == Node.class || adapter == Element.class)
- return implementation;
+ public T getAdapter(Class adapter) {
+ if (ICoreEventSource.class.equals(adapter))
+ return adapter.cast(this);
+ if (adapter.isAssignableFrom(Element.class))
+ return adapter.cast(implementation);
return super.getAdapter(adapter);
}
@@ -288,4 +288,4 @@ protected void updateModificationInfo() {
}
}
-}
\ No newline at end of file
+}
diff --git a/bundles/org.xmind.core/src/org/xmind/core/internal/dom/CommentImpl.java b/bundles/org.xmind.core/src/org/xmind/core/internal/dom/CommentImpl.java
index ec8a28955..8aa06f145 100644
--- a/bundles/org.xmind.core/src/org/xmind/core/internal/dom/CommentImpl.java
+++ b/bundles/org.xmind.core/src/org/xmind/core/internal/dom/CommentImpl.java
@@ -21,7 +21,6 @@
import static org.xmind.core.internal.dom.DOMConstants.TAG_CONTENT;
import org.w3c.dom.Element;
-import org.w3c.dom.Node;
import org.xmind.core.Core;
import org.xmind.core.IComment;
import org.xmind.core.IWorkbook;
@@ -33,7 +32,6 @@
/**
* @author Frank Shaka
- *
*/
public class CommentImpl implements IComment, ICoreEventSource {
@@ -41,11 +39,15 @@ public class CommentImpl implements IComment, ICoreEventSource {
private final Element implementation;
+ private CommentManagerImpl ownedCommentManager;
+
/**
*
*/
- public CommentImpl(WorkbookImpl ownerWorkbook, Element implementation) {
+ public CommentImpl(WorkbookImpl ownerWorkbook,
+ CommentManagerImpl ownedCommentManager, Element implementation) {
this.ownerWorkbook = ownerWorkbook;
+ this.ownedCommentManager = ownedCommentManager;
this.implementation = implementation;
}
@@ -58,13 +60,12 @@ public Element getImplementation() {
/*
* (non-Javadoc)
- *
* @see org.xmind.core.IAdaptable#getAdapter(java.lang.Class)
*/
public T getAdapter(Class adapter) {
if (IWorkbook.class.equals(adapter))
return adapter.cast(getOwnedWorkbook());
- if (Node.class.equals(adapter) || Element.class.equals(adapter))
+ if (adapter.isAssignableFrom(Element.class))
return adapter.cast(implementation);
if (ICoreEventSupport.class.equals(adapter))
return adapter.cast(getCoreEventSupport());
@@ -73,7 +74,6 @@ public T getAdapter(Class adapter) {
/*
* (non-Javadoc)
- *
* @see org.xmind.core.IWorkbookComponent#getOwnedWorkbook()
*/
public IWorkbook getOwnedWorkbook() {
@@ -82,7 +82,6 @@ public IWorkbook getOwnedWorkbook() {
/*
* (non-Javadoc)
- *
* @see org.xmind.core.IWorkbookComponent#isOrphan()
*/
public boolean isOrphan() {
@@ -91,7 +90,6 @@ public boolean isOrphan() {
/*
* (non-Javadoc)
- *
* @see java.lang.Comparable#compareTo(java.lang.Object)
*/
public int compareTo(IComment that) {
@@ -100,7 +98,6 @@ public int compareTo(IComment that) {
/*
* (non-Javadoc)
- *
* @see org.xmind.core.IComment#getObjectId()
*/
public String getObjectId() {
@@ -109,7 +106,6 @@ public String getObjectId() {
/*
* (non-Javadoc)
- *
* @see org.xmind.core.IComment#getAuthor()
*/
public String getAuthor() {
@@ -118,7 +114,6 @@ public String getAuthor() {
/*
* (non-Javadoc)
- *
* @see org.xmind.core.IComment#getTime()
*/
public long getTime() {
@@ -129,7 +124,6 @@ public long getTime() {
/*
* (non-Javadoc)
- *
* @see org.xmind.core.IComment#getContent()
*/
public String getContent() {
@@ -138,7 +132,6 @@ public String getContent() {
/*
* (non-Javadoc)
- *
* @see org.xmind.core.IComment#setContent(java.lang.String)
*/
public void setContent(String content) {
@@ -150,11 +143,11 @@ public void setContent(String content) {
DOMUtils.setText(implementation, TAG_CONTENT, content);
getCoreEventSupport().dispatchValueChange(this, Core.CommentContent,
oldContent, content);
+ updateModificationInfo();
}
/*
* (non-Javadoc)
- *
* @see
* org.xmind.core.event.ICoreEventSource#registerCoreEventListener(java.lang
* .String, org.xmind.core.event.ICoreEventListener)
@@ -167,11 +160,16 @@ public ICoreEventRegistration registerCoreEventListener(String type,
/*
* (non-Javadoc)
- *
* @see org.xmind.core.event.ICoreEventSource#getCoreEventSupport()
*/
public ICoreEventSupport getCoreEventSupport() {
return ownerWorkbook.getCoreEventSupport();
}
+ protected void updateModificationInfo() {
+ if (ownedCommentManager != null) {
+ ownedCommentManager.updateModificationInfo();
+ }
+ }
+
}
diff --git a/bundles/org.xmind.core/src/org/xmind/core/internal/dom/CommentManagerImpl.java b/bundles/org.xmind.core/src/org/xmind/core/internal/dom/CommentManagerImpl.java
index 671d0efd9..95b684aeb 100644
--- a/bundles/org.xmind.core/src/org/xmind/core/internal/dom/CommentManagerImpl.java
+++ b/bundles/org.xmind.core/src/org/xmind/core/internal/dom/CommentManagerImpl.java
@@ -41,12 +41,11 @@
/**
* @author Frank Shaka
- *
*/
public class CommentManagerImpl
implements ICommentManager, INodeAdaptableFactory {
- private final WorkbookImpl ownerWorkbook;
+ private final WorkbookImpl ownedWorkbook;
private final Document implementation;
@@ -59,7 +58,7 @@ public class CommentManagerImpl
*/
public CommentManagerImpl(WorkbookImpl ownerWorkbook,
Document implementation) {
- this.ownerWorkbook = ownerWorkbook;
+ this.ownedWorkbook = ownerWorkbook;
this.implementation = implementation;
this.registry = new NodeAdaptableRegistry(implementation, this);
this.pendingComments = new HashSet();
@@ -78,7 +77,6 @@ private Element getCommentsElement() {
/*
* (non-Javadoc)
- *
* @see org.xmind.core.IAdaptable#getAdapter(java.lang.Class)
*/
public T getAdapter(Class adapter) {
@@ -91,16 +89,14 @@ public T getAdapter(Class adapter) {
/*
* (non-Javadoc)
- *
* @see org.xmind.core.IWorkbookComponent#getOwnedWorkbook()
*/
public IWorkbook getOwnedWorkbook() {
- return ownerWorkbook;
+ return ownedWorkbook;
}
/*
* (non-Javadoc)
- *
* @see org.xmind.core.IWorkbookComponent#isOrphan()
*/
public boolean isOrphan() {
@@ -118,7 +114,7 @@ protected void objectAddNotify(String objectId, Object obj) {
if (ele.getParentNode() != p) {
p.appendChild(ele);
if (obj instanceof ICoreEventSource) {
- ownerWorkbook.getCoreEventSupport()
+ ownedWorkbook.getCoreEventSupport()
.dispatchTargetChange((ICoreEventSource) obj,
Core.CommentAdd, c);
}
@@ -143,7 +139,7 @@ protected void objectRemoveNotify(String objectId, Object obj) {
CommentImpl c = (CommentImpl) a;
pendingComments.add(c);
if (obj instanceof ICoreEventSource) {
- ownerWorkbook.getCoreEventSupport()
+ ownedWorkbook.getCoreEventSupport()
.dispatchTargetChange(
(ICoreEventSource) obj,
Core.CommentRemove, c);
@@ -158,7 +154,6 @@ protected void objectRemoveNotify(String objectId, Object obj) {
/*
* (non-Javadoc)
- *
* @see org.xmind.core.ICommentManager#createComment(java.lang.String, long,
* java.lang.String)
*/
@@ -175,7 +170,7 @@ public IComment createComment(String author, long time, String objectId) {
DOMUtils.setAttribute(ele, ATTR_TIME, Long.toString(time));
DOMUtils.setAttribute(ele, ATTR_OBJECT_ID, objectId);
- CommentImpl c = new CommentImpl(ownerWorkbook, ele);
+ CommentImpl c = new CommentImpl(ownedWorkbook, this, ele);
registry.register(c, ele);
return c;
}
@@ -187,7 +182,6 @@ private static boolean isObjectOrphan(Object obj) {
/*
* (non-Javadoc)
- *
* @see org.xmind.core.ICommentManager#addCommand(org.xmind.core.IComment)
*/
public void addComment(IComment comment) {
@@ -201,7 +195,7 @@ public void addComment(IComment comment) {
if (ele.getParentNode() == p)
return;
- Object obj = ownerWorkbook.getElementById(c.getObjectId());
+ Object obj = ownedWorkbook.getElementById(c.getObjectId());
if (obj == null || isObjectOrphan(obj)) {
/// associated object not exist,
/// add comment to pending set
@@ -211,14 +205,14 @@ public void addComment(IComment comment) {
p.appendChild(ele);
if (obj instanceof ICoreEventSource) {
- ownerWorkbook.getCoreEventSupport().dispatchTargetChange(
+ ownedWorkbook.getCoreEventSupport().dispatchTargetChange(
(ICoreEventSource) obj, Core.CommentAdd, c);
}
+ updateModificationInfo();
}
/*
* (non-Javadoc)
- *
* @see
* org.xmind.core.ICommentManager#removeComment(org.xmind.core.IComment)
*/
@@ -238,16 +232,16 @@ public void removeComment(IComment comment) {
p.removeChild(ele);
- Object obj = ownerWorkbook.getElementById(c.getObjectId());
+ Object obj = ownedWorkbook.getElementById(c.getObjectId());
if (obj instanceof ICoreEventSource) {
- ownerWorkbook.getCoreEventSupport().dispatchTargetChange(
+ ownedWorkbook.getCoreEventSupport().dispatchTargetChange(
(ICoreEventSource) obj, Core.CommentRemove, c);
}
+ updateModificationInfo();
}
/*
* (non-Javadoc)
- *
* @see org.xmind.core.ICommentManager#getComments(java.lang.String)
*/
public Set getComments(String objectId) {
@@ -276,7 +270,6 @@ public Set getComments(String objectId) {
/*
* (non-Javadoc)
- *
* @see org.xmind.core.ICommentManager#hasComments(java.lang.String)
*/
public boolean hasComments(String objectId) {
@@ -305,7 +298,6 @@ public boolean hasComments(String objectId) {
/*
* (non-Javadoc)
- *
* @see org.xmind.core.ICommentManager#getAllComments()
*/
public Set getAllComments() {
@@ -328,7 +320,6 @@ public Set getAllComments() {
/*
* (non-Javadoc)
- *
* @see org.xmind.core.ICommentManager#isEmpty()
*/
public boolean isEmpty() {
@@ -350,7 +341,6 @@ public boolean isEmpty() {
/*
* (non-Javadoc)
- *
* @see
* org.xmind.core.internal.dom.INodeAdaptableFactory#createAdaptable(org.w3c
* .dom.Node)
@@ -360,10 +350,16 @@ public IAdaptable createAdaptable(Node node) {
Element ele = (Element) node;
String tag = ele.getTagName();
if (TAG_COMMENT.equals(tag)) {
- return new CommentImpl(ownerWorkbook, ele);
+ return new CommentImpl(ownedWorkbook, this, ele);
}
}
return null;
}
+ protected void updateModificationInfo() {
+ if (ownedWorkbook != null) {
+ ownedWorkbook.updateModificationInfo();
+ }
+ }
+
}
diff --git a/bundles/org.xmind.core/src/org/xmind/core/internal/dom/ControlPointImpl.java b/bundles/org.xmind.core/src/org/xmind/core/internal/dom/ControlPointImpl.java
index a079745ed..96efe8fcf 100644
--- a/bundles/org.xmind.core/src/org/xmind/core/internal/dom/ControlPointImpl.java
+++ b/bundles/org.xmind.core/src/org/xmind/core/internal/dom/ControlPointImpl.java
@@ -26,7 +26,6 @@
import java.util.Iterator;
import org.w3c.dom.Element;
-import org.w3c.dom.Node;
import org.xmind.core.Core;
import org.xmind.core.IRelationship;
import org.xmind.core.ISheet;
@@ -83,13 +82,13 @@ public String toString() {
return "CP{" + index + "," + parent.toString() + "}"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
}
- public Object getAdapter(Class adapter) {
- if (adapter == ICoreEventSource.class)
- return this;
- if (adapter == Node.class || adapter == Element.class)
- return getImplementation();
- if (adapter == IRelationship.class)
- return parent;
+ public T getAdapter(Class adapter) {
+ if (ICoreEventSource.class.equals(adapter))
+ return adapter.cast(this);
+ if (adapter.isAssignableFrom(Element.class))
+ return adapter.cast(getImplementation());
+ if (IRelationship.class.equals(adapter))
+ return adapter.cast(parent);
return super.getAdapter(adapter);
}
@@ -284,4 +283,4 @@ public ICoreEventRegistration registerCoreEventListener(String type,
listener);
}
-}
\ No newline at end of file
+}
diff --git a/bundles/org.xmind.core/src/org/xmind/core/internal/dom/DOMConstants.java b/bundles/org.xmind.core/src/org/xmind/core/internal/dom/DOMConstants.java
index 829b7a559..b6faa1b12 100644
--- a/bundles/org.xmind.core/src/org/xmind/core/internal/dom/DOMConstants.java
+++ b/bundles/org.xmind.core/src/org/xmind/core/internal/dom/DOMConstants.java
@@ -15,7 +15,6 @@
/**
* @author briansun
- *
*/
public class DOMConstants {
@@ -84,17 +83,21 @@ public class DOMConstants {
public static final String ATTR_NEXT_REVISION_NUMBER = "next-rev-num"; //$NON-NLS-1$
public static final String ATTR_NUMBER_FORMAT = "number-format"; //$NON-NLS-1$
public static final String ATTR_NUMBER_SEPARATOR = "number-separator"; //$NON-NLS-1$
+ public static final String ATTR_NUMBER_DEPTH = "number-depth"; //$NON-NLS-1$
public static final String ATTR_OBJECT_ID = "object-id"; //$NON-NLS-1$
public static final String ATTR_OPACITY = "svg:opacity"; //$NON-NLS-1$
public static final String ATTR_PREPENDING_NUMBERS = "prepending-numbers"; //$NON-NLS-1$
public static final String ATTR_PROVIDER = "provider"; //$NON-NLS-1$
public static final String ATTR_RANGE = "range"; //$NON-NLS-1$
public static final String ATTR_RESOURCE = "resource"; //$NON-NLS-1$
+ public static final String ATTR_RESOURCE_PATH = "resource-path"; //$NON-NLS-1$
public static final String ATTR_SVG = "svg"; //$NON-NLS-1$
public static final String ATTR_RESOURCE_ID = "resource-id"; //$NON-NLS-1$
public static final String ATTR_RESOURCE_TYPE = "resource-type"; //$NON-NLS-1$
public static final String ATTR_REVISION_NUMBER = "rev-num"; //$NON-NLS-1$
public static final String ATTR_SALT = "salt"; //$NON-NLS-1$
+ public static final String ATTR_KEY_IV = "iv"; //$NON-NLS-1$
+ public static final String ATTR_KEY_SIZE = "size"; //$NON-NLS-1$
public static final String ATTR_SHAPE_CLASS = "shape-class"; //$NON-NLS-1$
public static final String ATTR_SHAPE_CORNER = "shape-corner"; //$NON-NLS-1$
public static final String ATTR_SINGLETON = "singleton"; //$NON-NLS-1$
@@ -117,6 +120,7 @@ public class DOMConstants {
public static final String ATTR_WIDTH = "svg:width"; //$NON-NLS-1$
public static final String ATTR_X = "svg:x"; //$NON-NLS-1$
public static final String ATTR_Y = "svg:y"; //$NON-NLS-1$
+ public static final String PASSWORD_HINT = "password-hint"; //$NON-NLS-1$
/*
*
@@ -193,6 +197,7 @@ public class DOMConstants {
public static final String TAG_TOPIC = "topic"; //$NON-NLS-1$
public static final String TAG_TOPICS = "topics"; //$NON-NLS-1$
public static final String TAG_WORKBOOK = "xmap-content"; //$NON-NLS-1$
+ public static final String TAG_STORIES = "stories"; //$NON-NLS-1$
// ==================
// VALUES
@@ -230,4 +235,4 @@ public class DOMConstants {
public static final String VAL_UPPERCASE = "uppercase"; //$NON-NLS-1$
public static final String VAL_VISIBLE = "visible"; //$NON-NLS-1$
-}
\ No newline at end of file
+}
diff --git a/bundles/org.xmind.core/src/org/xmind/core/internal/dom/DeserializerImpl.java b/bundles/org.xmind.core/src/org/xmind/core/internal/dom/DeserializerImpl.java
index 249b01e7f..68ebbf1a6 100644
--- a/bundles/org.xmind.core/src/org/xmind/core/internal/dom/DeserializerImpl.java
+++ b/bundles/org.xmind.core/src/org/xmind/core/internal/dom/DeserializerImpl.java
@@ -18,6 +18,7 @@
import static org.xmind.core.internal.zip.ArchiveConstants.COMMENTS_XML;
import static org.xmind.core.internal.zip.ArchiveConstants.META_XML;
+import static org.xmind.core.internal.zip.ArchiveConstants.PATH_EXTENSIONS;
import static org.xmind.core.internal.zip.ArchiveConstants.PATH_MARKER_SHEET;
import static org.xmind.core.internal.zip.ArchiveConstants.STYLES_XML;
@@ -40,6 +41,7 @@
import org.xmind.core.IRevisionRepository;
import org.xmind.core.ISheet;
import org.xmind.core.IWorkbook;
+import org.xmind.core.IWorkbookExtensionManager;
import org.xmind.core.internal.AbstractSerializingBase;
import org.xmind.core.internal.compatibility.Compatibility;
import org.xmind.core.internal.zip.ArchiveConstants;
@@ -170,13 +172,7 @@ public boolean hasInputSource() {
|| usesWorkbookStorageAsInputSource;
}
- /*
- * (non-Javadoc)
- *
- * @see org.xmind.core.IDeserializer#deserialize(org.xmind.core.util.
- * IProgressReporter)
- */
- public void deserialize(IProgressReporter reporter)
+ public void deserializeManifest(IProgressReporter reporter)
throws IOException, CoreException, IllegalStateException {
if (inputStream != null) {
ZipInputStream zin = new ZipInputStream(inputStream);
@@ -196,6 +192,18 @@ public void deserialize(IProgressReporter reporter)
ArchiveConstants.MANIFEST_XML);
manifest = new ManifestImpl(manifestDoc, storage);
manifest.setStreamNormalizer(getEntryStreamNormalizer());
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.xmind.core.IDeserializer#deserialize(org.xmind.core.util.
+ * IProgressReporter)
+ */
+ public void deserialize(IProgressReporter reporter)
+ throws IOException, CoreException, IllegalStateException {
+ if (manifest == null)
+ deserializeManifest(reporter);
/// Check if it's in old format
WorkbookImpl compatibleWorkbook = Compatibility
@@ -251,6 +259,20 @@ private WorkbookImpl loadWorkbook() throws IOException, CoreException {
workbook.setMarkerSheet(markerSheet);
}
+ /// load extensions
+ IWorkbookExtensionManager m = ((IWorkbook) workbook)
+ .getAdapter(IWorkbookExtensionManager.class);
+ if (m instanceof WorkbookExtensionManagerImpl) {
+ WorkbookExtensionManagerImpl extManager = (WorkbookExtensionManagerImpl) m;
+ for (String provider : extManager.getProviders()) {
+ Document extDoc = loadDocumentFromEntry(PATH_EXTENSIONS + //
+ provider + ".xml"); //$NON-NLS-1$
+ if (extDoc != null) {
+ extManager.createExtension(provider, extDoc);
+ }
+ }
+ }
+
/// load comments.xml
Document commentManagerDoc = loadDocumentFromEntry(COMMENTS_XML);
if (commentManagerDoc != null) {
@@ -409,7 +431,7 @@ protected Document forceLoadDocumentFromEntry(String entryPath)
return document;
}
- protected ManifestImpl getManifest() {
+ public ManifestImpl getManifest() {
return manifest;
}
diff --git a/bundles/org.xmind.core/src/org/xmind/core/internal/dom/EncryptionDataImpl.java b/bundles/org.xmind.core/src/org/xmind/core/internal/dom/EncryptionDataImpl.java
index 0853f214b..45d3acfff 100644
--- a/bundles/org.xmind.core/src/org/xmind/core/internal/dom/EncryptionDataImpl.java
+++ b/bundles/org.xmind.core/src/org/xmind/core/internal/dom/EncryptionDataImpl.java
@@ -17,14 +17,12 @@
import static org.xmind.core.internal.dom.DOMConstants.ATTR_CHECKSUM_TYPE;
import org.w3c.dom.Element;
-import org.w3c.dom.Node;
import org.xmind.core.IFileEntry;
import org.xmind.core.internal.EncryptionData;
import org.xmind.core.util.DOMUtils;
/**
* @author frankshaka
- *
*/
public class EncryptionDataImpl extends EncryptionData {
@@ -44,13 +42,12 @@ public EncryptionDataImpl(Element implementation, FileEntryImpl entry) {
/*
* (non-Javadoc)
- *
* @see org.xmind.core.internal.EncryptionData#getAdapter(java.lang.Class)
*/
@Override
- public Object getAdapter(Class adapter) {
- if (adapter == Node.class || adapter == Element.class)
- return getImplementation();
+ public T getAdapter(Class adapter) {
+ if (adapter.isAssignableFrom(Element.class))
+ return adapter.cast(getImplementation());
return super.getAdapter(adapter);
}
@@ -63,7 +60,6 @@ public Element getImplementation() {
/*
* (non-Javadoc)
- *
* @see org.xmind.core.IEncryptionData#getIntAttribute(int,
* java.lang.String[])
*/
@@ -80,7 +76,6 @@ public int getIntAttribute(int defaultValue, String... keyPath) {
/*
* (non-Javadoc)
- *
* @see org.xmind.core.IEncryptionData#getAttribute(java.lang.String)
*/
public String getAttribute(String... keys) {
@@ -99,7 +94,6 @@ public String getAttribute(String... keys) {
/*
* (non-Javadoc)
- *
* @see org.xmind.core.IEncryptionData#setAttribute(java.lang.String,
* java.lang.String)
*/
@@ -123,7 +117,6 @@ public void setAttribute(String value, String... keys) {
/*
* (non-Javadoc)
- *
* @see org.xmind.core.IEncryptionData#getChecksum()
*/
public String getChecksum() {
@@ -132,7 +125,6 @@ public String getChecksum() {
/*
* (non-Javadoc)
- *
* @see org.xmind.core.IEncryptionData#getChecksumType()
*/
public String getChecksumType() {
@@ -141,7 +133,6 @@ public String getChecksumType() {
/*
* (non-Javadoc)
- *
* @see org.xmind.core.IEncryptionData#setChecksum(java.lang.String)
*/
public void setChecksum(String checksum) {
@@ -150,7 +141,6 @@ public void setChecksum(String checksum) {
/*
* (non-Javadoc)
- *
* @see org.xmind.core.IEncryptionData#setChecksumType(java.lang.String)
*/
public void setChecksumType(String checksumType) {
@@ -159,7 +149,6 @@ public void setChecksumType(String checksumType) {
/*
* (non-Javadoc)
- *
* @see org.xmind.core.IEncryptionData#getFileEntry()
*/
public IFileEntry getFileEntry() {
diff --git a/bundles/org.xmind.core/src/org/xmind/core/internal/dom/FileEntryImpl.java b/bundles/org.xmind.core/src/org/xmind/core/internal/dom/FileEntryImpl.java
index cb6e9a955..096da07f0 100644
--- a/bundles/org.xmind.core/src/org/xmind/core/internal/dom/FileEntryImpl.java
+++ b/bundles/org.xmind.core/src/org/xmind/core/internal/dom/FileEntryImpl.java
@@ -25,7 +25,6 @@
import java.util.Iterator;
import org.w3c.dom.Element;
-import org.w3c.dom.Node;
import org.xmind.core.CoreException;
import org.xmind.core.IEncryptionData;
import org.xmind.core.IEntryStreamNormalizer;
@@ -72,9 +71,9 @@ public String getPath() {
return implementation.getAttribute(ATTR_FULL_PATH);
}
- public Object getAdapter(Class adapter) {
- if (adapter == Node.class || adapter == Element.class)
- return implementation;
+ public T getAdapter(Class adapter) {
+ if (adapter.isAssignableFrom(Element.class))
+ return adapter.cast(implementation);
return super.getAdapter(adapter);
}
@@ -239,7 +238,6 @@ public void setTime(long time) {
/*
* (non-Javadoc)
- *
* @see org.xmind.core.IFileEntry#iterSubEntries()
*/
public Iterator iterSubEntries() {
@@ -267,7 +265,6 @@ public long getSize() {
/*
* (non-Javadoc)
- *
* @see org.xmind.core.IFileEntry#getEncryptionData()
*/
public IEncryptionData getEncryptionData() {
@@ -287,7 +284,6 @@ public IEncryptionData getEncryptionData() {
/*
* (non-Javadoc)
- *
* @see org.xmind.core.IFileEntry#createEncryptionData()
*/
public IEncryptionData createEncryptionData() {
@@ -303,7 +299,6 @@ public IEncryptionData createEncryptionData() {
/*
* (non-Javadoc)
- *
* @see org.xmind.core.IFileEntry#deleteEncryptionData()
*/
public void deleteEncryptionData() {
@@ -342,4 +337,4 @@ public boolean isOrphan() {
return DOMUtils.isOrphanNode(getImplementation());
}
-}
\ No newline at end of file
+}
diff --git a/bundles/org.xmind.core/src/org/xmind/core/internal/dom/ImageImpl.java b/bundles/org.xmind.core/src/org/xmind/core/internal/dom/ImageImpl.java
index facc75232..0a79e815a 100644
--- a/bundles/org.xmind.core/src/org/xmind/core/internal/dom/ImageImpl.java
+++ b/bundles/org.xmind.core/src/org/xmind/core/internal/dom/ImageImpl.java
@@ -21,7 +21,6 @@
import static org.xmind.core.internal.dom.NumberUtils.safeParseInt;
import org.w3c.dom.Element;
-import org.w3c.dom.Node;
import org.xmind.core.Core;
import org.xmind.core.ISheet;
import org.xmind.core.ITopic;
@@ -61,11 +60,11 @@ public String toString() {
return DOMUtils.toString(getImageElement());
}
- public Object getAdapter(Class adapter) {
- if (adapter == ICoreEventSource.class)
- return this;
- if (adapter == Node.class || adapter == Element.class)
- return getImageElement();
+ public T getAdapter(Class adapter) {
+ if (ICoreEventSource.class.equals(adapter))
+ return adapter.cast(this);
+ if (adapter.isAssignableFrom(Element.class))
+ return adapter.cast(getImageElement());
return super.getAdapter(adapter);
}
@@ -109,7 +108,8 @@ public int getWidth() {
Element img = getImageElement();
if (img == null)
return UNSPECIFIED;
- return safeParseInt(DOMUtils.getAttribute(img, ATTR_WIDTH), UNSPECIFIED);
+ return safeParseInt(DOMUtils.getAttribute(img, ATTR_WIDTH),
+ UNSPECIFIED);
}
private Element ensureImageElement() {
@@ -194,7 +194,6 @@ public IWorkbook getOwnedWorkbook() {
/*
* (non-Javadoc)
- *
* @see org.xmind.core.IWorkbookComponent#isOrphan()
*/
public boolean isOrphan() {
@@ -225,4 +224,4 @@ protected void deactivateHyperlink(IWorkbook workbook) {
InternalHyperlinkUtils.deactivateHyperlink(workbook, getSource(), this);
}
-}
\ No newline at end of file
+}
diff --git a/bundles/org.xmind.core/src/org/xmind/core/internal/dom/LegendImpl.java b/bundles/org.xmind.core/src/org/xmind/core/internal/dom/LegendImpl.java
index ca8ef8bcd..042d9f35f 100644
--- a/bundles/org.xmind.core/src/org/xmind/core/internal/dom/LegendImpl.java
+++ b/bundles/org.xmind.core/src/org/xmind/core/internal/dom/LegendImpl.java
@@ -81,9 +81,9 @@ public boolean isOrphan() {
|| getImplementation() == null;
}
- public Object getAdapter(Class adapter) {
- if (adapter == ICoreEventSource.class)
- return this;
+ public T getAdapter(Class adapter) {
+ if (ICoreEventSource.class.equals(adapter))
+ return adapter.cast(this);
return super.getAdapter(adapter);
}
@@ -99,7 +99,8 @@ private Element ensureImplementation() {
private void checkImplementation() {
Element implementation = getImplementation();
- if (!implementation.hasAttributes() && !implementation.hasChildNodes()) {
+ if (!implementation.hasAttributes()
+ && !implementation.hasChildNodes()) {
sheetElement.removeChild(implementation);
}
}
@@ -115,8 +116,8 @@ public boolean isEmpty() {
public boolean isVisible() {
Element implementation = getImplementation();
if (implementation != null) {
- return DOMConstants.VAL_VISIBLE.equals(implementation
- .getAttribute(DOMConstants.ATTR_VISIBILITY));
+ return DOMConstants.VAL_VISIBLE.equals(
+ implementation.getAttribute(DOMConstants.ATTR_VISIBILITY));
}
return false;
}
@@ -218,8 +219,8 @@ public String getMarkerDescription(String markerId) {
if (description != null)
return description;
}
- IMarker marker = getOwnedWorkbook().getMarkerSheet().findMarker(
- markerId);
+ IMarker marker = getOwnedWorkbook().getMarkerSheet()
+ .findMarker(markerId);
if (marker != null)
return marker.getName();
return ""; //$NON-NLS-1$
@@ -279,8 +280,8 @@ public Set getMarkerIds() {
Iterator it = DOMUtils.childElementIterByTag(itemsEle,
DOMConstants.TAG_MARKER_DESCRIPTION);
if (it.hasNext()) {
- ArrayList list = new ArrayList(itemsEle
- .getChildNodes().getLength());
+ ArrayList list = new ArrayList(
+ itemsEle.getChildNodes().getLength());
while (it.hasNext()) {
Element item = it.next();
String markerId = DOMUtils.getAttribute(item,
@@ -302,7 +303,8 @@ public ICoreEventRegistration registerCoreEventListener(String type,
listener);
}
- protected void fireValueChange(String type, Object oldValue, Object newValue) {
+ protected void fireValueChange(String type, Object oldValue,
+ Object newValue) {
getCoreEventSupport().dispatchValueChange(this, type, oldValue,
newValue);
}
@@ -316,4 +318,4 @@ protected void fireTargetValueChange(String type, Object target,
public ICoreEventSupport getCoreEventSupport() {
return ownedSheet.getCoreEventSupport();
}
-}
\ No newline at end of file
+}
diff --git a/bundles/org.xmind.core/src/org/xmind/core/internal/dom/ManifestImpl.java b/bundles/org.xmind.core/src/org/xmind/core/internal/dom/ManifestImpl.java
index d77b5cb85..921eb63cd 100644
--- a/bundles/org.xmind.core/src/org/xmind/core/internal/dom/ManifestImpl.java
+++ b/bundles/org.xmind.core/src/org/xmind/core/internal/dom/ManifestImpl.java
@@ -15,6 +15,7 @@
import static org.xmind.core.internal.dom.DOMConstants.ATTR_FULL_PATH;
import static org.xmind.core.internal.dom.DOMConstants.ATTR_MEDIA_TYPE;
+import static org.xmind.core.internal.dom.DOMConstants.PASSWORD_HINT;
import static org.xmind.core.internal.dom.DOMConstants.TAG_FILE_ENTRY;
import static org.xmind.core.internal.dom.DOMConstants.TAG_MANIFEST;
import static org.xmind.core.internal.dom.InternalDOMUtils.getParentPath;
@@ -33,7 +34,6 @@
import org.w3c.dom.Document;
import org.w3c.dom.Element;
-import org.w3c.dom.Node;
import org.xmind.core.Core;
import org.xmind.core.IEncryptionData;
import org.xmind.core.IEntryStreamNormalizer;
@@ -96,11 +96,11 @@ public Element getManifestElement() {
return implementation.getDocumentElement();
}
- public Object getAdapter(Class adapter) {
- if (adapter == Document.class || adapter == Node.class)
- return implementation;
- if (adapter == IWorkbook.class)
- return ownedWorkbook;
+ public T getAdapter(Class adapter) {
+ if (adapter.isAssignableFrom(Document.class))
+ return adapter.cast(implementation);
+ if (IWorkbook.class.equals(adapter))
+ return adapter.cast(ownedWorkbook);
return super.getAdapter(adapter);
}
@@ -110,7 +110,6 @@ public IWorkbook getOwnedWorkbook() {
/*
* (non-Javadoc)
- *
* @see org.xmind.core.IWorkbookComponent#isOrphan()
*/
public boolean isOrphan() {
@@ -118,7 +117,6 @@ public boolean isOrphan() {
}
/**
- *
* @param workbook
*/
protected void setWorkbook(WorkbookImpl workbook) {
@@ -151,7 +149,6 @@ protected Collection getAllRegisteredEntries() {
/*
* (non-Javadoc)
- *
* @see org.xmind.core.IManifest#iterFileEntries()
*/
public Iterator iterFileEntries() {
@@ -160,7 +157,6 @@ public Iterator iterFileEntries() {
/*
* (non-Javadoc)
- *
* @see org.xmind.core.IManifest#iterFileEntries(org.xmind.core.IManifest.
* IFileEntryFilter)
*/
@@ -505,7 +501,6 @@ public String makeAttachmentPath(String source, boolean directory) {
/*
* (non-Javadoc)
- *
* @see org.xmind.core.IManifest#getEncryptionData(java.lang.String)
*/
public IEncryptionData getEncryptionData(String entryPath) {
@@ -529,6 +524,16 @@ public CoreEventSupport getCoreEventSupport() {
return coreEventSupport;
}
+ public String getPasswordHint() {
+ Element m = DOMUtils.ensureChildElement(implementation, TAG_MANIFEST);
+ return m.getAttribute(PASSWORD_HINT);
+ }
+
+ public void setPasswordHint(String hint) {
+ Element m = DOMUtils.ensureChildElement(implementation, TAG_MANIFEST);
+ m.setAttribute(PASSWORD_HINT, hint);
+ }
+
// protected void saveTemp(String newPassword)
// throws IOException, CoreException {
// String oldPassword = getPassword();
diff --git a/bundles/org.xmind.core/src/org/xmind/core/internal/dom/MarkerGroupImpl.java b/bundles/org.xmind.core/src/org/xmind/core/internal/dom/MarkerGroupImpl.java
index 406407492..1808dfc71 100644
--- a/bundles/org.xmind.core/src/org/xmind/core/internal/dom/MarkerGroupImpl.java
+++ b/bundles/org.xmind.core/src/org/xmind/core/internal/dom/MarkerGroupImpl.java
@@ -49,11 +49,11 @@ public Element getImplementation() {
return implementation;
}
- public Object getAdapter(Class adapter) {
- if (adapter == ICoreEventSource.class)
- return this;
- if (adapter == Element.class || adapter == Node.class)
- return implementation;
+ public T getAdapter(Class adapter) {
+ if (ICoreEventSource.class.equals(adapter))
+ return adapter.cast(this);
+ if (adapter.isAssignableFrom(Element.class))
+ return adapter.cast(implementation);
return super.getAdapter(adapter);
}
@@ -137,7 +137,6 @@ public List getMarkers() {
/*
* (non-Javadoc)
- *
* @see org.xmind.core.marker.IMarkerGroup#isEmpty()
*/
public boolean isEmpty() {
@@ -192,4 +191,4 @@ private void fireIndexedTargetChange(String type, Object target,
public ICoreEventSupport getCoreEventSupport() {
return ownedSheet.getCoreEventSupport();
}
-}
\ No newline at end of file
+}
diff --git a/bundles/org.xmind.core/src/org/xmind/core/internal/dom/MarkerImpl.java b/bundles/org.xmind.core/src/org/xmind/core/internal/dom/MarkerImpl.java
index 3e2ce9ce8..cd9aa2cd4 100644
--- a/bundles/org.xmind.core/src/org/xmind/core/internal/dom/MarkerImpl.java
+++ b/bundles/org.xmind.core/src/org/xmind/core/internal/dom/MarkerImpl.java
@@ -54,11 +54,11 @@ public Element getImplementation() {
return implementation;
}
- public Object getAdapter(Class adapter) {
- if (adapter == ICoreEventSource.class)
- return this;
- if (adapter == Element.class || adapter == Node.class)
- return implementation;
+ public T getAdapter(Class adapter) {
+ if (ICoreEventSource.class.equals(adapter))
+ return adapter.cast(this);
+ if (adapter.isAssignableFrom(Element.class))
+ return adapter.cast(implementation);
return super.getAdapter(adapter);
}
@@ -150,4 +150,4 @@ private void fireValueChange(String type, Object oldValue,
public ICoreEventSupport getCoreEventSupport() {
return ownedSheet.getCoreEventSupport();
}
-}
\ No newline at end of file
+}
diff --git a/bundles/org.xmind.core/src/org/xmind/core/internal/dom/MarkerRefImpl.java b/bundles/org.xmind.core/src/org/xmind/core/internal/dom/MarkerRefImpl.java
index 77e1b84fa..7d57f76eb 100644
--- a/bundles/org.xmind.core/src/org/xmind/core/internal/dom/MarkerRefImpl.java
+++ b/bundles/org.xmind.core/src/org/xmind/core/internal/dom/MarkerRefImpl.java
@@ -58,9 +58,9 @@ public String toString() {
return "MKRRef#" + getMarkerId(); //$NON-NLS-1$
}
- public Object getAdapter(Class adapter) {
- if (adapter == Node.class || adapter == Element.class)
- return implementation;
+ public T getAdapter(Class adapter) {
+ if (adapter.isAssignableFrom(Element.class))
+ return adapter.cast(implementation);
return super.getAdapter(adapter);
}
@@ -103,4 +103,4 @@ public boolean isOrphan() {
return DOMUtils.isOrphanNode(implementation);
}
-}
\ No newline at end of file
+}
diff --git a/bundles/org.xmind.core/src/org/xmind/core/internal/dom/MarkerSheetImpl.java b/bundles/org.xmind.core/src/org/xmind/core/internal/dom/MarkerSheetImpl.java
index 2c719e288..269c6a497 100644
--- a/bundles/org.xmind.core/src/org/xmind/core/internal/dom/MarkerSheetImpl.java
+++ b/bundles/org.xmind.core/src/org/xmind/core/internal/dom/MarkerSheetImpl.java
@@ -104,27 +104,27 @@ public void setManifest(ManifestImpl manifest) {
this.manifest = manifest;
}
- public Object getAdapter(Class adapter) {
- if (adapter == IManifest.class)
- return manifest;
- if (adapter == ICoreEventSource.class)
- return this;
- if (adapter == IMarkerResourceProvider.class)
- return realResourceProvider;
- if (adapter == ICoreEventSupport.class)
- return getCoreEventSupport();
- if (adapter == IPropertiesProvider.class)
- return this;
- if (adapter == Properties.class)
- return getProperties();
- if (adapter == ElementRegistry.class)
- return getElementRegistry();
- if (adapter == INodeAdaptableFactory.class)
- return this;
- if (adapter == INodeAdaptableProvider.class)
- return getElementAdapterProvider();
- if (adapter == Document.class || adapter == Node.class)
- return implementation;
+ public T getAdapter(Class adapter) {
+ if (IManifest.class.equals(adapter))
+ return adapter.cast(manifest);
+ if (ICoreEventSource.class.equals(adapter))
+ return adapter.cast(this);
+ if (IMarkerResourceProvider.class.equals(adapter))
+ return adapter.cast(realResourceProvider);
+ if (ICoreEventSupport.class.equals(adapter))
+ return adapter.cast(getCoreEventSupport());
+ if (IPropertiesProvider.class.equals(adapter))
+ return adapter.cast(this);
+ if (Properties.class.equals(adapter))
+ return adapter.cast(getProperties());
+ if (ElementRegistry.class.equals(adapter))
+ return adapter.cast(getElementRegistry());
+ if (INodeAdaptableFactory.class.equals(adapter))
+ return adapter.cast(this);
+ if (INodeAdaptableProvider.class.equals(adapter))
+ return adapter.cast(getElementAdapterProvider());
+ if (adapter.isAssignableFrom(Document.class))
+ return adapter.cast(implementation);
return super.getAdapter(adapter);
}
@@ -282,6 +282,7 @@ public IAdaptable createAdaptable(Node node) {
return null;
}
+ @Deprecated
public void save(OutputStream out) throws IOException, CoreException {
DOMUtils.save(implementation, out, false);
}
@@ -295,6 +296,7 @@ public void save(OutputStream out) throws IOException, CoreException {
private static final String OLD_ATT_ID = "id"; //$NON-NLS-1$
private static final String OLD_ATT_FILE = "file"; //$NON-NLS-1$
+ @Deprecated
public void importFrom(String sourcePath)
throws IOException, CoreException {
File sourceFile = new File(sourcePath);
@@ -313,6 +315,7 @@ public void importFrom(String sourcePath)
}
}
+ @Deprecated
public void importFrom(IInputSource source)
throws IOException, CoreException {
importFrom(source, null);
@@ -320,10 +323,10 @@ public void importFrom(IInputSource source)
/*
* (non-Javadoc)
- *
* @see org.xmind.core.marker.IMarkerSheet#importFrom(org.xmind.core.io.
* IInputSource , java.lang.String)
*/
+ @Deprecated
public void importFrom(IInputSource source, String groupName)
throws IOException, CoreException {
if (source.hasEntry(ArchiveConstants.MARKER_SHEET_XML)) {
@@ -340,6 +343,7 @@ public void importFrom(IInputSource source, String groupName)
}
}
+ @Deprecated
private void importAllAsNewGroup(IInputSource source, String groupName)
throws IOException {
IMarkerGroup group = createMarkerGroup(false);
@@ -375,6 +379,7 @@ private String createGroupName() {
//return Core.getIdFactory().createId();
}
+ @Deprecated
private void importFromOldMarkerSheet(IInputSource source)
throws IOException {
InputStream is = source.openEntryStream(OLD_MARKERLISTS_XML);
@@ -409,6 +414,7 @@ private void replaceId(IAdaptable adaptable, String newId) {
getElementRegistry().registerByKey(newId, adaptable);
}
+ @Deprecated
private void importGroupFromOld(IInputSource source, Element listEle,
IMarkerGroup targetGroup) throws IOException {
targetGroup.setName(listEle.getAttribute(OLD_ATT_NAME));
@@ -453,6 +459,7 @@ public void importFrom(IMarkerSheet sheet) {
}
}
+ @Deprecated
public void importFromChecked(IMarkerSheet sheet)
throws IOException, CoreException {
for (IMarkerGroup group : sheet.getMarkerGroups()) {
@@ -470,6 +477,7 @@ public IMarkerGroup importGroup(IMarkerGroup group) {
}
}
+ @Deprecated
public IMarkerGroup importGroupChecked(IMarkerGroup group)
throws IOException, CoreException {
String id = group.getId();
@@ -490,6 +498,7 @@ public IMarkerGroup importGroupChecked(IMarkerGroup group)
return targetGroup;
}
+ @Deprecated
private void importGroup(IMarkerGroup sourceGroup, IMarkerGroup targetGroup)
throws IOException {
for (IMarker sourceMarker : sourceGroup.getMarkers()) {
@@ -545,7 +554,6 @@ private void fireIndexedTargetChange(String type, Object target,
/*
* (non-Javadoc)
- *
* @see org.xmind.core.marker.IMarkerSheet#createMarkerResourcePath(java.io.
* InputStream, java.lang.String)
*/
@@ -559,4 +567,4 @@ public String allocateMarkerResource(InputStream source,
return null;
}
-}
\ No newline at end of file
+}
diff --git a/bundles/org.xmind.core/src/org/xmind/core/internal/dom/MetaDataImpl.java b/bundles/org.xmind.core/src/org/xmind/core/internal/dom/MetaDataImpl.java
index abdf14ead..df3d94598 100644
--- a/bundles/org.xmind.core/src/org/xmind/core/internal/dom/MetaDataImpl.java
+++ b/bundles/org.xmind.core/src/org/xmind/core/internal/dom/MetaDataImpl.java
@@ -28,7 +28,6 @@
/**
* @deprecated
- *
* @author Frank Shaka
*/
public class MetaDataImpl extends MetaData {
@@ -59,9 +58,9 @@ public String toString() {
return DOMUtils.toString(implementation);
}
- public Object getAdapter(Class adapter) {
- if (adapter == Node.class || adapter == Element.class)
- return getImplementation();
+ public T getAdapter(Class adapter) {
+ if (adapter.isAssignableFrom(Element.class))
+ return adapter.cast(getImplementation());
return super.getAdapter(adapter);
}
@@ -145,4 +144,4 @@ public void setValue(String value) {
}
}
-}
\ No newline at end of file
+}
diff --git a/bundles/org.xmind.core/src/org/xmind/core/internal/dom/MetaImpl.java b/bundles/org.xmind.core/src/org/xmind/core/internal/dom/MetaImpl.java
index 2777f0f9a..29dedd2a1 100644
--- a/bundles/org.xmind.core/src/org/xmind/core/internal/dom/MetaImpl.java
+++ b/bundles/org.xmind.core/src/org/xmind/core/internal/dom/MetaImpl.java
@@ -23,7 +23,6 @@
import org.w3c.dom.Document;
import org.w3c.dom.Element;
-import org.w3c.dom.Node;
import org.xmind.core.Core;
import org.xmind.core.IMetaData;
import org.xmind.core.IWorkbook;
@@ -81,13 +80,13 @@ public String toString() {
return DOMUtils.toString(implementation);
}
- public Object getAdapter(Class adapter) {
- if (adapter == ICoreEventSource.class)
- return this;
- if (adapter == Node.class || adapter == Document.class)
- return implementation;
- if (adapter == ElementRegistry.class)
- return getElementRegistry();
+ public T getAdapter(Class adapter) {
+ if (ICoreEventSource.class.equals(adapter))
+ return adapter.cast(this);
+ if (adapter.isAssignableFrom(Document.class))
+ return adapter.cast(implementation);
+ if (ElementRegistry.class.equals(adapter))
+ return adapter.cast(getElementRegistry());
return super.getAdapter(adapter);
}
@@ -105,7 +104,6 @@ public IWorkbook getOwnedWorkbook() {
/*
* (non-Javadoc)
- *
* @see org.xmind.core.IWorkbookComponent#isOrphan()
*/
public boolean isOrphan() {
@@ -165,7 +163,6 @@ public void setValue(String keyPath, String value) {
/*
* (non-Javadoc)
- *
* @see org.xmind.core.IMeta#getKeyPaths()
*/
public Set getKeyPaths() {
@@ -261,7 +258,6 @@ public ElementRegistry getElementRegistry() {
/*
* (non-Javadoc)
- *
* @see org.xmind.core.event.ICoreEventSource#getCoreEventSupport()
*/
public ICoreEventSupport getCoreEventSupport() {
@@ -270,7 +266,6 @@ public ICoreEventSupport getCoreEventSupport() {
/*
* (non-Javadoc)
- *
* @see
* org.xmind.core.event.ICoreEventSource#registerCoreEventListener(java.
* lang.String, org.xmind.core.event.ICoreEventListener)
diff --git a/bundles/org.xmind.core/src/org/xmind/core/internal/dom/NS.java b/bundles/org.xmind.core/src/org/xmind/core/internal/dom/NS.java
index 3bc623989..e6f26f055 100644
--- a/bundles/org.xmind.core/src/org/xmind/core/internal/dom/NS.java
+++ b/bundles/org.xmind.core/src/org/xmind/core/internal/dom/NS.java
@@ -26,6 +26,7 @@ public enum NS {
Manifest("manifest", "urn:xmind:xmap:xmlns:manifest:1.0"), //$NON-NLS-1$ //$NON-NLS-2$
Revision("revision", "urn:xmind:xmap:xmlns:revision:1.0"), //$NON-NLS-1$ //$NON-NLS-2$
Assignee("assignee", "urn:xmind:xmap:xmlns:assignee:1.0"), //$NON-NLS-1$//$NON-NLS-2$
+ Stories("stories", "urn:xmind:xmap:xmlns:stories:1.0"), //$NON-NLS-1$//$NON-NLS-2$
/* External Namespaces */
Xhtml("xhtml", "http://www.w3.org/1999/xhtml"), //$NON-NLS-1$ //$NON-NLS-2$
diff --git a/bundles/org.xmind.core/src/org/xmind/core/internal/dom/NotesImpl.java b/bundles/org.xmind.core/src/org/xmind/core/internal/dom/NotesImpl.java
index 289b21673..2ff0278b9 100644
--- a/bundles/org.xmind.core/src/org/xmind/core/internal/dom/NotesImpl.java
+++ b/bundles/org.xmind.core/src/org/xmind/core/internal/dom/NotesImpl.java
@@ -18,7 +18,6 @@
import java.util.Iterator;
import org.w3c.dom.Element;
-import org.w3c.dom.Node;
import org.xmind.core.Core;
import org.xmind.core.INotesContent;
import org.xmind.core.ISheet;
@@ -29,7 +28,6 @@
/**
* @author briansun
- *
*/
public class NotesImpl extends Notes {
@@ -63,9 +61,9 @@ public String toString() {
return DOMUtils.toString(getNotesElement());
}
- public Object getAdapter(Class adapter) {
- if (adapter == Node.class || adapter == Element.class)
- return getNotesElement();
+ public T getAdapter(Class adapter) {
+ if (adapter.isAssignableFrom(Element.class))
+ return adapter.cast(getNotesElement());
return super.getAdapter(adapter);
}
@@ -104,8 +102,8 @@ public void setContent(String format, INotesContent content) {
return;
Element notesEle = getNotesElement();
- Element oldContentEle = notesEle == null ? null : DOMUtils
- .getFirstChildElementByTag(notesEle, format);
+ Element oldContentEle = notesEle == null ? null
+ : DOMUtils.getFirstChildElementByTag(notesEle, format);
INotesContent oldContent = oldContentEle == null ? null
: getNotesContent(oldContentEle);
@@ -200,11 +198,10 @@ public IWorkbook getOwnedWorkbook() {
/*
* (non-Javadoc)
- *
* @see org.xmind.core.IWorkbookComponent#isOrphan()
*/
public boolean isOrphan() {
return ownedTopic.isOrphan();
}
-}
\ No newline at end of file
+}
diff --git a/bundles/org.xmind.core/src/org/xmind/core/internal/dom/NumberingImpl.java b/bundles/org.xmind.core/src/org/xmind/core/internal/dom/NumberingImpl.java
index c6183c819..ad7e17829 100644
--- a/bundles/org.xmind.core/src/org/xmind/core/internal/dom/NumberingImpl.java
+++ b/bundles/org.xmind.core/src/org/xmind/core/internal/dom/NumberingImpl.java
@@ -13,6 +13,7 @@
*******************************************************************************/
package org.xmind.core.internal.dom;
+import static org.xmind.core.internal.dom.DOMConstants.ATTR_NUMBER_DEPTH;
import static org.xmind.core.internal.dom.DOMConstants.ATTR_NUMBER_FORMAT;
import static org.xmind.core.internal.dom.DOMConstants.ATTR_NUMBER_SEPARATOR;
import static org.xmind.core.internal.dom.DOMConstants.ATTR_PREPENDING_NUMBERS;
@@ -22,7 +23,6 @@
import static org.xmind.core.internal.dom.DOMConstants.VAL_NONE;
import org.w3c.dom.Element;
-import org.w3c.dom.Node;
import org.xmind.core.Core;
import org.xmind.core.ISheet;
import org.xmind.core.ITopic;
@@ -49,11 +49,11 @@ public Element getNumberingElement() {
return DOMUtils.getFirstChildElementByTag(topicElement, TAG_NUMBERING);
}
- public Object getAdapter(Class adapter) {
- if (adapter == ICoreEventSource.class)
- return this;
- if (adapter == Node.class || adapter == Element.class)
- return getNumberingElement();
+ public T getAdapter(Class adapter) {
+ if (ICoreEventSource.class.equals(adapter))
+ return adapter.cast(this);
+ if (adapter.isAssignableFrom(Element.class))
+ return adapter.cast(getNumberingElement());
return super.getAdapter(adapter);
}
@@ -96,6 +96,13 @@ public String getSuffix() {
return getText(TAG_SUFFIX);
}
+ public String getDepth() {
+ Element e = getNumberingElement();
+ if (e == null)
+ return null;
+ return DOMUtils.getAttribute(e, ATTR_NUMBER_DEPTH);
+ }
+
public boolean prependsParentNumbers() {
Element e = getNumberingElement();
if (e == null)
@@ -118,7 +125,6 @@ public IWorkbook getOwnedWorkbook() {
/*
* (non-Javadoc)
- *
* @see org.xmind.core.IWorkbookComponent#isOrphan()
*/
public boolean isOrphan() {
@@ -135,8 +141,8 @@ private void setAttribute(String key, String value) {
}
}
} else {
- Element e = DOMUtils
- .ensureChildElement(topicElement, TAG_NUMBERING);
+ Element e = DOMUtils.ensureChildElement(topicElement,
+ TAG_NUMBERING);
e.setAttribute(key, value);
}
}
@@ -162,8 +168,8 @@ private void setText(String key, String value) {
}
}
} else {
- Element e = DOMUtils
- .ensureChildElement(topicElement, TAG_NUMBERING);
+ Element e = DOMUtils.ensureChildElement(topicElement,
+ TAG_NUMBERING);
Element t = DOMUtils.ensureChildElement(e, key);
t.setTextContent(value);
}
@@ -209,6 +215,14 @@ public void setSeparator(String separator) {
ownedTopic.updateModificationInfo();
}
+ public void setDepth(String depth) {
+ String oldValue = String.valueOf(getComputedDepth());
+ setAttribute(ATTR_NUMBER_DEPTH, depth);
+ String newValue = String.valueOf(getComputedDepth());
+ fireValueChange(Core.NumberingDepth, oldValue, newValue);
+ ownedTopic.updateModificationInfo();
+ }
+
private void fireValueChange(String eventType, Object oldValue,
Object newValue) {
getCoreEventSupport().dispatchValueChange(this, eventType, oldValue,
@@ -225,4 +239,4 @@ public ICoreEventSupport getCoreEventSupport() {
return ownedTopic.getCoreEventSupport();
}
-}
\ No newline at end of file
+}
diff --git a/bundles/org.xmind.core/src/org/xmind/core/internal/dom/ParagraphImpl.java b/bundles/org.xmind.core/src/org/xmind/core/internal/dom/ParagraphImpl.java
index 75e8da28d..3ad2d9b1b 100644
--- a/bundles/org.xmind.core/src/org/xmind/core/internal/dom/ParagraphImpl.java
+++ b/bundles/org.xmind.core/src/org/xmind/core/internal/dom/ParagraphImpl.java
@@ -16,7 +16,6 @@
import java.util.List;
import org.w3c.dom.Element;
-import org.w3c.dom.Node;
import org.xmind.core.IParagraph;
import org.xmind.core.ISpan;
import org.xmind.core.IWorkbook;
@@ -83,10 +82,9 @@ public void removeSpan(ISpan span) {
getOwner().updateModifiedTime();
}
- public Object getAdapter(Class adapter) {
- if (adapter == Node.class || adapter == Element.class)
- return implementation;
-
+ public T getAdapter(Class adapter) {
+ if (adapter.isAssignableFrom(Element.class))
+ return adapter.cast(implementation);
return super.getAdapter(adapter);
}
@@ -110,7 +108,6 @@ public IWorkbook getOwnedWorkbook() {
/*
* (non-Javadoc)
- *
* @see org.xmind.core.IWorkbookComponent#isOrphan()
*/
public boolean isOrphan() {
@@ -131,4 +128,4 @@ protected void removeNotify(WorkbookImpl workbook) {
WorkbookUtilsImpl.decreaseStyleRef(workbook, this);
}
-}
\ No newline at end of file
+}
diff --git a/bundles/org.xmind.core/src/org/xmind/core/internal/dom/RelationshipImpl.java b/bundles/org.xmind.core/src/org/xmind/core/internal/dom/RelationshipImpl.java
index 07f9ef3a3..905acb277 100644
--- a/bundles/org.xmind.core/src/org/xmind/core/internal/dom/RelationshipImpl.java
+++ b/bundles/org.xmind.core/src/org/xmind/core/internal/dom/RelationshipImpl.java
@@ -41,7 +41,6 @@
/**
* @author briansun
- *
*/
public class RelationshipImpl extends Relationship implements ICoreEventSource {
@@ -134,7 +133,6 @@ public void setEnd2Id(String id) {
/*
* (non-Javadoc)
- *
* @see org.xmind.core.internal.Relationship#getEnd1()
*/
@Override
@@ -144,7 +142,6 @@ public IRelationshipEnd getEnd1() {
/*
* (non-Javadoc)
- *
* @see org.xmind.core.internal.Relationship#getEnd2()
*/
@Override
@@ -209,11 +206,11 @@ public boolean isOrphan() {
return DOMUtils.isOrphanNode(implementation);
}
- public Object getAdapter(Class adapter) {
- if (adapter == ICoreEventSource.class)
- return this;
- if (adapter == Element.class || adapter == Node.class)
- return implementation;
+ public T getAdapter(Class adapter) {
+ if (ICoreEventSource.class.equals(adapter))
+ return adapter.cast(this);
+ if (adapter.isAssignableFrom(Element.class))
+ return adapter.cast(implementation);
return super.getAdapter(adapter);
}
@@ -371,4 +368,4 @@ protected void updateModificationInfo() {
}
}
-}
\ No newline at end of file
+}
diff --git a/bundles/org.xmind.core/src/org/xmind/core/internal/dom/ResourceRefImpl.java b/bundles/org.xmind.core/src/org/xmind/core/internal/dom/ResourceRefImpl.java
index 7313b271c..1ea4dd060 100644
--- a/bundles/org.xmind.core/src/org/xmind/core/internal/dom/ResourceRefImpl.java
+++ b/bundles/org.xmind.core/src/org/xmind/core/internal/dom/ResourceRefImpl.java
@@ -14,7 +14,6 @@
package org.xmind.core.internal.dom;
import org.w3c.dom.Element;
-import org.w3c.dom.Node;
import org.xmind.core.IFileEntry;
import org.xmind.core.IResourceRef;
import org.xmind.core.internal.AbstractWorkbookComponent;
@@ -25,15 +24,22 @@
public class ResourceRefImpl extends AbstractWorkbookComponent
implements IResourceRef {
+ private Element source;
+
private Element implementation;
private WorkbookImpl ownedWorkbook;
public ResourceRefImpl(Element implementation, WorkbookImpl ownedWorkbook) {
+ this.source = implementation;
this.implementation = implementation;
this.ownedWorkbook = ownedWorkbook;
}
+ protected void setImplementation(Element implementation) {
+ this.implementation = implementation;
+ }
+
public Element getImplementation() {
return implementation;
}
@@ -44,7 +50,6 @@ public WorkbookImpl getOwnedWorkbook() {
/*
* (non-Javadoc)
- *
* @see org.xmind.core.IWorkbookComponent#isOrphan()
*/
public boolean isOrphan() {
@@ -57,21 +62,20 @@ public boolean equals(Object obj) {
if (obj == null || !(obj instanceof ResourceRefImpl))
return false;
ResourceRefImpl that = (ResourceRefImpl) obj;
- return this.implementation == that.implementation;
+ return this.source == that.source;
}
public int hashCode() {
- return implementation.hashCode();
+ return source.hashCode();
}
public String toString() {
return "ResRef#" + getResourceId(); //$NON-NLS-1$
}
- public Object getAdapter(Class adapter) {
- if (adapter == Node.class || adapter == Element.class)
- return implementation;
-
+ public T getAdapter(Class adapter) {
+ if (adapter.isAssignableFrom(Element.class))
+ return adapter.cast(implementation);
return super.getAdapter(adapter);
}
@@ -130,4 +134,4 @@ public String getType() {
return DOMUtils.getAttribute(implementation, DOMConstants.ATTR_TYPE);
}
-}
\ No newline at end of file
+}
diff --git a/bundles/org.xmind.core/src/org/xmind/core/internal/dom/RevisionImpl.java b/bundles/org.xmind.core/src/org/xmind/core/internal/dom/RevisionImpl.java
index 0aa37f5df..af2e9738e 100644
--- a/bundles/org.xmind.core/src/org/xmind/core/internal/dom/RevisionImpl.java
+++ b/bundles/org.xmind.core/src/org/xmind/core/internal/dom/RevisionImpl.java
@@ -34,7 +34,6 @@
/**
* @author Frank Shaka
- *
*/
public class RevisionImpl extends Revision {
@@ -65,9 +64,9 @@ public boolean equals(Object obj) {
}
@Override
- public Object getAdapter(Class adapter) {
- if (adapter == Node.class || adapter == Element.class)
- return getImplementation();
+ public T getAdapter(Class adapter) {
+ if (adapter.isAssignableFrom(Element.class))
+ return adapter.cast(getImplementation());
return super.getAdapter(adapter);
}
diff --git a/bundles/org.xmind.core/src/org/xmind/core/internal/dom/RevisionManagerImpl.java b/bundles/org.xmind.core/src/org/xmind/core/internal/dom/RevisionManagerImpl.java
index beb1bc164..18d699939 100644
--- a/bundles/org.xmind.core/src/org/xmind/core/internal/dom/RevisionManagerImpl.java
+++ b/bundles/org.xmind.core/src/org/xmind/core/internal/dom/RevisionManagerImpl.java
@@ -50,7 +50,6 @@
/**
* @author Frank Shaka
- *
*/
public class RevisionManagerImpl extends RevisionManager
implements ICoreEventSource, INodeAdaptableFactory {
@@ -94,11 +93,11 @@ public boolean equals(Object obj) {
}
@Override
- public Object getAdapter(Class adapter) {
- if (adapter == ICoreEventSource.class)
- return this;
- if (adapter == Node.class || adapter == Document.class)
- return getImplementation();
+ public T getAdapter(Class adapter) {
+ if (ICoreEventSource.class.equals(adapter))
+ return adapter.cast(this);
+ if (adapter.isAssignableFrom(Document.class))
+ return adapter.cast(getImplementation());
return super.getAdapter(adapter);
}
@@ -312,7 +311,6 @@ private IFileEntry getMetaFileEntry() {
/*
* (non-Javadoc)
- *
* @see org.xmind.core.event.ICoreEventSource#getCoreEventSupport()
*/
public ICoreEventSupport getCoreEventSupport() {
@@ -324,7 +322,6 @@ public ICoreEventSupport getCoreEventSupport() {
/*
* (non-Javadoc)
- *
* @see
* org.xmind.core.event.ICoreEventSource#registerCoreEventListener(java.
* lang.String, org.xmind.core.event.ICoreEventListener)
diff --git a/bundles/org.xmind.core/src/org/xmind/core/internal/dom/SerializerImpl.java b/bundles/org.xmind.core/src/org/xmind/core/internal/dom/SerializerImpl.java
index 3d55e4683..376baabc0 100644
--- a/bundles/org.xmind.core/src/org/xmind/core/internal/dom/SerializerImpl.java
+++ b/bundles/org.xmind.core/src/org/xmind/core/internal/dom/SerializerImpl.java
@@ -17,6 +17,7 @@
import static org.xmind.core.internal.zip.ArchiveConstants.CONTENT_XML;
import static org.xmind.core.internal.zip.ArchiveConstants.MANIFEST_XML;
import static org.xmind.core.internal.zip.ArchiveConstants.META_XML;
+import static org.xmind.core.internal.zip.ArchiveConstants.PATH_EXTENSIONS;
import static org.xmind.core.internal.zip.ArchiveConstants.PATH_MARKER_SHEET;
import static org.xmind.core.internal.zip.ArchiveConstants.PATH_REVISIONS;
import static org.xmind.core.internal.zip.ArchiveConstants.REVISIONS_XML;
@@ -28,6 +29,7 @@
import java.util.Arrays;
import java.util.HashSet;
import java.util.Iterator;
+import java.util.List;
import java.util.Set;
import java.util.zip.ZipOutputStream;
@@ -50,6 +52,8 @@
import org.xmind.core.IRevisionRepository;
import org.xmind.core.ISerializer;
import org.xmind.core.IWorkbook;
+import org.xmind.core.IWorkbookExtension;
+import org.xmind.core.IWorkbookExtensionManager;
import org.xmind.core.internal.AbstractSerializingBase;
import org.xmind.core.internal.zip.ArchiveConstants;
import org.xmind.core.internal.zip.ZipStreamOutputTarget;
@@ -324,6 +328,16 @@ public void serialize(IProgressReporter reporter)
serializedEntryPaths.add(COMMENTS_XML);
}
+ /// save extensions
+ IWorkbookExtensionManager extensionManager = ((IWorkbook) workbook)
+ .getAdapter(IWorkbookExtensionManager.class);
+ List exts = extensionManager.getExtensions();
+ for (IWorkbookExtension ext : exts) {
+ String providerName = ext.getProviderName();
+ String path = PATH_EXTENSIONS + providerName + ".xml"; //$NON-NLS-1$
+ serializeXML(ext, path);
+ }
+
/// save revisions
IRevisionRepository revisionRepository = workbook
.getRevisionRepository();
diff --git a/bundles/org.xmind.core/src/org/xmind/core/internal/dom/SettingEntryImpl.java b/bundles/org.xmind.core/src/org/xmind/core/internal/dom/SettingEntryImpl.java
index 3569e7c5f..38ef2efb9 100644
--- a/bundles/org.xmind.core/src/org/xmind/core/internal/dom/SettingEntryImpl.java
+++ b/bundles/org.xmind.core/src/org/xmind/core/internal/dom/SettingEntryImpl.java
@@ -5,7 +5,6 @@
import org.w3c.dom.Element;
import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
import org.xmind.core.Core;
import org.xmind.core.ISheet;
import org.xmind.core.IWorkbook;
@@ -80,9 +79,9 @@ public boolean isOrphan() {
return DOMUtils.isOrphanNode(implementation);
}
- public Object getAdapter(Class adapter) {
- if (adapter == Node.class || adapter == Element.class)
- return getImplementation();
+ public T getAdapter(Class adapter) {
+ if (adapter.isAssignableFrom(Element.class))
+ return adapter.cast(getImplementation());
return super.getAdapter(adapter);
}
diff --git a/bundles/org.xmind.core/src/org/xmind/core/internal/dom/SheetImpl.java b/bundles/org.xmind.core/src/org/xmind/core/internal/dom/SheetImpl.java
index 4970e5d24..a2d572e8e 100644
--- a/bundles/org.xmind.core/src/org/xmind/core/internal/dom/SheetImpl.java
+++ b/bundles/org.xmind.core/src/org/xmind/core/internal/dom/SheetImpl.java
@@ -45,7 +45,6 @@
/**
* @author Brian Sun
* @author Frank Shaka
- *
*/
public class SheetImpl extends Sheet implements ICoreEventSource {
@@ -105,17 +104,17 @@ public String toString() {
return "SHT#" + getId() + "(" + getTitleText() + ")"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
}
- public Object getAdapter(Class adapter) {
- if (adapter == ICoreEventSource.class)
- return this;
- if (adapter == Element.class || adapter == Node.class) {
- return implementation;
- } else if (adapter == IMarkerRefCounter.class) {
- return getMarkerRefCounter();
- } else if (adapter == ILabelRefCounter.class) {
- return getLabelRefCounter();
- } else if (adapter == ICoreEventSupport.class) {
- return getCoreEventSupport();
+ public T getAdapter(Class adapter) {
+ if (ICoreEventSource.class.equals(adapter))
+ return adapter.cast(this);
+ if (adapter.isAssignableFrom(Element.class)) {
+ return adapter.cast(implementation);
+ } else if (IMarkerRefCounter.class.equals(adapter)) {
+ return adapter.cast(getMarkerRefCounter());
+ } else if (ILabelRefCounter.class.equals(adapter)) {
+ return adapter.cast(getLabelRefCounter());
+ } else if (ICoreEventSupport.class.equals(adapter)) {
+ return adapter.cast(getCoreEventSupport());
}
return super.getAdapter(adapter);
}
@@ -161,7 +160,6 @@ public IWorkbook getOwnedWorkbook() {
/*
* (non-Javadoc)
- *
* @see org.xmind.core.IWorkbookComponent#isOrphan()
*/
public boolean isOrphan() {
@@ -400,4 +398,4 @@ public ISheetSettings getSettings() {
return settings;
}
-}
\ No newline at end of file
+}
diff --git a/bundles/org.xmind.core/src/org/xmind/core/internal/dom/SpanImplBase.java b/bundles/org.xmind.core/src/org/xmind/core/internal/dom/SpanImplBase.java
index 9812f7d48..9dbd8be0e 100644
--- a/bundles/org.xmind.core/src/org/xmind/core/internal/dom/SpanImplBase.java
+++ b/bundles/org.xmind.core/src/org/xmind/core/internal/dom/SpanImplBase.java
@@ -56,11 +56,12 @@ public String toString() {
return implementation.toString();
}
- public Object getAdapter(Class adapter) {
- if (adapter == Node.class || (adapter == Element.class
- && implementation instanceof Element))
- return implementation;
-
+ public T getAdapter(Class adapter) {
+ if (adapter.isAssignableFrom(Element.class)
+ && implementation instanceof Element)
+ return adapter.cast(implementation);
+ if (adapter.isAssignableFrom(Node.class))
+ return adapter.cast(implementation);
return super.getAdapter(adapter);
}
@@ -115,4 +116,4 @@ protected void removeNotify(WorkbookImpl workbook) {
WorkbookUtilsImpl.decreaseStyleRef(workbook, this);
}
-}
\ No newline at end of file
+}
diff --git a/bundles/org.xmind.core/src/org/xmind/core/internal/dom/StyleImpl.java b/bundles/org.xmind.core/src/org/xmind/core/internal/dom/StyleImpl.java
index 82da5b0b7..ced196465 100644
--- a/bundles/org.xmind.core/src/org/xmind/core/internal/dom/StyleImpl.java
+++ b/bundles/org.xmind.core/src/org/xmind/core/internal/dom/StyleImpl.java
@@ -175,11 +175,11 @@ public String toString() {
return "STY#" + getId() + "(" + getName() + ")"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
}
- public Object getAdapter(Class adapter) {
- if (adapter == ICoreEventSource.class)
- return this;
- if (adapter == Element.class || adapter == Node.class)
- return implementation;
+ public T getAdapter(Class adapter) {
+ if (ICoreEventSource.class.equals(adapter))
+ return adapter.cast(this);
+ if (adapter.isAssignableFrom(Element.class))
+ return adapter.cast(implementation);
return super.getAdapter(adapter);
}
@@ -300,8 +300,8 @@ public void setDefaultStyleId(String styleFamily, String styleId) {
String propEleName = getPropertiesElementName();
if (styleId != null) {
- Element p = DOMUtils
- .ensureChildElement(implementation, propEleName);
+ Element p = DOMUtils.ensureChildElement(implementation,
+ propEleName);
Element ds = findDefaultStyleElement(p, styleFamily);
if (ds == null) {
ds = DOMUtils.createElement(p, TAG_DEFAULT_STYLE);
@@ -325,7 +325,8 @@ public void setDefaultStyleId(String styleFamily, String styleId) {
}
}
- private Element findDefaultStyleElement(Element propEle, String styleFamily) {
+ private Element findDefaultStyleElement(Element propEle,
+ String styleFamily) {
Iterator it = DOMUtils.childElementIterByTag(propEle,
TAG_DEFAULT_STYLE);
while (it.hasNext()) {
@@ -393,7 +394,8 @@ private void fireValueChange(String eventType, Object oldValue,
newValue);
}
- private void firePropertyChange(String key, String oldValue, String newValue) {
+ private void firePropertyChange(String key, String oldValue,
+ String newValue) {
getCoreEventSupport().dispatchTargetValueChange(this, Core.Property,
key, oldValue, newValue);
}
@@ -402,4 +404,4 @@ public ICoreEventSupport getCoreEventSupport() {
return ownedSheet.getCoreEventSupport();
}
-}
\ No newline at end of file
+}
diff --git a/bundles/org.xmind.core/src/org/xmind/core/internal/dom/StyleSheetImpl.java b/bundles/org.xmind.core/src/org/xmind/core/internal/dom/StyleSheetImpl.java
index 34954d0fe..b619b3a30 100644
--- a/bundles/org.xmind.core/src/org/xmind/core/internal/dom/StyleSheetImpl.java
+++ b/bundles/org.xmind.core/src/org/xmind/core/internal/dom/StyleSheetImpl.java
@@ -22,7 +22,6 @@
import java.io.IOException;
import java.io.OutputStream;
-import java.util.Iterator;
import java.util.Properties;
import java.util.Set;
@@ -41,10 +40,9 @@
import org.xmind.core.internal.StyleSheet;
import org.xmind.core.internal.event.CoreEventSupport;
import org.xmind.core.style.IStyle;
-import org.xmind.core.style.IStyleSheet;
+import org.xmind.core.util.CloneHandler;
import org.xmind.core.util.DOMUtils;
import org.xmind.core.util.IPropertiesProvider;
-import org.xmind.core.util.Property;
public class StyleSheetImpl extends StyleSheet implements INodeAdaptableFactory,
ICoreEventSource, IPropertiesProvider {
@@ -77,25 +75,25 @@ public Document getImplementation() {
return implementation;
}
- public Object getAdapter(Class adapter) {
- if (adapter == IManifest.class)
- return manifest;
- if (adapter == ICoreEventSource.class)
- return this;
- if (adapter == ElementRegistry.class)
- return getElementRegistry();
- if (adapter == ICoreEventSupport.class)
- return getCoreEventSupport();
- if (adapter == IPropertiesProvider.class)
- return this;
- if (adapter == Properties.class)
- return getProperties();
- if (adapter == INodeAdaptableFactory.class)
- return this;
- if (adapter == INodeAdaptableProvider.class)
- return getNodeAdaptableProvider();
- if (adapter == Document.class || adapter == Node.class)
- return implementation;
+ public T getAdapter(Class adapter) {
+ if (IManifest.class.equals(adapter))
+ return adapter.cast(manifest);
+ if (ICoreEventSource.class.equals(adapter))
+ return adapter.cast(this);
+ if (ElementRegistry.class.equals(adapter))
+ return adapter.cast(getElementRegistry());
+ if (ICoreEventSupport.class.equals(adapter))
+ return adapter.cast(getCoreEventSupport());
+ if (IPropertiesProvider.class.equals(adapter))
+ return adapter.cast(this);
+ if (Properties.class.equals(adapter))
+ return adapter.cast(getProperties());
+ if (INodeAdaptableFactory.class.equals(adapter))
+ return adapter.cast(this);
+ if (INodeAdaptableProvider.class.equals(adapter))
+ return adapter.cast(getNodeAdaptableProvider());
+ if (adapter.isAssignableFrom(Document.class))
+ return adapter.cast(implementation);
return super.getAdapter(adapter);
}
@@ -274,33 +272,15 @@ public void save(OutputStream out) throws IOException, CoreException {
public IStyle importStyle(IStyle style) {
if (style == null)
return null;
- if (style instanceof StyleImpl) {
- StyleImpl s = (StyleImpl) style;
- return WorkbookUtilsImpl.importStyle(this, s,
- (StyleSheetImpl) style.getOwnedStyleSheet());
- }
- return importStyleFromOtherImpl(style);
- }
- private IStyle importStyleFromOtherImpl(IStyle style) {
- IStyle target = createStyle(style.getType());
- Iterator sourcePropIt = style.properties();
- while (sourcePropIt.hasNext()) {
- Property sourceProperty = sourcePropIt.next();
- target.setProperty(sourceProperty.key, sourceProperty.value);
- }
- Iterator sourceDSIt = style.defaultStyles();
- while (sourceDSIt.hasNext()) {
- Property sourceDS = sourceDSIt.next();
- target.setDefaultStyleId(sourceDS.key, sourceDS.value);
+ try {
+ return (IStyle) new CloneHandler()
+ .withStyleSheets(style.getOwnedStyleSheet(), this)
+ .cloneObject(style);
+ } catch (IOException e) {
+ Core.getLogger().log(e);
}
- IStyleSheet sourceSheet = style.getOwnedStyleSheet();
- if (sourceSheet != null) {
- String group = sourceSheet.findOwnedGroup(style);
- if (group != null)
- addStyle(target, group);
- }
- return target;
+ return null;
}
public ICoreEventRegistration registerCoreEventListener(String type,
@@ -321,4 +301,4 @@ private void fireTargetChange(String type, Object target) {
getCoreEventSupport().dispatchTargetChange(this, type, target);
}
-}
\ No newline at end of file
+}
diff --git a/bundles/org.xmind.core/src/org/xmind/core/internal/dom/SummaryImpl.java b/bundles/org.xmind.core/src/org/xmind/core/internal/dom/SummaryImpl.java
index 3819a92fe..c96b09ba7 100644
--- a/bundles/org.xmind.core/src/org/xmind/core/internal/dom/SummaryImpl.java
+++ b/bundles/org.xmind.core/src/org/xmind/core/internal/dom/SummaryImpl.java
@@ -51,11 +51,11 @@ public Element getImplementation() {
return implementation;
}
- public Object getAdapter(Class adapter) {
- if (adapter == ICoreEventSource.class)
- return this;
- if (adapter == Node.class || adapter == Element.class)
- return implementation;
+ public T getAdapter(Class adapter) {
+ if (ICoreEventSource.class.equals(adapter))
+ return adapter.cast(this);
+ if (adapter.isAssignableFrom(Element.class))
+ return adapter.cast(implementation);
return super.getAdapter(adapter);
}
@@ -260,4 +260,4 @@ protected void updateModificationInfo() {
}
}
-}
\ No newline at end of file
+}
diff --git a/bundles/org.xmind.core/src/org/xmind/core/internal/dom/TopicExtensionImpl.java b/bundles/org.xmind.core/src/org/xmind/core/internal/dom/TopicExtensionImpl.java
index c6935b90f..e9020f44e 100644
--- a/bundles/org.xmind.core/src/org/xmind/core/internal/dom/TopicExtensionImpl.java
+++ b/bundles/org.xmind.core/src/org/xmind/core/internal/dom/TopicExtensionImpl.java
@@ -30,8 +30,8 @@
import org.xmind.core.internal.TopicExtension;
import org.xmind.core.util.DOMUtils;
-public class TopicExtensionImpl extends TopicExtension implements
- INodeAdaptableProvider {
+public class TopicExtensionImpl extends TopicExtension
+ implements INodeAdaptableProvider {
private Element implementation;
@@ -101,9 +101,9 @@ public boolean isOrphan() {
return DOMUtils.isOrphanNode(implementation);
}
- public Object getAdapter(Class adapter) {
- if (adapter == Node.class || adapter == Element.class)
- return implementation;
+ public T getAdapter(Class adapter) {
+ if (adapter.isAssignableFrom(Element.class))
+ return adapter.cast(implementation);
return super.getAdapter(adapter);
}
@@ -129,9 +129,9 @@ public void addResourceRef(IResourceRef ref) {
public List getResourceRefs() {
Element refsEle = getRefsElement();
if (refsEle != null)
- return DOMUtils.getChildList(refsEle,
- DOMConstants.TAG_RESOURCE_REF, ((WorkbookImpl) topic
- .getOwnedWorkbook()).getAdaptableRegistry());
+ return DOMUtils.getChildList(refsEle, DOMConstants.TAG_RESOURCE_REF,
+ ((WorkbookImpl) topic.getOwnedWorkbook())
+ .getAdaptableRegistry());
return EMPTY_REFS;
}
@@ -189,4 +189,4 @@ public IAdaptable getAdaptable(Node node) {
return null;
}
-}
\ No newline at end of file
+}
diff --git a/bundles/org.xmind.core/src/org/xmind/core/internal/dom/TopicImpl.java b/bundles/org.xmind.core/src/org/xmind/core/internal/dom/TopicImpl.java
index 775f44799..c5e6ae0cd 100644
--- a/bundles/org.xmind.core/src/org/xmind/core/internal/dom/TopicImpl.java
+++ b/bundles/org.xmind.core/src/org/xmind/core/internal/dom/TopicImpl.java
@@ -79,7 +79,6 @@
/**
* @author briansun
- *
*/
public class TopicImpl extends Topic implements ICoreEventSource {
@@ -136,11 +135,11 @@ public String toString() {
return "TPC#" + getId() + "(" + getTitleText() + ")"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
}
- public Object getAdapter(Class adapter) {
- if (adapter == ICoreEventSource.class)
- return this;
- if (adapter == Element.class || adapter == Node.class)
- return implementation;
+ public T getAdapter(Class adapter) {
+ if (ICoreEventSource.class.equals(adapter))
+ return adapter.cast(this);
+ if (adapter.isAssignableFrom(Element.class))
+ return adapter.cast(implementation);
return super.getAdapter(adapter);
}
@@ -1152,14 +1151,24 @@ protected void addNotify(WorkbookImpl workbook, SheetImpl sheet,
((SummaryImpl) s).addNotify(workbook, this);
}
extensionsAddNotify(workbook);
- ((CommentManagerImpl) workbook.getCommentManager())
- .objectAddNotify(getId(), this);
+
+ boolean isRevising = (workbook.getAdaptableRegistry()
+ .getAdaptableByNode(sheet.getImplementation()) != sheet);
+ if (!isRevising) {
+ ((CommentManagerImpl) workbook.getCommentManager())
+ .objectAddNotify(getId(), this);
+ }
}
protected void removeNotify(WorkbookImpl workbook, SheetImpl sheet,
TopicImpl parent) {
- ((CommentManagerImpl) workbook.getCommentManager())
- .objectRemoveNotify(getId(), this);
+ boolean isRevising = (workbook.getAdaptableRegistry()
+ .getAdaptableByNode(sheet.getImplementation()) != sheet);
+ if (!isRevising) {
+ ((CommentManagerImpl) workbook.getCommentManager())
+ .objectRemoveNotify(getId(), this);
+ }
+
extensionsRemoveNotify(workbook);
for (ISummary s : getSummaries()) {
((SummaryImpl) s).removeNotify(workbook, this);
diff --git a/bundles/org.xmind.core/src/org/xmind/core/internal/dom/WorkbookExtensionElementImpl.java b/bundles/org.xmind.core/src/org/xmind/core/internal/dom/WorkbookExtensionElementImpl.java
new file mode 100644
index 000000000..c9515a37f
--- /dev/null
+++ b/bundles/org.xmind.core/src/org/xmind/core/internal/dom/WorkbookExtensionElementImpl.java
@@ -0,0 +1,226 @@
+package org.xmind.core.internal.dom;
+
+import static org.xmind.core.internal.dom.DOMConstants.ATTR_OBJECT_ID;
+import static org.xmind.core.internal.dom.DOMConstants.ATTR_RESOURCE_PATH;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import org.w3c.dom.Element;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+import org.xmind.core.IWorkbook;
+import org.xmind.core.IWorkbookExtension;
+import org.xmind.core.IWorkbookExtensionElement;
+import org.xmind.core.internal.WorkbookExtensionElement;
+import org.xmind.core.util.DOMUtils;
+
+/**
+ * @author Jason Wong
+ */
+public class WorkbookExtensionElementImpl extends WorkbookExtensionElement {
+
+ private Element implementation;
+
+ private WorkbookImpl workbook;
+
+ private WorkbookExtensionImpl extension;
+
+ public WorkbookExtensionElementImpl(Element implementation,
+ WorkbookImpl workbook, WorkbookExtensionImpl extension) {
+ this.implementation = implementation;
+ this.workbook = workbook;
+ this.extension = extension;
+ }
+
+ public Element getImplementation() {
+ return implementation;
+ }
+
+ public IWorkbook getOwnedWorkbook() {
+ return workbook;
+ }
+
+ public IWorkbookExtension getExtension() {
+ return extension;
+ }
+
+ public String getName() {
+ return implementation.getTagName();
+ }
+
+ public List getChildren() {
+ return getChildren(null);
+ }
+
+ public List getChildren(String elementName) {
+ return DOMUtils.getChildList(implementation, elementName, extension);
+ }
+
+ public IWorkbookExtensionElement getParent() {
+ Node p = implementation.getParentNode();
+ if (p == null || !(p instanceof Element))
+ return null;
+ return extension.getElement((Element) p);
+ }
+
+ public IWorkbookExtensionElement createChild(String elementName) {
+ Element childImpl = DOMUtils.createElement(implementation, elementName);
+ WorkbookExtensionElementImpl child = new WorkbookExtensionElementImpl(
+ childImpl, workbook, extension);
+ registerChild(child);
+ workbook.updateModificationInfo();
+ return child;
+ }
+
+ public IWorkbookExtensionElement getFirstChild(String elementName) {
+ Element childImpl = DOMUtils.getFirstChildElementByTag(implementation,
+ elementName);
+ return childImpl == null ? null : extension.getElement(childImpl);
+ }
+
+ public void addChild(IWorkbookExtensionElement child, int index) {
+ WorkbookExtensionElementImpl c = (WorkbookExtensionElementImpl) child;
+ if (c.getExtension() != this.getExtension()
+ || c.getOwnedWorkbook() != this.getOwnedWorkbook())
+ return;
+
+ IWorkbookExtensionElement oldParent = c.getParent();
+ if (oldParent != null)
+ oldParent.deleteChild(child);
+
+ Element childImpl = c.getImplementation();
+ Element[] es = DOMUtils.getChildElements(implementation);
+ if (index >= 0 && index < es.length)
+ implementation.insertBefore(childImpl, es[index]);
+ else
+ implementation.appendChild(childImpl);
+ registerChild(c);
+ workbook.updateModificationInfo();
+ }
+
+ public void deleteChild(IWorkbookExtensionElement child) {
+ WorkbookExtensionElementImpl c = (WorkbookExtensionElementImpl) child;
+ Element childImpl = c.getImplementation();
+ if (childImpl.getParentNode() == implementation) {
+ unregisterChild(c);
+ implementation.removeChild(childImpl);
+ workbook.updateModificationInfo();
+ }
+ }
+
+ public void deleteChildren() {
+ deleteChildren(null);
+ }
+
+ public void deleteChildren(String elementName) {
+ Element[] children;
+ if (elementName == null)
+ children = DOMUtils.getChildElements(implementation);
+ else
+ children = DOMUtils.getChildElementsByTag(implementation,
+ elementName);
+
+ for (int i = 0; i < children.length; i++)
+ implementation.removeChild(children[i]);
+
+ if (children.length > 0)
+ workbook.updateModificationInfo();
+ }
+
+ public Set getAttributeKeys() {
+ Set keys = new HashSet();
+ NamedNodeMap atts = implementation.getAttributes();
+ for (int i = 0; i < atts.getLength(); i++) {
+ Node att = atts.item(i);
+ String key = att.getNodeName();
+ if (key != null && !"".equals(key)) //$NON-NLS-1$
+ keys.add(key);
+ }
+ return keys;
+ }
+
+ public String getAttribute(String attrName) {
+ return DOMUtils.getAttribute(implementation, attrName);
+ }
+
+ public void setAttribute(String attrName, String attrValue) {
+ DOMUtils.setAttribute(implementation, attrName, attrValue);
+ workbook.updateModificationInfo();
+ }
+
+ public String getTextContent() {
+ Node c = implementation.getFirstChild();
+ if (c != null && c.getNodeType() == Node.TEXT_NODE)
+ return c.getTextContent();
+ return null;
+ }
+
+ public void setTextContent(String text) {
+ Node c = implementation.getFirstChild();
+ if (text == null) {
+ if (c != null) {
+ implementation.removeChild(c);
+ workbook.updateModificationInfo();
+ }
+ } else {
+ if (c != null && c.getNodeType() == Node.TEXT_NODE) {
+ c.setTextContent(text);
+ } else {
+ Node t = implementation.getOwnerDocument().createTextNode(text);
+ implementation.insertBefore(t, c);
+ }
+ workbook.updateModificationInfo();
+ }
+ }
+
+ public void setResourcePath(String resourcePath) {
+ setAttribute(ATTR_RESOURCE_PATH, resourcePath);
+ }
+
+ public String getResourcePath() {
+ return getAttribute(ATTR_RESOURCE_PATH);
+ }
+
+ public void setObjectId(String objectId) {
+ setAttribute(ATTR_OBJECT_ID, objectId);
+ }
+
+ public String getObjectId() {
+ return getAttribute(ATTR_OBJECT_ID);
+ }
+
+ private void registerChild(WorkbookExtensionElementImpl child) {
+ extension.registerElement(child);
+ }
+
+ private void unregisterChild(WorkbookExtensionElementImpl child) {
+ extension.unregisterElement(child);
+ }
+
+ public boolean isOrphan() {
+ return DOMUtils.isOrphanNode(implementation);
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (obj == this)
+ return true;
+ if (obj == null || !(obj instanceof WorkbookExtensionElementImpl))
+ return false;
+ WorkbookExtensionElementImpl that = (WorkbookExtensionElementImpl) obj;
+ return this.implementation == that.implementation;
+ }
+
+ @Override
+ public int hashCode() {
+ return implementation.hashCode();
+ }
+
+ @Override
+ public String toString() {
+ return "{element:}" + getName() + "}"; //$NON-NLS-1$//$NON-NLS-2$
+ }
+
+}
diff --git a/bundles/org.xmind.core/src/org/xmind/core/internal/dom/WorkbookExtensionImpl.java b/bundles/org.xmind.core/src/org/xmind/core/internal/dom/WorkbookExtensionImpl.java
new file mode 100644
index 000000000..f3a0c9153
--- /dev/null
+++ b/bundles/org.xmind.core/src/org/xmind/core/internal/dom/WorkbookExtensionImpl.java
@@ -0,0 +1,210 @@
+package org.xmind.core.internal.dom;
+
+import static org.xmind.core.internal.dom.DOMConstants.ATTR_PROVIDER;
+import static org.xmind.core.internal.dom.DOMConstants.TAG_CONTENT;
+import static org.xmind.core.internal.dom.DOMConstants.TAG_RESOURCE_REF;
+import static org.xmind.core.internal.dom.DOMConstants.TAG_RESOURCE_REFS;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.xmind.core.IAdaptable;
+import org.xmind.core.IResourceRef;
+import org.xmind.core.IWorkbook;
+import org.xmind.core.IWorkbookExtensionElement;
+import org.xmind.core.internal.WorkbookExtension;
+import org.xmind.core.util.DOMUtils;
+
+/**
+ * @author Jason Wong
+ */
+public class WorkbookExtensionImpl extends WorkbookExtension
+ implements INodeAdaptableProvider {
+
+ private Map eleMap = new HashMap();
+
+ private Document implementation;
+
+ private WorkbookImpl workbook;
+
+ private WorkbookExtensionElementImpl content;
+
+ public WorkbookExtensionImpl(Document implementation,
+ WorkbookImpl workbook) {
+ this.implementation = implementation;
+ this.workbook = workbook;
+ init();
+ }
+
+ private void init() {
+ Element e = getExtensionElement();
+ for (NS ns : NS.values()) {
+ if (ns.getPrefix().equals(e.getTagName()))
+ NS.setNS(ns, e);
+ }
+ }
+
+ private Element getExtensionElement() {
+ return implementation.getDocumentElement();
+ }
+
+ protected void addNotify(WorkbookImpl workbook) {
+ for (IResourceRef ref : getResourceRefs())
+ ((ResourceRefImpl) ref).addNotify(workbook);
+ }
+
+ protected void removeNotify(WorkbookImpl workbook) {
+ for (IResourceRef ref : getResourceRefs())
+ ((ResourceRefImpl) ref).removeNotify(workbook);
+ }
+
+ public Document getImplementation() {
+ return implementation;
+ }
+
+ public String getProviderName() {
+ return getExtensionElement().getAttribute(ATTR_PROVIDER);
+ }
+
+ public IWorkbookExtensionElement getContent() {
+ if (content == null) {
+ content = new WorkbookExtensionElementImpl(getContentElement(),
+ workbook, this);
+ registerElement(content);
+ }
+ return content;
+ }
+
+ private Element getContentElement() {
+ return DOMUtils.ensureChildElement(getExtensionElement(), TAG_CONTENT);
+ }
+
+ public List getResourceRefs() {
+ Element refsEle = getRefsElement();
+ if (refsEle != null)
+ return DOMUtils.getChildList(refsEle, TAG_RESOURCE_REF,
+ workbook.getAdaptableRegistry());
+ return EMPTY_REFS;
+ }
+
+ public IResourceRef getResourceRef(String resourceId) {
+ if (resourceId != null && !"".equals(resourceId)) { //$NON-NLS-1$
+ for (IResourceRef ref : getResourceRefs()) {
+ if (resourceId.equals(ref.getResourceId()))
+ return ref;
+ }
+ }
+ return null;
+ }
+
+ public void addResourceRef(IResourceRef ref) {
+ importResourceRef(ref);
+
+ Element refEle = ((ResourceRefImpl) ref).getImplementation();
+ Element refsEle = DOMUtils.ensureChildElement(getExtensionElement(),
+ TAG_RESOURCE_REFS);
+ Node n = refsEle.appendChild(refEle);
+ if (n != null) {
+ if (!isOrphan())
+ ((ResourceRefImpl) ref).addNotify(workbook);
+ }
+ workbook.updateModificationInfo();
+ }
+
+ private void importResourceRef(IResourceRef ref) {
+ Element oldValue = ((ResourceRefImpl) ref).getImplementation();
+
+ Element newValue = implementation.createElement(oldValue.getTagName());
+ newValue.setAttribute(DOMConstants.ATTR_RESOURCE_ID,
+ ref.getResourceId());
+ newValue.setAttribute(DOMConstants.ATTR_TYPE, ref.getType());
+
+ ((ResourceRefImpl) ref).setImplementation(newValue);
+ }
+
+ public void removeResourceRef(IResourceRef ref) {
+ Element refsEle = getRefsElement();
+ if (refsEle == null)
+ return;
+
+ Element refEle = ((ResourceRefImpl) ref).getImplementation();
+ if (refEle.getParentNode() == refsEle) {
+ ((ResourceRefImpl) ref).removeNotify(workbook);
+ Node n = refsEle.removeChild(refEle);
+ if (!refsEle.hasChildNodes())
+ getExtensionElement().removeChild(refsEle);
+ if (n != null)
+ workbook.updateModificationInfo();
+ }
+ }
+
+ private Element getRefsElement() {
+ return DOMUtils.getFirstChildElementByTag(getExtensionElement(),
+ TAG_RESOURCE_REFS);
+ }
+
+ public IWorkbook getOwnedWorkbook() {
+ return workbook;
+ }
+
+ public IAdaptable getAdaptable(Node node) {
+ if (node instanceof Element)
+ return getElement((Element) node);
+ return null;
+ }
+
+ public T getAdapter(Class adapter) {
+ if (adapter.isAssignableFrom(Element.class))
+ return adapter.cast(getImplementation());
+ return super.getAdapter(adapter);
+ }
+
+ protected WorkbookExtensionElementImpl getElement(Element impl) {
+ if (impl == getExtensionElement())
+ return null;
+
+ WorkbookExtensionElementImpl ele = eleMap.get(impl);
+ if (ele == null) {
+ ele = new WorkbookExtensionElementImpl(impl, workbook, this);
+ registerElement(ele);
+ }
+ return ele;
+ }
+
+ protected void registerElement(WorkbookExtensionElementImpl element) {
+ eleMap.put(element.getImplementation(), element);
+ }
+
+ protected void unregisterElement(WorkbookExtensionElementImpl element) {
+ eleMap.remove(element.getImplementation());
+ }
+
+ public boolean isOrphan() {
+ return DOMUtils.isOrphanNode(implementation);
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (obj == this)
+ return true;
+ if (obj == null || !(obj instanceof WorkbookExtensionImpl))
+ return false;
+ WorkbookExtensionImpl that = (WorkbookExtensionImpl) obj;
+ return this.implementation == that.implementation;
+ }
+
+ @Override
+ public int hashCode() {
+ return implementation.hashCode();
+ }
+
+ @Override
+ public String toString() {
+ return "{workbook-extension:" + getProviderName() + "}"; //$NON-NLS-1$ //$NON-NLS-2$
+ }
+
+}
diff --git a/bundles/org.xmind.core/src/org/xmind/core/internal/dom/WorkbookExtensionManagerImpl.java b/bundles/org.xmind.core/src/org/xmind/core/internal/dom/WorkbookExtensionManagerImpl.java
new file mode 100644
index 000000000..3b4dea6db
--- /dev/null
+++ b/bundles/org.xmind.core/src/org/xmind/core/internal/dom/WorkbookExtensionManagerImpl.java
@@ -0,0 +1,148 @@
+package org.xmind.core.internal.dom;
+
+import static org.xmind.core.internal.dom.DOMConstants.ATTR_PROVIDER;
+import static org.xmind.core.internal.dom.DOMConstants.TAG_EXTENSION;
+import static org.xmind.core.internal.dom.DOMConstants.TAG_EXTENSIONS;
+import static org.xmind.core.internal.zip.ArchiveConstants.PATH_EXTENSIONS;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.xmind.core.IFileEntry;
+import org.xmind.core.IManifest;
+import org.xmind.core.IWorkbook;
+import org.xmind.core.IWorkbookExtension;
+import org.xmind.core.internal.WorkbookExtensionManager;
+import org.xmind.core.util.DOMUtils;
+
+/**
+ * @author Jason Wong
+ */
+public class WorkbookExtensionManagerImpl extends WorkbookExtensionManager {
+
+ private WorkbookImpl ownedWorkbook;
+
+ private Map extensions = new HashMap();
+
+ public WorkbookExtensionManagerImpl() {
+ }
+
+ protected void setOwnedWorkbook(WorkbookImpl ownedWorkbook) {
+ this.ownedWorkbook = ownedWorkbook;
+ }
+
+ public IWorkbook getOwnedWorkbook() {
+ return ownedWorkbook;
+ }
+
+ public IWorkbookExtension createExtension(String providerName) {
+ return createExtension(providerName, null);
+ }
+
+ protected IWorkbookExtension createExtension(String providerName,
+ Document doc) {
+ if (providerName == null || "".equals(providerName)) //$NON-NLS-1$
+ return null;
+
+ IWorkbookExtension ext = extensions.get(providerName);
+ if (ext == null) {
+ if (doc == null)
+ doc = createExtensionDocument(providerName);
+ ensureExtensionElement(providerName);
+ ensureFileEntry(providerName);
+
+ ext = new WorkbookExtensionImpl(doc, ownedWorkbook);
+ extensions.put(providerName, (WorkbookExtensionImpl) ext);
+ ((WorkbookExtensionImpl) ext).addNotify(ownedWorkbook);
+ ownedWorkbook.updateModificationInfo();
+ }
+ return ext;
+ }
+
+ private void ensureExtensionElement(String provider) {
+ Element extsEle = DOMUtils.ensureChildElement(getWorkbookElement(),
+ TAG_EXTENSIONS);
+ Element[] es = DOMUtils.getChildElementsByTag(extsEle, TAG_EXTENSION);
+ for (Element e : es) {
+ if (provider.equals(e.getAttribute(//
+ ATTR_PROVIDER)))
+ return;
+ }
+
+ Element e = DOMUtils.createElement(extsEle, TAG_EXTENSION);
+ e.setAttribute(ATTR_PROVIDER, provider);
+ }
+
+ private Document createExtensionDocument(String provider) {
+ Document doc = DOMUtils.createDocument(getExtensionTag(provider));
+ doc.getDocumentElement().setAttribute(ATTR_PROVIDER, provider);
+ return doc;
+ }
+
+ private void ensureFileEntry(String provider) {
+ IManifest m = ownedWorkbook.getManifest();
+ String path = PATH_EXTENSIONS + provider + ".xml";//$NON-NLS-1$
+ IFileEntry entry = m.getFileEntry(path);
+ if (entry == null) {
+ m.createFileEntry(path).increaseReference();
+ }
+ }
+
+ private Element getWorkbookElement() {
+ return ownedWorkbook.getWorkbookElement();
+ }
+
+ private String getExtensionTag(String providerName) {
+ if (providerName.contains(".")) { //$NON-NLS-1$
+ int index = providerName.lastIndexOf("."); //$NON-NLS-1$
+ if (index > 0 && index < providerName.length())
+ return providerName.substring(index + 1);
+ }
+ return providerName;
+ }
+
+ public List getExtensions() {
+ return new ArrayList(extensions.values());
+ }
+
+ public IWorkbookExtension getExtension(String provider) {
+ if (provider != null && !"".equals(provider)) { //$NON-NLS-1$
+ for (IWorkbookExtension e : getExtensions()) {
+ if (provider.equals(e.getProviderName()))
+ return e;
+ }
+ }
+ return null;
+ }
+
+ public void deleteExtension(String providerName) {
+ // TODO Auto-generated method stub
+ }
+
+ public List getProviders() {
+ Element es = DOMUtils.getFirstChildElementByTag(getWorkbookElement(),
+ TAG_EXTENSIONS);
+ if (es != null) {
+ Element[] eles = DOMUtils.getChildElementsByTag(es, TAG_EXTENSION);
+ List providers = new ArrayList();
+ for (Element ele : eles) {
+ String provider = ele.getAttribute(ATTR_PROVIDER);
+ if (provider != null && !"".equals(provider)) { //$NON-NLS-1$
+ providers.add(provider);
+ }
+ }
+ return providers;
+ }
+ return Collections.emptyList();
+ }
+
+ public boolean isOrphan() {
+ return false;
+ }
+
+}
diff --git a/bundles/org.xmind.core/src/org/xmind/core/internal/dom/WorkbookImpl.java b/bundles/org.xmind.core/src/org/xmind/core/internal/dom/WorkbookImpl.java
index 5dc2ed31f..b0db14360 100644
--- a/bundles/org.xmind.core/src/org/xmind/core/internal/dom/WorkbookImpl.java
+++ b/bundles/org.xmind.core/src/org/xmind/core/internal/dom/WorkbookImpl.java
@@ -1,15 +1,12 @@
-/* ******************************************************************************
- * Copyright (c) 2006-2012 XMind Ltd. and others.
- *
- * This file is a part of XMind 3. XMind releases 3 and
- * above are dual-licensed under the Eclipse Public License (EPL),
- * which is available at http://www.eclipse.org/legal/epl-v10.html
- * and the GNU Lesser General Public License (LGPL),
- * which is available at http://www.gnu.org/licenses/lgpl.html
- * See http://www.xmind.net/license.html for details.
- *
- * Contributors:
- * XMind Ltd. - initial API and implementation
+/*
+ * *****************************************************************************
+ * * Copyright (c) 2006-2012 XMind Ltd. and others. This file is a part of XMind
+ * 3. XMind releases 3 and above are dual-licensed under the Eclipse Public
+ * License (EPL), which is available at
+ * http://www.eclipse.org/legal/epl-v10.html and the GNU Lesser General Public
+ * License (LGPL), which is available at http://www.gnu.org/licenses/lgpl.html
+ * See http://www.xmind.net/license.html for details. Contributors: XMind Ltd. -
+ * initial API and implementation
*******************************************************************************/
package org.xmind.core.internal.dom;
@@ -56,6 +53,7 @@
import org.xmind.core.ISummary;
import org.xmind.core.ITopic;
import org.xmind.core.IWorkbookComponentRefManager;
+import org.xmind.core.IWorkbookExtensionManager;
import org.xmind.core.event.CoreEvent;
import org.xmind.core.event.ICoreEventListener;
import org.xmind.core.event.ICoreEventRegistration;
@@ -76,7 +74,6 @@
/**
* @author briansun
- *
*/
public class WorkbookImpl extends Workbook
implements ICoreEventSource, ICoreEventSource2, INodeAdaptableFactory {
@@ -105,6 +102,8 @@ public class WorkbookImpl extends Workbook
private RevisionRepositoryImpl revisionRepository = null;
+ private WorkbookExtensionManagerImpl extensionManager;
+
/**
* @param implementation
*/
@@ -114,7 +113,6 @@ public WorkbookImpl(Document implementation, IStorage storage) {
}
/**
- *
* @param implementation
* @param manifest
*/
@@ -195,36 +193,37 @@ public String toString() {
return "Workbook{" + hashCode() + "}"; //$NON-NLS-1$ //$NON-NLS-2$
}
- public Object getAdapter(Class adapter) {
- if (adapter == IStorage.class)
- return getStorage();
- if (adapter == IEntryStreamNormalizer.class)
- return manifest.getStreamNormalizer();
- if (adapter == ICoreEventSource.class)
- return this;
- if (adapter == Document.class || adapter == Node.class)
- return implementation;
- if (adapter == Element.class)
- return getWorkbookElement();
- if (adapter == IMarkerSheet.class)
- return getMarkerSheet();
- if (adapter == IManifest.class)
- return getManifest();
- if (adapter == ICoreEventSupport.class)
- return getCoreEventSupport();
- if (adapter == INodeAdaptableFactory.class)
- return this;
- if (adapter == INodeAdaptableProvider.class)
- return getAdaptableRegistry();
- if (adapter == IMarkerRefCounter.class)
- return getMarkerRefCounter();
- if (adapter == IStyleRefCounter.class)
- return getStyleRefCounter();
- if (adapter == IWorkbookComponentRefManager.class)
- return getElementRefCounter();
- if (adapter == IRevisionRepository.class)
- return getRevisionRepository();
-
+ public T getAdapter(Class adapter) {
+ if (IStorage.class.equals(adapter))
+ return adapter.cast(getStorage());
+ if (IEntryStreamNormalizer.class.equals(adapter))
+ return adapter.cast(manifest.getStreamNormalizer());
+ if (ICoreEventSource.class.equals(adapter))
+ return adapter.cast(this);
+ if (adapter.isAssignableFrom(Document.class))
+ return adapter.cast(implementation);
+ if (adapter.isAssignableFrom(Element.class))
+ return adapter.cast(getWorkbookElement());
+ if (IMarkerSheet.class.equals(adapter))
+ return adapter.cast(getMarkerSheet());
+ if (IManifest.class.equals(adapter))
+ return adapter.cast(getManifest());
+ if (ICoreEventSupport.class.equals(adapter))
+ return adapter.cast(getCoreEventSupport());
+ if (INodeAdaptableFactory.class.equals(adapter))
+ return adapter.cast(this);
+ if (INodeAdaptableProvider.class.equals(adapter))
+ return adapter.cast(getAdaptableRegistry());
+ if (IMarkerRefCounter.class.equals(adapter))
+ return adapter.cast(getMarkerRefCounter());
+ if (IStyleRefCounter.class.equals(adapter))
+ return adapter.cast(getStyleRefCounter());
+ if (IWorkbookComponentRefManager.class.equals(adapter))
+ return adapter.cast(getElementRefCounter());
+ if (IRevisionRepository.class.equals(adapter))
+ return adapter.cast(getRevisionRepository());
+ if (IWorkbookExtensionManager.class.equals(adapter))
+ return adapter.cast(getWorkbookExtensionManager());
return super.getAdapter(adapter);
}
@@ -522,7 +521,6 @@ public ICloneData clone(Collection sources) {
/*
* (non-Javadoc)
- *
* @see org.xmind.core.IWorkbook#importElement(org.xmind.core.IAdaptable)
*/
public IAdaptable importElement(IAdaptable source) {
@@ -545,7 +543,6 @@ public IResourceRef createResourceRef(String resourceType,
/*
* (non-Javadoc)
- *
* @see org.xmind.core.IWorkbook#findElementById(java.lang.String,
* org.xmind.core.IAdaptable)
*/
@@ -613,7 +610,6 @@ public ICoreEventRegistration registerOnceCoreEventListener(String type,
/*
* (non-Javadoc)
- *
* @see
* org.xmind.core.event.ICoreEventSource2#hasOnceListeners(java.lang.String)
*/
@@ -737,7 +733,6 @@ public void setTempLocation(String tempLocation) {
/*
* (non-Javadoc)
- *
* @see org.xmind.core.IWorkbook#setPassword(java.lang.String)
*/
@Deprecated
@@ -747,7 +742,6 @@ public void setPassword(String password) {
/*
* (non-Javadoc)
- *
* @see org.xmind.core.IWorkbook#getPassword()
*/
@Deprecated
@@ -777,7 +771,6 @@ protected void updateModificationInfo() {
/*
* (non-Javadoc)
- *
* @see org.xmind.core.IWorkbook#getCommentManager()
*/
public org.xmind.core.ICommentManager getCommentManager() {
@@ -839,4 +832,12 @@ private void handleMarkerGroupManagement(IMarkerGroup group,
}
}
+ private IWorkbookExtensionManager getWorkbookExtensionManager() {
+ if (extensionManager == null) {
+ extensionManager = new WorkbookExtensionManagerImpl();
+ extensionManager.setOwnedWorkbook(this);
+ }
+ return extensionManager;
+ }
+
}
diff --git a/bundles/org.xmind.core/src/org/xmind/core/internal/dom/WorkbookUtilsImpl.java b/bundles/org.xmind.core/src/org/xmind/core/internal/dom/WorkbookUtilsImpl.java
index e25108fc4..185e2b93d 100644
--- a/bundles/org.xmind.core/src/org/xmind/core/internal/dom/WorkbookUtilsImpl.java
+++ b/bundles/org.xmind.core/src/org/xmind/core/internal/dom/WorkbookUtilsImpl.java
@@ -13,44 +13,17 @@
*******************************************************************************/
package org.xmind.core.internal.dom;
-import static org.xmind.core.internal.dom.DOMConstants.ATTR_STYLE_ID;
-import static org.xmind.core.internal.dom.DOMConstants.TAG_PROPERTIES;
-
import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Arrays;
import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
import org.xmind.core.Core;
import org.xmind.core.ICloneData;
-import org.xmind.core.IFileEntry;
-import org.xmind.core.IManifest;
import org.xmind.core.IWorkbook;
import org.xmind.core.IWorkbookComponent;
import org.xmind.core.internal.CloneData;
-import org.xmind.core.internal.zip.ArchiveConstants;
import org.xmind.core.marker.IMarker;
-import org.xmind.core.marker.IMarkerGroup;
-import org.xmind.core.marker.IMarkerResource;
-import org.xmind.core.marker.IMarkerSheet;
-import org.xmind.core.style.IStyle;
import org.xmind.core.style.IStyled;
import org.xmind.core.util.CloneHandler;
-import org.xmind.core.util.DOMUtils;
-import org.xmind.core.util.FileUtils;
-import org.xmind.core.util.HyperlinkUtils;
-import org.xmind.core.util.Property;
public class WorkbookUtilsImpl {
@@ -78,216 +51,13 @@ public static ICloneData clone(IWorkbook targetWorkbook,
try {
handler.cloneObject(source);
} catch (IOException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+ Core.getLogger().log(e);
}
}
}
return result;
}
- private static Node clone(Document doc, Node source) {
- if (source.getOwnerDocument() == doc) {
- return source.cloneNode(true);
- }
- return doc.importNode(source, true);
- }
-
- private static IMarker cloneMarker(WorkbookImpl targetWorkbook,
- MarkerSheetImpl targetMarkerSheet, String sourceMarkerId,
- IMarker sourceMarker, IMarkerSheet sourceMarkerSheet,
- CloneData data) {
- if (!sourceMarkerSheet.isPermanent()) {
- IMarkerGroup sourceGroup = sourceMarker.getParent();
- if (sourceGroup != null) {
- String sourceGroupId = sourceGroup.getId();
- String clonedGroupId = data.getString(
- ICloneData.MARKERSHEET_COMPONENTS, sourceGroupId);
- if (clonedGroupId == null
- && !data.isCloned(ICloneData.MARKERSHEET_COMPONENTS,
- sourceGroupId)) {
- IMarkerGroup targetGroup = targetMarkerSheet
- .getMarkerGroup(sourceGroupId);
- if (targetGroup != null && targetMarkerSheet
- .equals(targetGroup.getOwnedSheet())) {
- data.putString(ICloneData.MARKERSHEET_COMPONENTS,
- sourceGroupId, sourceGroupId);
- } else {
- cloneMarkerGroup(targetWorkbook, targetMarkerSheet,
- sourceMarker, sourceGroup, sourceMarkerSheet,
- data);
- }
- String clonedMarkerId = data.getString(
- ICloneData.MARKERSHEET_COMPONENTS, sourceMarkerId);
- if (clonedMarkerId != null) {
- return targetMarkerSheet.getMarker(clonedMarkerId);
- }
- IMarker targetMarker = targetMarkerSheet
- .getMarker(sourceMarkerId);
- if (targetMarker == null) {
- //TODO clone missing marker
- }
- }
- }
- }
- return sourceMarker;
- }
-
- private static void cloneMarkerGroup(WorkbookImpl targetWorkbook,
- MarkerSheetImpl targetMarkerSheet, IMarker sourceMarker,
- IMarkerGroup sourceGroup, IMarkerSheet sourceMarkerSheet,
- CloneData data) {
- MarkerGroupImpl targetGroup;
-
- IMarkerGroup existingGroup = targetMarkerSheet
- .getMarkerGroup(sourceGroup.getId());
- if (existingGroup != null
- && targetMarkerSheet.equals(existingGroup.getOwnedSheet())) {
- targetGroup = (MarkerGroupImpl) existingGroup;
- //TODO clone ungrouped markers
- } else {
- Node sourceGroupNode = (Node) sourceGroup.getAdapter(Node.class);
- if (sourceGroupNode != null) {
- Node clonedGroupNode = targetMarkerSheet.getImplementation()
- .importNode(sourceGroupNode, true);
- replaceMarkerPath(targetWorkbook, targetMarkerSheet,
- clonedGroupNode, data);
- MarkerGroupImpl clonedGroup = (MarkerGroupImpl) targetMarkerSheet
- .getElementAdapter(clonedGroupNode);
- transferMarkerResources(targetWorkbook, targetMarkerSheet,
- clonedGroup, sourceGroup, sourceMarkerSheet, data);
- targetGroup = clonedGroup;
- } else {
- targetGroup = (MarkerGroupImpl) targetMarkerSheet
- .createMarkerGroup(sourceGroup.isSingleton());
- cloneMarkerGroup(targetWorkbook, targetMarkerSheet, targetGroup,
- sourceGroup, sourceMarkerSheet, data);
- }
- }
- data.putString(ICloneData.MARKERSHEET_COMPONENTS, sourceGroup.getId(),
- targetGroup.getId());
- }
-
- private static void transferMarkerResources(WorkbookImpl targetWorkbook,
- MarkerSheetImpl targetMarkerSheet, MarkerGroupImpl targetGroup,
- IMarkerGroup sourceGroup, IMarkerSheet sourceMarkerSheet,
- CloneData data) {
- for (IMarker targetMarker : targetGroup.getMarkers()) {
- String markerId = targetMarker.getId();
- IMarker sourceMarker = sourceMarkerSheet.getMarker(markerId);
- if (sourceMarker != null) {
- transferMarkerResource(targetWorkbook, sourceMarker,
- targetMarker);
- }
- data.putString(ICloneData.MARKERSHEET_COMPONENTS, markerId,
- markerId);
- }
- }
-
- private static void cloneMarkerGroup(WorkbookImpl targetWorkbook,
- MarkerSheetImpl targetMarkerSheet, MarkerGroupImpl targetGroup,
- IMarkerGroup sourceGroup, IMarkerSheet sourceMarkerSheet,
- CloneData data) {
- for (IMarker sourceMarker : sourceGroup.getMarkers()) {
- IMarker clonedMarker;
- String sourceMarkerId = sourceMarker.getId();
- IMarker existingMarker = targetMarkerSheet
- .getMarker(sourceMarkerId);
- if (existingMarker != null && targetMarkerSheet
- .equals(existingMarker.getOwnedSheet())) {
- clonedMarker = existingMarker;
- } else {
- clonedMarker = cloneMarker(targetWorkbook, targetMarkerSheet,
- sourceMarkerSheet, sourceMarker, data);
- targetGroup.addMarker(clonedMarker);
- }
- data.putString(ICloneData.MARKERSHEET_COMPONENTS, sourceMarkerId,
- clonedMarker.getId());
- }
- }
-
- private static IMarker cloneMarker(WorkbookImpl targetWorkbook,
- MarkerSheetImpl targetMarkerSheet, IMarkerSheet sourceMarkerSheet,
- IMarker sourceMarker, CloneData data) {
- IMarker clonedMarker;
- Node sourceMarkerNode = (Node) sourceMarker.getAdapter(Node.class);
- if (sourceMarkerNode != null) {
- Node clonedMarkerNode = targetMarkerSheet.getImplementation()
- .importNode(sourceMarkerNode, true);
- replaceMarkerPath(targetWorkbook, targetMarkerSheet,
- clonedMarkerNode, data);
- clonedMarker = (IMarker) targetMarkerSheet
- .getElementAdapter(clonedMarkerNode);
- } else {
- clonedMarker = createSimilarMarker(targetWorkbook,
- targetMarkerSheet, sourceMarker, sourceMarkerSheet, data);
- }
- transferMarkerResource(targetWorkbook, sourceMarker, clonedMarker);
- return clonedMarker;
- }
-
- private static void transferMarkerResource(WorkbookImpl targetWorkbook,
- IMarker sourceMarker, IMarker targetMarker) {
- IMarkerResource sourceResource = sourceMarker.getResource();
- if (sourceResource != null) {
- //IMarkerResource targetResource = targetMarker.getResource();
- try {
- InputStream is = sourceResource.openInputStream();
- if (is != null) {
- try {
- String targetPath = ArchiveConstants.PATH_MARKERS
- + targetMarker.getResourcePath();
- IFileEntry entry = targetWorkbook.getManifest()
- .createFileEntry(targetPath);
- OutputStream out = entry.openOutputStream();
- if (out != null) {
- FileUtils.transfer(is, out, true);
- }
- } finally {
- is.close();
- }
- }
- } catch (IOException e) {
- Core.getLogger().log(e,
- "Failed to transfer marker resource from " //$NON-NLS-1$
- + sourceMarker.getResourcePath() + " to " //$NON-NLS-1$
- + targetMarker.getResourcePath());
- }
- }
- }
-
- private static void replaceMarkerPath(WorkbookImpl targetWorkbook,
- MarkerSheetImpl targetMarkerSheet, Node node, CloneData data) {
- if (node instanceof Element) {
- Element ele = (Element) node;
- if (DOMConstants.TAG_MARKER.equals(ele.getTagName())) {
- String clonedPath = createNewMarkerPath(
- ele.getAttribute(DOMConstants.ATTR_RESOURCE));
- ele.setAttribute(DOMConstants.ATTR_RESOURCE, clonedPath);
- }
- Iterator it = DOMUtils.childElementIter(ele);
- while (it.hasNext()) {
- replaceMarkerPath(targetWorkbook, targetMarkerSheet, it.next(),
- data);
- }
- }
- }
-
- private static String createNewMarkerPath(String sourcePath) {
- String clonedPath = Core.getIdFactory().createId()
- + FileUtils.getExtension(sourcePath);
- return clonedPath;
- }
-
- private static MarkerImpl createSimilarMarker(WorkbookImpl targetWorkbook,
- MarkerSheetImpl targetMarkerSheet, IMarker sourceMarker,
- IMarkerSheet sourceMarkerSheet, CloneData data) {
- MarkerImpl newMarker = (MarkerImpl) targetMarkerSheet.createMarker(
- createNewMarkerPath(sourceMarker.getResourcePath()));
- newMarker.setName(sourceMarker.getName());
- return newMarker;
- }
-
public static void increaseStyleRef(WorkbookImpl workbook, IStyled styled) {
if (workbook == null || styled == null)
return;
@@ -310,269 +80,4 @@ public static void decreaseStyleRef(WorkbookImpl workbook, IStyled styled) {
workbook.getStyleRefCounter().decreaseRef(styleId);
}
- public static IStyle importStyle(StyleSheetImpl targetSheet,
- StyleImpl sourceStyle, StyleSheetImpl sourceSheet) {
- return importStyle(targetSheet, sourceStyle, sourceSheet,
- new CloneData(Arrays.asList(sourceStyle), null));
- }
-
- public static IStyle importStyle(StyleSheetImpl targetSheet,
- StyleImpl sourceStyle, StyleSheetImpl sourceSheet, CloneData data) {
- if (sourceSheet != null && sourceSheet.equals(targetSheet))
- return sourceStyle;
-
- if (sourceSheet == null)
- return importNoParentStyle(targetSheet, sourceStyle);
-
- if (data == null)
- data = new CloneData(Arrays.asList(sourceStyle), null);
- StyleProperties sourceProp = getStyleProperties(sourceStyle, data);
- if (sourceProp.isEmpty())
- return null;
-
- String sourceGroup = sourceSheet.findOwnedGroup(sourceStyle);
- IStyle targetStyle = findSimilarStyle(targetSheet, sourceGroup,
- sourceProp, data);
- if (targetStyle != null)
- return targetStyle;
-
- cloneStyle(targetSheet, sourceStyle, sourceSheet, data);
- targetStyle = (IStyle) data.get(sourceStyle);
-
- if (targetStyle != null && sourceGroup != null) {
- targetSheet.addStyle(targetStyle, sourceGroup);
- }
-
- return targetStyle;
- }
-
- private static IStyle findSimilarStyle(StyleSheetImpl targetSheet,
- String group, StyleProperties sourceProp, CloneData data) {
- Set styles;
- if (group == null)
- styles = targetSheet.getAllStyles();
- else
- styles = targetSheet.getStyles(group);
- for (IStyle style : styles) {
- if (sourceProp.equals(getStyleProperties(style, data)))
- return style;
- }
- return null;
- }
-
- private static class StyleProperties {
-
- Map properties = new HashMap();
-
- Map defaultStyles = new HashMap();
-
- public StyleProperties(IStyle style, CloneData data) {
- if (style == null)
- return;
- Iterator propIt = style.properties();
- while (propIt.hasNext()) {
- Property next = propIt.next();
- properties.put(next.key, next.value);
- }
- Iterator dsIt = style.defaultStyles();
- while (dsIt.hasNext()) {
- Property next = dsIt.next();
- String family = next.key;
- IStyle ds = style.getDefaultStyleById(next.value);
- StyleProperties dsProp = (StyleProperties) data.getCache(ds);
- if (dsProp == null) {
- dsProp = new StyleProperties(ds, data);
- }
- defaultStyles.put(family, dsProp);
- }
- data.cache(style, this);
- }
-
- public boolean isEmpty() {
- return properties.isEmpty() && defaultStyles.isEmpty();
- }
-
- public int hashCode() {
- return properties.hashCode() ^ defaultStyles.hashCode();
- }
-
- public boolean equals(Object obj) {
- if (obj == this)
- return true;
- if (obj == null || !(obj instanceof StyleProperties))
- return false;
- StyleProperties that = (StyleProperties) obj;
- return this.properties.equals(that.properties)
- && this.defaultStyles.equals(that.defaultStyles);
- }
- }
-
- private static StyleProperties getStyleProperties(IStyle style,
- CloneData data) {
- StyleProperties prop = (StyleProperties) data.getCache(style);
- if (prop == null) {
- prop = new StyleProperties(style, data);
- }
- return prop;
- }
-
- private static void cloneStyle(StyleSheetImpl targetSheet,
- StyleImpl sourceStyle, StyleSheetImpl sourceSheet, CloneData data) {
- Element sourceEle = sourceStyle.getImplementation();
- Node targetEle = clone(targetSheet.getImplementation(), sourceEle);
- if (targetEle instanceof Element) {
- IStyle sameIdStyle = targetSheet.findStyle(sourceStyle.getId());
- if (sameIdStyle != null) {
- DOMUtils.replaceId((Element) targetEle);
- }
- replaceStyleProperties(targetSheet, (Element) targetEle, sourceEle,
- sourceStyle, sourceSheet, data);
- }
- IStyle targetStyle = (IStyle) targetSheet.getNodeAdaptable(targetEle);
- data.put(sourceStyle, targetStyle);
- }
-
- private static void replaceStyleProperties(StyleSheetImpl targetSheet,
- Element targetEle, Element sourceEle, StyleImpl sourceStyle,
- StyleSheetImpl sourceSheet, CloneData data) {
- String type = targetEle.getAttribute(DOMConstants.ATTR_TYPE)
- .toLowerCase();
- String propTagName = type + "-" + TAG_PROPERTIES; //$NON-NLS-1$
- Iterator targetPropIt = DOMUtils
- .childElementIterByTag(targetEle, propTagName);
- while (targetPropIt.hasNext()) {
- Element targetPropEle = targetPropIt.next();
-
- NamedNodeMap attrs = targetPropEle.getAttributes();
- for (int i = 0; i < attrs.getLength(); i++) {
- Node attr = attrs.item(i);
-// String key = attr.getNodeName();
- String value = attr.getNodeValue();
- if (HyperlinkUtils.isAttachmentURL(value)
- || HyperlinkUtils.isInternalAttachmentURL(value)) {
- String newValue = cloneAttachment(value,
- sourceSheet.getManifest(),
- targetSheet.getManifest(), data);
- attr.setNodeValue(newValue);
- }
- }
-
- Iterator targetDSIt = DOMUtils.childElementIterByTag(
- targetPropEle, DOMConstants.TAG_DEFAULT_STYLE);
- while (targetDSIt.hasNext()) {
- Element targetDSEle = targetDSIt.next();
- String family = DOMUtils.getAttribute(targetDSEle,
- DOMConstants.ATTR_STYLE_FAMILY);
- if (family != null) {
- String dsId = DOMUtils.getAttribute(targetDSEle,
- DOMConstants.ATTR_STYLE_ID);
- IStyle sourceDS = sourceStyle.getDefaultStyleById(dsId);
- if (sourceDS != null) {
- IStyle targetDS = importStyle(targetSheet,
- (StyleImpl) sourceDS, sourceSheet, data);
- if (targetDS != null) {
- DOMUtils.setAttribute(targetDSEle, ATTR_STYLE_ID,
- targetDS.getId());
- }
- }
- }
- }
- }
- }
-
- private static String cloneAttachment(String sourceURL,
- IManifest sourceManifest, IManifest targetManifest,
- CloneData data) {
- String targetURL = data.getString(ICloneData.URLS, sourceURL);
- if (targetURL != null)
- return targetURL;
-
- boolean isSystemAttachment = sourceManifest == null
- && HyperlinkUtils.isInternalAttachmentURL(sourceURL);
- if (targetManifest == null
- || (sourceManifest == null && !isSystemAttachment)) {
- return (String) cache(data, sourceURL, sourceURL);
- }
-
- InputStream sourceInputStream = null;
-
- String sourcePath = null;
- String sourceMadiaType = null;
-
- if (isSystemAttachment) {
- try {
- URL url = new URL(sourceURL);
- sourceInputStream = url.openStream();
- sourcePath = url.getPath();
- String ext = FileUtils.getExtension(sourcePath);
- sourceMadiaType = generateMediaType(ext);
- } catch (MalformedURLException e1) {
- } catch (IOException e1) {
- }
- } else {
- IFileEntry sourceEntry = sourceManifest
- .getFileEntry(HyperlinkUtils.toAttachmentPath(sourceURL));
- if (sourceEntry == null)
- return (String) cache(data, sourceURL, sourceURL);
- try {
- sourceInputStream = sourceEntry.openInputStream();
- sourcePath = sourceEntry.getPath();
- } catch (IOException e) {
- }
- }
-
- String newPath = Core.getIdFactory().createId()
- + FileUtils.getExtension(sourcePath);
- String attachmentPath = targetManifest.makeAttachmentPath(newPath);
- String mediaType = sourceMadiaType;
- IFileEntry targetEntry = targetManifest.createFileEntry(attachmentPath,
- mediaType);
- targetEntry.increaseReference();
-
- if (sourceInputStream != null) {
- try {
- OutputStream os = targetEntry.openOutputStream();
- try {
- FileUtils.transfer(sourceInputStream, os, true);
- } finally {
- os.close();
- }
- } catch (IOException e) {
- Core.getLogger().log(e,
- "Failed to clone attachment " + sourceURL); //$NON-NLS-1$
- } finally {
- try {
- sourceInputStream.close();
- } catch (IOException e) {
- }
- }
- }
- targetURL = HyperlinkUtils.toAttachmentURL(targetEntry.getPath());
- return (String) cache(data, sourceURL, targetURL);
- }
-
- private static String generateMediaType(String ext) {
- String mediaType = "image/png"; //$NON-NLS-1$
- if ("gif".equalsIgnoreCase(ext)) { //$NON-NLS-1$
- mediaType = "image/gif"; //$NON-NLS-1$
- } else if ("jpeg".equalsIgnoreCase(ext)) { //$NON-NLS-1$
- mediaType = "image/jpeg"; //$NON-NLS-1$
- } else if ("bmp".equalsIgnoreCase(ext)) { //$NON-NLS-1$
- mediaType = "image/bmp"; //$NON-NLS-1$
- }
- return mediaType;
- }
-
- private static Object cache(CloneData data, Object source, Object target) {
- data.cache(source, target);
- return target;
- }
-
- private static IStyle importNoParentStyle(StyleSheetImpl targetSheet,
- StyleImpl sourceStyle) {
- Element sourceEle = sourceStyle.getImplementation();
- Node targetEle = clone(targetSheet.getImplementation(), sourceEle);
- return (IStyle) targetSheet.getNodeAdaptable(targetEle);
- }
-
-}
\ No newline at end of file
+}
diff --git a/bundles/org.xmind.core/src/org/xmind/core/internal/zip/ArchiveConstants.java b/bundles/org.xmind.core/src/org/xmind/core/internal/zip/ArchiveConstants.java
index c411de59f..8cc7180c0 100644
--- a/bundles/org.xmind.core/src/org/xmind/core/internal/zip/ArchiveConstants.java
+++ b/bundles/org.xmind.core/src/org/xmind/core/internal/zip/ArchiveConstants.java
@@ -79,4 +79,9 @@ public class ArchiveConstants {
*/
public static final String COMMENTS_XML = "comments.xml"; //$NON-NLS-1$
+ /**
+ *
+ */
+ public static final String PATH_EXTENSIONS = "extensions/"; //$NON-NLS-1$
+
}
\ No newline at end of file
diff --git a/bundles/org.xmind.core/src/org/xmind/core/io/CoreIOException.java b/bundles/org.xmind.core/src/org/xmind/core/io/CoreIOException.java
index 3cfded546..a6c09ffb2 100644
--- a/bundles/org.xmind.core/src/org/xmind/core/io/CoreIOException.java
+++ b/bundles/org.xmind.core/src/org/xmind/core/io/CoreIOException.java
@@ -8,14 +8,14 @@
* This class simply wraps a {@link CoreException} into an {@link IOException}
* so that, when performing I/O operations, core exceptions can be successfully
* thrown and caught.
- *
+ *
* @author Frank Shaka
- * @since 3.6.50
+ * @since 3.6.2
*/
public class CoreIOException extends IOException {
/**
- *
+ *
*/
private static final long serialVersionUID = -5617725226498169561L;
diff --git a/bundles/org.xmind.core/src/org/xmind/core/marker/AbstractMarkerResource.java b/bundles/org.xmind.core/src/org/xmind/core/marker/AbstractMarkerResource.java
index 796cff553..fe043c530 100644
--- a/bundles/org.xmind.core/src/org/xmind/core/marker/AbstractMarkerResource.java
+++ b/bundles/org.xmind.core/src/org/xmind/core/marker/AbstractMarkerResource.java
@@ -71,7 +71,6 @@ protected void loadVariations(List variations) {
/*
* (non-Javadoc)
- *
* @see org.xmind.core.marker.IMarkerResource#getInputStream()
*/
public InputStream getInputStream() {
@@ -84,9 +83,9 @@ public InputStream getInputStream() {
/*
* (non-Javadoc)
- *
* @see org.xmind.core.marker.IMarkerResource#getOutputStream()
*/
+ @Deprecated
public OutputStream getOutputStream() {
try {
return openOutputStream();
@@ -116,6 +115,16 @@ public InputStream openInputStream(IMarkerVariation variation)
return openInputStream();
}
+ public InputStream openInputStream(int zoom) throws IOException {
+ return openInputStream();
+ }
+
+ public InputStream openInputStream(IMarkerVariation variation, int zoom)
+ throws IOException {
+ return openInputStream();
+ }
+
+ @Deprecated
public OutputStream openOutputStream(IMarkerVariation variation)
throws IOException {
return openOutputStream();
@@ -129,4 +138,4 @@ public boolean equals(Object obj) {
AbstractMarkerResource that = (AbstractMarkerResource) obj;
return this.marker.equals(that.marker);
}
-}
\ No newline at end of file
+}
diff --git a/bundles/org.xmind.core/src/org/xmind/core/marker/IMarkerResource.java b/bundles/org.xmind.core/src/org/xmind/core/marker/IMarkerResource.java
index f33001ed8..b155c3a3a 100644
--- a/bundles/org.xmind.core/src/org/xmind/core/marker/IMarkerResource.java
+++ b/bundles/org.xmind.core/src/org/xmind/core/marker/IMarkerResource.java
@@ -28,6 +28,11 @@ public interface IMarkerResource {
InputStream openInputStream(IMarkerVariation variation) throws IOException;
+ InputStream openInputStream(int zoom) throws IOException;
+
+ InputStream openInputStream(IMarkerVariation variation, int zoom)
+ throws IOException;
+
/**
* @deprecated Use
* {@link IMarkerSheet#allocateMarkerResource(InputStream, String)}
@@ -72,4 +77,4 @@ OutputStream openOutputStream(IMarkerVariation variation)
@Deprecated
OutputStream getOutputStream(IMarkerVariation variation);
-}
\ No newline at end of file
+}
diff --git a/bundles/org.xmind.core/src/org/xmind/core/marker/IMarkerSheet.java b/bundles/org.xmind.core/src/org/xmind/core/marker/IMarkerSheet.java
index a1f810a85..b8f420489 100644
--- a/bundles/org.xmind.core/src/org/xmind/core/marker/IMarkerSheet.java
+++ b/bundles/org.xmind.core/src/org/xmind/core/marker/IMarkerSheet.java
@@ -113,6 +113,7 @@ public interface IMarkerSheet extends IAdaptable {
* @throws IOException
* @throws CoreException
*/
+ @Deprecated
void save(OutputStream out) throws IOException, CoreException;
/**
@@ -124,6 +125,7 @@ public interface IMarkerSheet extends IAdaptable {
* @throws IOException
* @throws CoreException
*/
+ @Deprecated
void importFrom(IInputSource source) throws IOException, CoreException;
/**
@@ -136,6 +138,7 @@ public interface IMarkerSheet extends IAdaptable {
* @throws IOException
* @throws CoreException
*/
+ @Deprecated
void importFrom(IInputSource source, String groupName)
throws IOException, CoreException;
@@ -148,6 +151,7 @@ void importFrom(IInputSource source, String groupName)
* @throws IOException
* @throws CoreException
*/
+ @Deprecated
void importFrom(String sourcePath) throws IOException, CoreException;
/**
@@ -157,6 +161,7 @@ void importFrom(IInputSource source, String groupName)
*
* @param sheet
*/
+ @Deprecated
void importFrom(IMarkerSheet sheet);
/**
@@ -167,6 +172,7 @@ void importFrom(IInputSource source, String groupName)
* @param group
* @return
*/
+ @Deprecated
IMarkerGroup importGroup(IMarkerGroup group);
/**
@@ -181,4 +187,4 @@ void importFrom(IInputSource source, String groupName)
String allocateMarkerResource(InputStream source, String suggestedPath)
throws IOException;
-}
\ No newline at end of file
+}
diff --git a/bundles/org.xmind.core/src/org/xmind/core/style/IStyle.java b/bundles/org.xmind.core/src/org/xmind/core/style/IStyle.java
index 9ab06aca5..ffe55c13a 100644
--- a/bundles/org.xmind.core/src/org/xmind/core/style/IStyle.java
+++ b/bundles/org.xmind.core/src/org/xmind/core/style/IStyle.java
@@ -96,37 +96,32 @@ public interface IStyle extends IAdaptable, IIdentifiable, IProperties, INamed {
String getType();
/**
- *
* @return
*/
Iterator