diff options
25 files changed, 890 insertions, 187 deletions
diff --git a/plugins/org.eclipse.emf.cdo.ui.ide/icons/full/elcl16/error.gif b/plugins/org.eclipse.emf.cdo.ui.ide/icons/full/elcl16/error.gif Binary files differnew file mode 100644 index 0000000000..9b048d6053 --- /dev/null +++ b/plugins/org.eclipse.emf.cdo.ui.ide/icons/full/elcl16/error.gif diff --git a/plugins/org.eclipse.emf.cdo.ui.ide/icons/full/elcl16/info.gif b/plugins/org.eclipse.emf.cdo.ui.ide/icons/full/elcl16/info.gif Binary files differnew file mode 100644 index 0000000000..2da001e3e9 --- /dev/null +++ b/plugins/org.eclipse.emf.cdo.ui.ide/icons/full/elcl16/info.gif diff --git a/plugins/org.eclipse.emf.cdo.ui.ide/icons/full/elcl16/warning.gif b/plugins/org.eclipse.emf.cdo.ui.ide/icons/full/elcl16/warning.gif Binary files differnew file mode 100644 index 0000000000..14009e9974 --- /dev/null +++ b/plugins/org.eclipse.emf.cdo.ui.ide/icons/full/elcl16/warning.gif diff --git a/plugins/org.eclipse.emf.cdo.ui.ide/icons/full/obj16/branch.png b/plugins/org.eclipse.emf.cdo.ui.ide/icons/full/obj16/branch.png Binary files differnew file mode 100644 index 0000000000..2dbb84a9c4 --- /dev/null +++ b/plugins/org.eclipse.emf.cdo.ui.ide/icons/full/obj16/branch.png diff --git a/plugins/org.eclipse.emf.cdo.ui.ide/icons/full/obj16/branches.gif b/plugins/org.eclipse.emf.cdo.ui.ide/icons/full/obj16/branches.gif Binary files differnew file mode 100644 index 0000000000..d6e44e6a21 --- /dev/null +++ b/plugins/org.eclipse.emf.cdo.ui.ide/icons/full/obj16/branches.gif diff --git a/plugins/org.eclipse.emf.cdo.ui.ide/icons/full/obj16/fork.png b/plugins/org.eclipse.emf.cdo.ui.ide/icons/full/obj16/fork.png Binary files differnew file mode 100644 index 0000000000..3da5ddc363 --- /dev/null +++ b/plugins/org.eclipse.emf.cdo.ui.ide/icons/full/obj16/fork.png diff --git a/plugins/org.eclipse.emf.cdo.ui.ide/icons/full/obj16/switch.png b/plugins/org.eclipse.emf.cdo.ui.ide/icons/full/obj16/switch.png Binary files differnew file mode 100644 index 0000000000..06b24946c8 --- /dev/null +++ b/plugins/org.eclipse.emf.cdo.ui.ide/icons/full/obj16/switch.png diff --git a/plugins/org.eclipse.emf.cdo.ui.ide/icons/full/wizban/wizard_icon.gif b/plugins/org.eclipse.emf.cdo.ui.ide/icons/full/wizban/wizard_icon.gif Binary files differnew file mode 100644 index 0000000000..ff008ab248 --- /dev/null +++ b/plugins/org.eclipse.emf.cdo.ui.ide/icons/full/wizban/wizard_icon.gif diff --git a/plugins/org.eclipse.emf.cdo.ui.ide/plugin.properties b/plugins/org.eclipse.emf.cdo.ui.ide/plugin.properties index 92b435259e..1d159c9b52 100644 --- a/plugins/org.eclipse.emf.cdo.ui.ide/plugin.properties +++ b/plugins/org.eclipse.emf.cdo.ui.ide/plugin.properties @@ -3,10 +3,10 @@ # are made available under the terms of the Eclipse Public License v1.0 # which accompanies this distribution, and is available at # http://www.eclipse.org/legal/epl-v10.html -# +# # Contributors: # Eike Stepper - initial API and implementation - + # NLS_MESSAGEFORMAT_VAR # ============================================================================== @@ -27,24 +27,29 @@ providerName = Eclipse Modeling Project wizard.name = CDO navigatorContent.name = CDO Repository Content action.label = Disconnect -action.label.0 = New CDOResource +action.label.0 = New Resource action.label.1 = New Folder action.label.2 = Remove -action.label.3 = New CDOResource +action.label.3 = New Resource action.label.4 = New Folder -action.tooltip = Creates a new CDOResource in the specified container -action.tooltip.0 = Creates a new CDOResourceFolder in the specified container +action.tooltip = Creates a new resource in the selected container +action.tooltip.0 = Creates a new folder in the selected container action.tooltip.1 = Removes the selected Node -action.tooltip.2 = Creates a new CDOResource in the specified container -action.tooltip.3 = Creates a new CDOResourceFolder in the specified container +action.tooltip.2 = Creates a new resource in the selected container +action.tooltip.3 = Creates a new folder in the selected container action.label.5 = Manage Packages -action.tooltip.4 = Open the CDO Package Manager +action.tooltip.4 = Open the Package Manager action.label.6 = Register Filesystem Packages -action.tooltip.5 = Register a model by browsing in the filesystem +action.tooltip.5 = Register a model by browsing the file system action.label.7 = Register Workspace Packages -action.tooltip.6 = Register a model by browsing in the workspace +action.tooltip.6 = Register a model by browsing the workspace action.label.8 = Import Resource -action.tooltip.7 = Imports a external Resource into the root Object +action.tooltip.7 = Imports an external resource into the repository root action.label.9 = Import Resource -action.tooltip.8 = Imports a external Resource into the selected Folder -action.label.10 = Export Resource
\ No newline at end of file +action.tooltip.8 = Imports an external resource into the selected folder +action.label.10 = Export Resource +action.label.11 = Create New Branch +action.tooltip.9 = Creates a new sub branch of the selected branch +action.label.12 = Switch To +action.tooltip.10 = Switches the project to the selected branch +wizard.name.0 = CDO Project
\ No newline at end of file diff --git a/plugins/org.eclipse.emf.cdo.ui.ide/plugin.xml b/plugins/org.eclipse.emf.cdo.ui.ide/plugin.xml index 7f9576f922..42542da96e 100644 --- a/plugins/org.eclipse.emf.cdo.ui.ide/plugin.xml +++ b/plugins/org.eclipse.emf.cdo.ui.ide/plugin.xml @@ -6,7 +6,7 @@ are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html - + Contributors: Eike Stepper - initial API and implementation --> @@ -52,7 +52,7 @@ </triggerPoints> </navigatorContent> </extension> - + <extension point="org.eclipse.ui.navigator.viewer"> <viewerContentBinding @@ -65,7 +65,7 @@ </includes> </viewerContentBinding> </extension> - + <extension point="org.eclipse.ui.popupMenus"> <objectContribution @@ -183,6 +183,41 @@ id="org.eclipse.emf.cdo.ui.ide.exportResource" label="%action.label.10"> </action> - </objectContribution> </extension> + </objectContribution> + <objectContribution + adaptable="false" + id="org.eclipse.emf.cdo.ui.ide.BranchesNodeActions" + objectClass="org.eclipse.emf.cdo.ui.ide.Node$BranchNode"> + <action + class="org.eclipse.emf.cdo.ui.internal.ide.actions.CreateBranchActionDelegate" + icon="icons/full/obj16/fork.png" + id="org.eclipse.emf.cdo.ui.ide.createNewBranchAction" + label="%action.label.11" + tooltip="%action.tooltip.9"> + </action> + <action + class="org.eclipse.emf.cdo.ui.internal.ide.actions.SwitchToBranchActionDelegate" + icon="icons/full/obj16/switch.png" + id="org.eclipse.emf.cdo.ui.ide.switchToBranchAction" + label="%action.label.12" + tooltip="%action.tooltip.10"> + </action> + </objectContribution> + </extension> + + <extension + point="org.eclipse.ui.newWizards"> + <wizard + canFinishEarly="false" + class="org.eclipse.emf.cdo.ui.internal.ide.wizards.CDOProjectCreationWizard" + finalPerspective="org.eclipse.emf.cdo.ui.CDOExplorerPerspective" + hasPages="true" + icon="icons/full/obj16/repository_content.gif" + id="org.eclipse.emf.cdo.ui.ide.createSharedProject" + name="%wizard.name.0" + preferredPerspectives="org.eclipse.ui.resourcePerspective" + project="true"> + </wizard> + </extension> </plugin> diff --git a/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/ide/CommonNavigatorUtils.java b/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/ide/CommonNavigatorUtils.java new file mode 100644 index 0000000000..7f1d1ca997 --- /dev/null +++ b/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/ide/CommonNavigatorUtils.java @@ -0,0 +1,88 @@ +/** + * Copyright (c) 2004 - 2010 Eike Stepper (Berlin, Germany) and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Victor Roldan Betancort - initial API and implementation + * Eike Stepper - maintenance + */ +package org.eclipse.emf.cdo.ui.ide; + +import org.eclipse.emf.cdo.ui.internal.ide.bundle.OM; + +import org.eclipse.core.runtime.IAdaptable; +import org.eclipse.jface.viewers.ILabelProvider; +import org.eclipse.jface.viewers.LabelProvider; +import org.eclipse.swt.graphics.Image; + +/** + * @author Victor Roldan Betancort + */ +public class CommonNavigatorUtils +{ + public static Object createMessageProvider(final String message, final MessageType type) + { + return new IAdaptable() + { + @SuppressWarnings("rawtypes") + public Object getAdapter(Class adapter) + { + if (adapter.equals(ILabelProvider.class)) + { + return new LabelProvider() + { + @Override + public String getText(Object element) + { + return message; + } + + @Override + public Image getImage(Object element) + { + switch (type) + { + case ERROR: + return OM.getImageDescriptor(OM.ERROR_ICON).createImage(); + case WARNING: + return OM.getImageDescriptor(OM.WARNING_ICON).createImage(); + case INFO: + return OM.getImageDescriptor(OM.INFO_ICON).createImage(); + } + + return super.getImage(element); + } + }; + } + + return null; + } + + /* + * In case is not adapted, at least the message is shown through toString() + */ + @Override + public String toString() + { + return message; + } + }; + } + + public static Object[] createMessageProviderChild(final String message, final MessageType type) + { + Object[] result = { createMessageProvider(message, type) }; + return result; + } + + /** + * @author Victor Roldan Betancort + */ + public static enum MessageType + { + ERROR, WARNING, INFO + } +} diff --git a/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/ide/Node.java b/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/ide/Node.java index bf14a0cdee..70ccd4e5c1 100644 --- a/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/ide/Node.java +++ b/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/ide/Node.java @@ -11,10 +11,12 @@ package org.eclipse.emf.cdo.ui.ide; import org.eclipse.emf.cdo.CDOObject; +import org.eclipse.emf.cdo.common.branch.CDOBranch; import org.eclipse.emf.cdo.common.model.CDOPackageRegistry; import org.eclipse.emf.cdo.eresource.CDOResourceNode; import org.eclipse.emf.cdo.team.IRepositoryProject; import org.eclipse.emf.cdo.transaction.CDOTransaction; +import org.eclipse.emf.cdo.ui.ide.CommonNavigatorUtils.MessageType; import org.eclipse.emf.cdo.ui.internal.ide.bundle.OM; import org.eclipse.emf.cdo.ui.internal.ide.messages.Messages; import org.eclipse.emf.cdo.view.CDOView; @@ -55,6 +57,11 @@ public abstract class Node extends PlatformObject return EMPTY; } + public Object getParent() + { + return repositoryProject.getProject(); + } + public abstract Type getType(); /** @@ -62,35 +69,73 @@ public abstract class Node extends PlatformObject */ public static enum Type { - SESSIONS, PACKAGES, RESOURCES + BRANCH, PACKAGES, RESOURCES, SESSIONS } /** - * @author Eike Stepper + * @author Victor Roldan Betancort */ - public static final class SessionsNode extends Node + public static final class BranchNode extends Node { - public SessionsNode(IRepositoryProject repositoryProject) + private CDOBranch branch; + + public BranchNode(IRepositoryProject repositoryProject, CDOBranch branch) { super(repositoryProject); + this.branch = branch; + } + + public CDOBranch getBranch() + { + return branch; } @Override public Type getType() { - return Type.SESSIONS; + return Type.BRANCH; } @Override public String getText() { - return Messages.getString("Node.0"); //$NON-NLS-1$ + return branch.getName(); } @Override public String getImageKey() { - return "icons/full/obj16/Sessions.gif"; //$NON-NLS-1$ + return OM.BRANCH_ICON; + } + + @Override + public Object[] getChildren() + { + if (!getRepositoryProject().getView().getSession().getRepositoryInfo().isSupportingBranches()) + { + return CommonNavigatorUtils.createMessageProviderChild("Repository does not support branching", + MessageType.INFO); + } + + CDOBranch[] branches = branch.getBranches(); + BranchNode[] nodes = new BranchNode[branches.length]; + for (int i = 0; i < branches.length; i++) + { + nodes[i] = new BranchNode(getRepositoryProject(), branches[i]); + } + + return nodes; + } + + @Override + public Object getParent() + { + if (branch.isMainBranch()) + { + return getRepositoryProject(); + } + + return branch.getBase().getBranch(); } } @@ -125,8 +170,7 @@ public abstract class Node extends PlatformObject @Override public EPackage[] getChildren() { - CDOView view = getRepositoryProject().getView(); - CDOPackageRegistry packageRegistry = view.getSession().getPackageRegistry(); + CDOPackageRegistry packageRegistry = getRepositoryProject().getView().getSession().getPackageRegistry(); List<EPackage> children = new ArrayList<EPackage>(); for (String nsURI : packageRegistry.keySet()) { @@ -212,4 +256,34 @@ public abstract class Node extends PlatformObject return children.toArray(new CDOResourceNode[children.size()]); } } + + /** + * @author Eike Stepper + */ + public static final class SessionsNode extends Node + { + public SessionsNode(IRepositoryProject repositoryProject) + { + super(repositoryProject); + } + + @Override + public Type getType() + { + return Type.SESSIONS; + } + + @Override + public String getText() + { + return Messages.getString("Node.0"); //$NON-NLS-1$ + } + + @Override + public String getImageKey() + { + return "icons/full/obj16/Sessions.gif"; //$NON-NLS-1$ + } + } + } diff --git a/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/ide/RepositoryContentProvider.java b/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/ide/RepositoryContentProvider.java index 33341fdba4..3bd39a6363 100644 --- a/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/ide/RepositoryContentProvider.java +++ b/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/ide/RepositoryContentProvider.java @@ -12,6 +12,8 @@ package org.eclipse.emf.cdo.ui.ide; import org.eclipse.emf.cdo.CDOObject; +import org.eclipse.emf.cdo.common.branch.CDOBranch; +import org.eclipse.emf.cdo.common.branch.CDOBranchCreatedEvent; import org.eclipse.emf.cdo.eresource.CDOResource; import org.eclipse.emf.cdo.internal.ui.editor.CDOEditor; import org.eclipse.emf.cdo.team.IRepositoryManager; @@ -19,18 +21,23 @@ import org.eclipse.emf.cdo.team.IRepositoryProject; import org.eclipse.emf.cdo.ui.CDOEditorInput; import org.eclipse.emf.cdo.ui.CDOEditorUtil; import org.eclipse.emf.cdo.ui.CDOEventHandler; +import org.eclipse.emf.cdo.ui.ide.CommonNavigatorUtils.MessageType; +import org.eclipse.emf.cdo.ui.ide.Node.BranchNode; import org.eclipse.emf.cdo.ui.ide.Node.PackagesNode; import org.eclipse.emf.cdo.ui.ide.Node.ResourcesNode; import org.eclipse.emf.cdo.ui.ide.Node.SessionsNode; import org.eclipse.emf.cdo.ui.internal.ide.actions.RemoveResourceActionDelegate; import org.eclipse.emf.cdo.ui.internal.ide.bundle.OM; import org.eclipse.emf.cdo.view.CDOView; +import org.eclipse.emf.cdo.view.CDOViewInvalidationEvent; +import org.eclipse.emf.cdo.view.CDOViewTargetChangedEvent; import org.eclipse.emf.internal.cdo.CDOLegacyWrapper; import org.eclipse.emf.internal.cdo.CDOStateMachine; import org.eclipse.net4j.util.container.ContainerEventAdapter; import org.eclipse.net4j.util.container.IContainer; +import org.eclipse.net4j.util.event.IEvent; import org.eclipse.net4j.util.event.IListener; import org.eclipse.net4j.util.ui.StructuredContentProvider; import org.eclipse.net4j.util.ui.UIUtil; @@ -150,6 +157,20 @@ public class RepositoryContentProvider extends StructuredContentProvider<IWorksp public Object[] getChildren(Object parentElement) { + try + { + return doGetChildren(parentElement); + } + catch (Exception e) + { + OM.LOG.error(e); + return CommonNavigatorUtils.createMessageProviderChild("An error happened. See Error Log for more details.", + MessageType.ERROR); + } + } + + private Object[] doGetChildren(Object parentElement) + { if (parentElement instanceof IProject) { IProject project = (IProject)parentElement; @@ -180,12 +201,6 @@ public class RepositoryContentProvider extends StructuredContentProvider<IWorksp return EMPTY; } - public boolean hasChildren(Object parentElement) - { - Object[] children = getChildren(parentElement); - return children != null && children.length != 0; - } - public Object[] getElements(Object parentElement) { return getChildren(parentElement); @@ -196,7 +211,7 @@ public class RepositoryContentProvider extends StructuredContentProvider<IWorksp if (element instanceof Node) { Node node = (Node)element; - return node.getRepositoryProject().getProject(); + return node.getParent(); } if (element instanceof Notifier) @@ -218,12 +233,9 @@ public class RepositoryContentProvider extends StructuredContentProvider<IWorksp List<Object> children = new ArrayList<Object>(); RepositoryInfo info = getRepositoryInfo(repositoryProject); - // First try virtual parent nodes - if (!isSessionsNodeHidden()) - { - children.add(info.getSessions()); - } + children.add(info.getMainBranch()); + // First try virtual parent nodes if (!isPackagesNodeHidden()) { children.add(info.getPackages()); @@ -234,12 +246,12 @@ public class RepositoryContentProvider extends StructuredContentProvider<IWorksp children.add(info.getResources()); } - // Then try flattened sub nodes - if (isSessionsNodeHidden()) + if (!isSessionsNodeHidden()) { - addChildren(children, info.getSessions()); + children.add(info.getSessions()); } + // Then try flattened sub nodes if (isPackagesNodeHidden()) { addChildren(children, info.getPackages()); @@ -250,6 +262,11 @@ public class RepositoryContentProvider extends StructuredContentProvider<IWorksp addChildren(children, info.getResources()); } + if (isSessionsNodeHidden()) + { + addChildren(children, info.getSessions()); + } + return children.toArray(new Object[children.size()]); } @@ -293,6 +310,28 @@ public class RepositoryContentProvider extends StructuredContentProvider<IWorksp // Handles invalidated objects eventHandlers.put(repositoryProject, new RepositoryCDOEventHandler(info.getResources(), repositoryProject.getView(), (TreeViewer)getViewer())); + + repositoryProject.getView().getBranch().getBranchManager().addListener(new IListener() + { + public void notifyEvent(IEvent event) + { + if (event instanceof CDOBranchCreatedEvent) + { + refreshViewer(true); + } + } + }); + + repositoryProject.getView().addListener(new IListener() + { + public void notifyEvent(IEvent event) + { + if (event instanceof CDOViewInvalidationEvent || event instanceof CDOViewTargetChangedEvent) + { + refreshViewer(true); + } + } + }); } public static ComposedAdapterFactory createAdapterFactory() @@ -393,22 +432,26 @@ public class RepositoryContentProvider extends StructuredContentProvider<IWorksp */ private static final class RepositoryInfo { - private SessionsNode sessions; + private BranchNode mainBranch; private PackagesNode packages; private ResourcesNode resources; + private SessionsNode sessions; + public RepositoryInfo(IRepositoryProject repositoryProject) { - sessions = new SessionsNode(repositoryProject); + CDOBranch main = repositoryProject.getView().getSession().getBranchManager().getMainBranch(); + mainBranch = new BranchNode(repositoryProject, main); packages = new PackagesNode(repositoryProject); resources = new ResourcesNode(repositoryProject); + sessions = new SessionsNode(repositoryProject); } - public SessionsNode getSessions() + public BranchNode getMainBranch() { - return sessions; + return mainBranch; } public PackagesNode getPackages() @@ -420,6 +463,11 @@ public class RepositoryContentProvider extends StructuredContentProvider<IWorksp { return resources; } + + public SessionsNode getSessions() + { + return sessions; + } } /** @@ -453,6 +501,12 @@ public class RepositoryContentProvider extends StructuredContentProvider<IWorksp } } + public boolean hasChildren(Object parentElement) + { + Object[] children = getChildren(parentElement); + return children != null && children.length != 0; + } + /** * @author Victor Roldan Betancort */ diff --git a/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/ide/RepositoryLabelProvider.java b/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/ide/RepositoryLabelProvider.java index 8f6118cb06..8ee7f85d2a 100644 --- a/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/ide/RepositoryLabelProvider.java +++ b/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/ide/RepositoryLabelProvider.java @@ -18,7 +18,9 @@ import org.eclipse.emf.edit.provider.ComposedAdapterFactory; import org.eclipse.emf.edit.provider.IItemLabelProvider; import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry; +import org.eclipse.core.runtime.IAdaptable; import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.jface.viewers.ILabelProvider; import org.eclipse.jface.viewers.LabelProvider; import org.eclipse.swt.graphics.Image; @@ -66,6 +68,15 @@ public class RepositoryLabelProvider extends LabelProvider } } + if (element instanceof IAdaptable) + { + Object adapter = ((IAdaptable)element).getAdapter(ILabelProvider.class); + if (adapter != null) + { + return ((ILabelProvider)adapter).getText(element); + } + } + return super.getText(element); } @@ -90,6 +101,15 @@ public class RepositoryLabelProvider extends LabelProvider } } + if (element instanceof IAdaptable) + { + Object adapter = ((IAdaptable)element).getAdapter(ILabelProvider.class); + if (adapter != null) + { + return ((ILabelProvider)adapter).getImage(element); + } + } + return super.getImage(element); } } diff --git a/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/internal/ide/actions/CreateBranchActionDelegate.java b/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/internal/ide/actions/CreateBranchActionDelegate.java new file mode 100644 index 0000000000..e1861f053a --- /dev/null +++ b/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/internal/ide/actions/CreateBranchActionDelegate.java @@ -0,0 +1,83 @@ +/** + * Copyright (c) 2004 - 2010 Eike Stepper (Berlin, Germany) and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Victor Roldan Betancort - initial API and implementation + * Eike Stepper - maintenance + */ +package org.eclipse.emf.cdo.ui.internal.ide.actions; + +import org.eclipse.emf.cdo.common.branch.CDOBranch; +import org.eclipse.emf.cdo.ui.ide.Node.BranchNode; + +import org.eclipse.net4j.util.StringUtil; +import org.eclipse.net4j.util.ui.UIUtil; +import org.eclipse.net4j.util.ui.actions.LongRunningActionDelegate; + +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.jface.dialogs.Dialog; +import org.eclipse.jface.dialogs.IInputValidator; +import org.eclipse.jface.dialogs.InputDialog; +import org.eclipse.swt.widgets.Shell; + +/** + * @author Victor Roldan Betancort + */ +public class CreateBranchActionDelegate extends LongRunningActionDelegate +{ + private String name; + + public CreateBranchActionDelegate() + { + } + + @Override + protected void preRun() throws Exception + { + InputDialog dialog = new InputDialog(new Shell(), "Create a new branch", + "Please specify the name of the new branch", "", new BranchNameInputValidator()); + + if (dialog.open() == Dialog.OK) + { + name = dialog.getValue(); + } + else + { + cancel(); + } + } + + @Override + protected void doRun(IProgressMonitor progressMonitor) throws Exception + { + BranchNode branchNode = UIUtil.getElement(getSelection(), BranchNode.class); + branchNode.getBranch().createBranch(name); + } + + /** + * @author Victor Roldan Betancort + */ + private final class BranchNameInputValidator implements IInputValidator + { + public String isValid(String newText) + { + if (StringUtil.isEmpty(newText)) + { + return "Branch name cannot be empty"; + } + + BranchNode branchNode = UIUtil.getElement(getSelection(), BranchNode.class); + CDOBranch branch = branchNode.getBranch(); + if (branch.getBranch(newText) != null) + { + return "A branch with that name already exists"; + } + + return null; + } + } +} diff --git a/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/internal/ide/actions/SwitchToBranchActionDelegate.java b/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/internal/ide/actions/SwitchToBranchActionDelegate.java new file mode 100644 index 0000000000..61cbb04a00 --- /dev/null +++ b/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/internal/ide/actions/SwitchToBranchActionDelegate.java @@ -0,0 +1,35 @@ +/** + * Copyright (c) 2004 - 2010 Eike Stepper (Berlin, Germany) and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Victor Roldan Betancort - initial API and implementation + * Eike Stepper - maintenance + */ +package org.eclipse.emf.cdo.ui.internal.ide.actions; + +import org.eclipse.emf.cdo.ui.ide.Node.BranchNode; +import org.eclipse.emf.cdo.view.CDOView; + +import org.eclipse.net4j.util.ui.UIUtil; + +/** + * @author Victor Roldan Betancort + */ +public class SwitchToBranchActionDelegate extends SessionAwareActionDelegate +{ + public SwitchToBranchActionDelegate() + { + } + + @Override + protected void safeRun() throws Exception + { + BranchNode branchNode = UIUtil.getElement(getSelection(), BranchNode.class); + CDOView view = branchNode.getRepositoryProject().getView(); + view.setBranch(branchNode.getBranch()); + } +} diff --git a/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/internal/ide/bundle/OM.java b/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/internal/ide/bundle/OM.java index e4fedb010e..440f9713b7 100644 --- a/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/internal/ide/bundle/OM.java +++ b/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/internal/ide/bundle/OM.java @@ -17,6 +17,8 @@ import org.eclipse.net4j.util.om.log.OMLogger; import org.eclipse.net4j.util.om.trace.OMTracer; import org.eclipse.net4j.util.ui.UIActivator; +import org.eclipse.jface.resource.ImageDescriptor; + /** * The <em>Operations & Maintenance</em> class of this bundle. * @@ -26,12 +28,27 @@ public abstract class OM { public static final String BUNDLE_ID = "org.eclipse.emf.cdo.ui.ide"; //$NON-NLS-1$ + public static final String ERROR_ICON = "icons/full/elcl16/error.gif"; //$NON-NLS-1$ + + public static final String WARNING_ICON = "icons/full/elcl16/warning.gif"; //$NON-NLS-1$ + + public static final String INFO_ICON = "icons/full/elcl16/info.gif"; //$NON-NLS-1$ + + public static final String BRANCH_ICON = "icons/full/obj16/branch.png"; //$NON-NLS-1$ + + public static final String BRANCH_FOLDER_ICON = "icons/full/obj16/branches.gif"; //$NON-NLS-1$ + public static final OMBundle BUNDLE = OMPlatform.INSTANCE.bundle(BUNDLE_ID, OM.class); public static final OMLogger LOG = BUNDLE.logger(); public static final OMTracer DEBUG = BUNDLE.tracer("debug"); //$NON-NLS-1$ + public static ImageDescriptor getImageDescriptor(String imageFilePath) + { + return Activator.imageDescriptorFromPlugin(BUNDLE_ID, imageFilePath); + } + /** * @author Eike Stepper */ diff --git a/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/internal/ide/messages/messages.properties b/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/internal/ide/messages/messages.properties index 9fcbc90d58..8e4e252a97 100644 --- a/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/internal/ide/messages/messages.properties +++ b/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/internal/ide/messages/messages.properties @@ -1,6 +1,3 @@ -ExportResourceActionDelegate.0=Couldn't Export CDOResource -ExportSelectedResourceAction_1=Export CDOResource -ExportSelectedResourceAction_2=No URI has been introduced # Copyright (c) 2004 - 2010 Eike Stepper (Berlin, Germany) and others. # All rights reserved. This program and the accompanying materials # are made available under the terms of the Eclipse Public License v1.0 @@ -31,3 +28,8 @@ TeamConfigurationWizard_2=Enter CDO repository location information TeamConfigurationWizard_3=Provide a URL to the target server and a repository name TransactionalBackgroundAction_0=Object is not transactional: {0} TransactionalBackgroundAction_1=Commit Transaction +CDOProjectCreationWizard.2=Create a new project resource. +CDOProjectCreationWizard.4=Create and Share to CDO a new Project +ExportResourceActionDelegate.0=Couldn't Export CDOResource +ExportSelectedResourceAction_1=Export CDOResource +ExportSelectedResourceAction_2=No URI has been introduced
\ No newline at end of file diff --git a/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/internal/ide/wizards/CDOProjectCreationWizard.java b/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/internal/ide/wizards/CDOProjectCreationWizard.java new file mode 100644 index 0000000000..148db61fda --- /dev/null +++ b/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/internal/ide/wizards/CDOProjectCreationWizard.java @@ -0,0 +1,239 @@ +/** + * Copyright (c) 2004 - 2010 Eike Stepper (Berlin, Germany) and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Victor Roldan Betancort - initial API and implementation + * Eike Stepper - maintenance + */ +package org.eclipse.emf.cdo.ui.internal.ide.wizards; + +import org.eclipse.emf.cdo.internal.team.RepositoryManager; +import org.eclipse.emf.cdo.internal.team.RepositoryTeamProvider; +import org.eclipse.emf.cdo.internal.ui.perspectives.CDOExplorerPerspective; +import org.eclipse.emf.cdo.ui.internal.ide.bundle.OM; +import org.eclipse.emf.cdo.ui.internal.ide.messages.Messages; + +import org.eclipse.core.commands.ExecutionException; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IProjectDescription; +import org.eclipse.core.resources.IResourceStatus; +import org.eclipse.core.resources.IWorkspace; +import org.eclipse.core.resources.ResourcesPlugin; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Status; +import org.eclipse.jface.dialogs.MessageDialog; +import org.eclipse.jface.operation.IRunnableWithProgress; +import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.jface.wizard.Wizard; +import org.eclipse.osgi.util.NLS; +import org.eclipse.swt.widgets.Display; +import org.eclipse.team.core.TeamException; +import org.eclipse.ui.IWorkbench; +import org.eclipse.ui.IWorkbenchWizard; +import org.eclipse.ui.WorkbenchException; +import org.eclipse.ui.dialogs.WizardNewProjectCreationPage; +import org.eclipse.ui.ide.undo.CreateProjectOperation; +import org.eclipse.ui.ide.undo.WorkspaceUndoUtil; +import org.eclipse.ui.internal.ide.IDEWorkbenchPlugin; +import org.eclipse.ui.internal.ide.StatusUtil; +import org.eclipse.ui.internal.wizards.newresource.ResourceMessages; +import org.eclipse.ui.statushandlers.IStatusAdapterConstants; +import org.eclipse.ui.statushandlers.StatusAdapter; +import org.eclipse.ui.statushandlers.StatusManager; + +import java.lang.reflect.InvocationTargetException; +import java.net.URI; + +/** + * @author Victor Roldan Betancort + */ +@SuppressWarnings("restriction") +public class CDOProjectCreationWizard extends Wizard implements IWorkbenchWizard +{ + private WizardNewProjectCreationPage projectCreationPage; + + private CDOShareProjectWizardPage sharePage; + + // Cache of newly-created project + private IProject newProject; + + private IWorkbench workbench; + + public CDOProjectCreationWizard() + { + } + + @Override + public boolean performFinish() + { + createNewProject(); + if (newProject == null) + { + return false; + } + + try + { + RepositoryTeamProvider.mapProject(newProject, sharePage.getSessionDescription()); + } + catch (TeamException ex) + { + OM.LOG.equals(ex); + return false; + } + + RepositoryManager.INSTANCE.addElement(newProject); + if (!CDOExplorerPerspective.isCurrent()) + { + openCDOExplorerPerspective(workbench); + } + + return true; + } + + @Override + public void addPages() + { + super.addPages(); + projectCreationPage = new WizardNewProjectCreationPage("basicNewProjectPage"); //$NON-NLS-1$ + projectCreationPage.setTitle(Messages.getString("CDOProjectCreationWizard.4")); //$NON-NLS-1$ + projectCreationPage.setDescription(Messages.getString("CDOProjectCreationWizard.2")); //$NON-NLS-1$ + super.addPage(projectCreationPage); + + sharePage = new CDOShareProjectWizardPage("shareProject"); //$NON-NLS-1$ + sharePage.setTitle(Messages.getString("TeamConfigurationWizard_2")); //$NON-NLS-1$ + super.addPage(sharePage); + } + + public void init(IWorkbench workbench, IStructuredSelection currentSelection) + { + this.workbench = workbench; + setNeedsProgressMonitor(true); + setWindowTitle(Messages.getString("CDOProjectCreationWizard.4")); //$NON-NLS-1$ + initializeDefaultPageImageDescriptor(); + } + + protected void initializeDefaultPageImageDescriptor() + { + ImageDescriptor desc = OM.getImageDescriptor("icons/full/wizban/wizard_icon.gif");//$NON-NLS-1$ + setDefaultPageImageDescriptor(desc); + } + + private IProject createNewProject() + { + if (newProject != null) + { + return newProject; + } + + // get a project handle + final IProject newProjectHandle = projectCreationPage.getProjectHandle(); + + // get a project descriptor + URI location = null; + if (!projectCreationPage.useDefaults()) + { + location = projectCreationPage.getLocationURI(); + } + + IWorkspace workspace = ResourcesPlugin.getWorkspace(); + final IProjectDescription description = workspace.newProjectDescription(newProjectHandle.getName()); + description.setLocationURI(location); + + // create the new project operation + IRunnableWithProgress op = new IRunnableWithProgress() + { + public void run(IProgressMonitor monitor) throws InvocationTargetException + { + CreateProjectOperation op = new CreateProjectOperation(description, ResourceMessages.NewProject_windowTitle); + try + { + op.execute(monitor, WorkspaceUndoUtil.getUIInfoAdapter(getShell())); + } + catch (ExecutionException e) + { + throw new InvocationTargetException(e); + } + } + }; + + // run the new project creation operation + try + { + getContainer().run(true, true, op); + } + catch (InterruptedException e) + { + return null; + } + + catch (InvocationTargetException e) + { + Throwable t = e.getTargetException(); + if (t instanceof ExecutionException && t.getCause() instanceof CoreException) + { + CoreException cause = (CoreException)t.getCause(); + StatusAdapter status; + if (cause.getStatus().getCode() == IResourceStatus.CASE_VARIANT_EXISTS) + { + status = new StatusAdapter(StatusUtil.newStatus(IStatus.WARNING, NLS.bind( + ResourceMessages.NewProject_caseVariantExistsError, newProjectHandle.getName()), cause)); + } + else + { + status = new StatusAdapter(StatusUtil.newStatus(cause.getStatus().getSeverity(), + ResourceMessages.NewProject_errorMessage, cause)); + } + + status.setProperty(IStatusAdapterConstants.TITLE_PROPERTY, ResourceMessages.NewProject_errorMessage); + StatusManager.getManager().handle(status, StatusManager.BLOCK); + } + else + { + StatusAdapter status = new StatusAdapter(new Status(IStatus.WARNING, IDEWorkbenchPlugin.IDE_WORKBENCH, 0, NLS + .bind(ResourceMessages.NewProject_internalError, t.getMessage()), t)); + status.setProperty(IStatusAdapterConstants.TITLE_PROPERTY, ResourceMessages.NewProject_errorMessage); + StatusManager.getManager().handle(status, StatusManager.LOG | StatusManager.BLOCK); + } + + return null; + } + + newProject = newProjectHandle; + return newProject; + } + + /** + * Opens CDO Explorer perspective + */ + public void openCDOExplorerPerspective(final IWorkbench workbench) + { + Display.getDefault().asyncExec(new Runnable() + { + public void run() + { + try + { + boolean result = MessageDialog.openQuestion(getShell(), "Change perspective", + "Do you want to switch to CDO Explorer perspective?"); + if (result) + { + workbench.showPerspective(CDOExplorerPerspective.ID, workbench.getActiveWorkbenchWindow()); + } + } + catch (WorkbenchException ex) + { + OM.LOG.error(ex); + // ignore + } + } + }); + } +} diff --git a/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/internal/ide/wizards/CDOShareProjectWizardPage.java b/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/internal/ide/wizards/CDOShareProjectWizardPage.java new file mode 100644 index 0000000000..b3bb724e1e --- /dev/null +++ b/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/internal/ide/wizards/CDOShareProjectWizardPage.java @@ -0,0 +1,77 @@ +/** + * Copyright (c) 2004 - 2010 Eike Stepper (Berlin, Germany) and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Victor Roldan Betancort - initial API and implementation + * Eike Stepper - maintenance + */ +package org.eclipse.emf.cdo.ui.internal.ide.wizards; + +import org.eclipse.emf.cdo.ui.widgets.SessionComposite; + +import org.eclipse.jface.wizard.WizardPage; +import org.eclipse.swt.SWT; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Event; +import org.eclipse.swt.widgets.Listener; + +/** + * @author Victor Roldan Betancort + */ +public class CDOShareProjectWizardPage extends WizardPage +{ + private SessionComposite sessionComposite; + + private Listener modifyListener = new Listener() + { + public void handleEvent(Event e) + { + boolean valid = isPageComplete(); + setPageComplete(valid); + } + }; + + public CDOShareProjectWizardPage(String id) + { + super(id); + } + + public SessionComposite getSessionComposite() + { + return sessionComposite; + } + + public void createControl(Composite parent) + { + sessionComposite = new SessionComposite(parent, SWT.NONE); + setControl(sessionComposite); + sessionComposite.addListener(SWT.Modify, modifyListener); + } + + public String getSessionDescription() + { + return sessionComposite != null ? sessionComposite.getSessionDescription() : null; + } + + public boolean isDescriptionValid() + { + return sessionComposite.isDescriptionValid(); + } + + @Override + public boolean isPageComplete() + { + if (isDescriptionValid()) + { + CDOShareProjectWizardPage.this.setErrorMessage(null); + return true; + } + + CDOShareProjectWizardPage.this.setErrorMessage("Please introduce a valid server URL and repository name"); + return false; + } +} diff --git a/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/internal/ide/wizards/TeamConfigurationWizard.java b/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/internal/ide/wizards/TeamConfigurationWizard.java index 1cf51b283e..2c31873c53 100644 --- a/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/internal/ide/wizards/TeamConfigurationWizard.java +++ b/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/internal/ide/wizards/TeamConfigurationWizard.java @@ -18,10 +18,8 @@ import org.eclipse.emf.cdo.ui.internal.ide.messages.Messages; import org.eclipse.emf.cdo.ui.widgets.SessionComposite; import org.eclipse.core.resources.IProject; +import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.wizard.Wizard; -import org.eclipse.jface.wizard.WizardPage; -import org.eclipse.swt.SWT; -import org.eclipse.swt.widgets.Composite; import org.eclipse.team.ui.IConfigurationWizard; import org.eclipse.ui.IWorkbench; @@ -32,7 +30,7 @@ public class TeamConfigurationWizard extends Wizard implements IConfigurationWiz { private IProject project; - private Page1 page1; + private CDOShareProjectWizardPage page1; public TeamConfigurationWizard() { @@ -41,12 +39,17 @@ public class TeamConfigurationWizard extends Wizard implements IConfigurationWiz public void init(IWorkbench workbench, IProject project) { this.project = project; + setWindowTitle(Messages.getString("TeamConfigurationWizard_1")); //$NON-NLS-1$ + ImageDescriptor desc = OM.getImageDescriptor("icons/full/wizban/wizard_icon.gif");//$NON-NLS-1$ + setDefaultPageImageDescriptor(desc); } @Override public void addPages() { - addPage(page1 = new Page1()); + page1 = new CDOShareProjectWizardPage("page1"); + page1.setTitle(Messages.getString("TeamConfigurationWizard_2")); //$NON-NLS-1$ + addPage(page1); } @Override @@ -68,41 +71,4 @@ public class TeamConfigurationWizard extends Wizard implements IConfigurationWiz return false; } } - - /** - * @author Eike Stepper - */ - private final class Page1 extends WizardPage - { - private SessionComposite sessionComposite; - - private Page1() - { - super("page1"); //$NON-NLS-1$ - } - - public SessionComposite getSessionComposite() - { - return sessionComposite; - } - - public void createControl(Composite parent) - { - sessionComposite = new SessionComposite(parent, SWT.NONE); - setControl(sessionComposite); - setWindowTitle(Messages.getString("TeamConfigurationWizard_1")); //$NON-NLS-1$ - } - - @Override - public String getTitle() - { - return Messages.getString("TeamConfigurationWizard_2"); //$NON-NLS-1$ - } - - @Override - public String getDescription() - { - return Messages.getString("TeamConfigurationWizard_3"); //$NON-NLS-1$ - } - } } diff --git a/plugins/org.eclipse.emf.cdo.ui/CDOClient1.launch b/plugins/org.eclipse.emf.cdo.ui/CDOClient1.launch index 91dd151f72..1f14b04654 100644 --- a/plugins/org.eclipse.emf.cdo.ui/CDOClient1.launch +++ b/plugins/org.eclipse.emf.cdo.ui/CDOClient1.launch @@ -22,9 +22,9 @@ <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/> <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms40m -Xmx512m"/> <stringAttribute key="pde.version" value="3.3"/> -<stringAttribute key="product" value="org.eclipse.sdk.ide"/> -<stringAttribute key="selected_target_plugins" value="org.eclipse.emf.ecore.change.edit@default:default,org.eclipse.emf.teneo.eclipse@default:default,org.eclipse.ui@default:default,org.eclipse.pde.launching@default:default,org.eclipse.equinox.util@default:default,org.eclipse.pde.build@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.osgi.util@default:default,org.eclipse.core.jobs@default:default,org.apache.commons.logging@default:default,org.eclipse.update.core@default:default,org.eclipse.help.appserver@default:default,org.eclipse.equinox.p2.ui@default:default,org.eclipse.platform@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.eclipse.emf.teneo@default:default,org.eclipse.core.commands@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.core.variables@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.core.expressions@default:default,org.mortbay.jetty.server@default:default,org.postgresql.jdbc3@default:default,org.eclipse.emf.codegen.ecore.ui@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.emf.edit.ui@default:default,org.eclipse.equinox.ds@default:true,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.ui.intro.universal@default:default,org.eclipse.jdt.junit@default:default,org.eclipse.emf.mapping.ecore@default:default,org.eclipse.emf.teneo.hibernate.mapper@default:default,org.eclipse.equinox.p2.touchpoint.natives@default:default,org.eclipse.equinox.p2.metadata.generator@default:default,org.objectweb.asm@default:default,org.eclipse.core.filesystem.win32.x86@default:false,org.eclipse.emf.ecore.change@default:default,org.eclipse.jface.text@default:default,org.eclipse.pde.core@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.cvs@default:default,org.eclipse.swt.win32.win32.x86@default:false,org.eclipse.equinox.p2.console@default:default,org.eclipse.equinox.p2.directorywatcher@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.emf.codegen.ui@default:default,org.eclipse.emf.databinding@default:default,javax.servlet.jsp@default:default,org.eclipse.text@default:default,org.eclipse.emf.teneo.doc@default:default,org.eclipse.help.base@default:default,org.eclipse.jdt.core.manipulation@default:default,org.apache.ant@default:default,org.eclipse.core.resources.win32.x86@default:false,org.eclipse.emf.doc@default:default,org.eclipse.emf.ecore.edit@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.debug.ui@default:default,org.eclipse.compare@default:default,org.eclipse.core.resources@default:default,org.eclipse.swt@default:default,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.emf.edit@default:default,org.junit*3.8.2.v20090203-1005@default:default,org.eclipse.equinox.p2.repository.tools@default:default,org.eclipse.ui.net@default:default,org.eclipse.emf.codegen.ecore@default:default,org.eclipse.equinox.p2.extensionlocation@default:default,org.apache.derby@default:default,org.eclipse.equinox.p2.exemplarysetup@default:default,org.eclipse.jdt@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.sat4j.core@default:default,org.eclipse.equinox.p2.ui.sdk@default:default,javax.servlet@default:default,org.eclipse.core.runtime.compatibility@default:default,org.eclipse.ui.console@default:default,org.eclipse.ltk.ui.refactoring@default:default,com.mysql.jdbc@default:default,org.eclipse.core.boot@default:default,org.eclipse.jsch.core@default:default,org.eclipse.search@default:default,org.eclipse.equinox.p2.reconciler.dropins@default:default,org.eclipse.ui.externaltools@default:default,org.eclipse.equinox.event@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.core.externaltools@default:default,org.eclipse.jdt.junit.runtime@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.emf.mapping.ecore.editor@default:default,org.eclipse.jdt.junit.core@default:default,org.eclipse.jsch.ui@default:default,org.eclipse.core.runtime@default:true,org.eclipse.emf.mapping@default:default,org.junit4@default:default,org.eclipse.help.ui@default:default,org.eclipse.emf.importer.java@default:default,org.apache.lucene@default:default,org.eclipse.emf.mapping.ecore2xml.ui@default:default,org.eclipse.emf.mapping.xsd2ecore.editor@default:default,org.eclipse.ui.presentations.r21@default:default,org.eclipse.equinox.security.ui@default:default,org.eclipse.update.scheduler@default:default,org.eclipse.help.webapp@default:default,org.eclipse.equinox.launcher@default:default,org.apache.commons.codec@default:default,org.eclipse.ant.launching@default:default,org.eclipse.ui.browser@default:default,org.eclipse.compare.core@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.ui.views@default:default,org.eclipse.equinox.jsp.jasper@default:default,org.eclipse.jface@default:default,org.eclipse.compare.win32@default:default,org.eclipse.platform.doc.user@default:default,org.eclipse.emf.common.ui@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.xsd.edit@default:default,org.eclipse.emf.common@default:default,org.eclipse.core.databinding@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.emf.teneo.annotations@default:default,org.eclipse.emf.ecore.editor@default:default,org.eclipse.ecf.provider.filetransfer.httpclient@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.emf.databinding.edit@default:default,org.junit*4.7.0.v20091118-1515@default:default,org.apache.commons.httpclient@default:default,org.eclipse.ant.ui@default:default,org.eclipse.debug.core@default:default,org.eclipse.ui.workbench.compatibility@default:false,org.eclipse.ui.cheatsheets@default:default,org.apache.commons.el@default:default,org.eclipse.update.core.win32@default:false,org.eclipse.emf.codegen@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.emf.example.installer@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.security@default:default,org.eclipse.ui.intro@default:default,org.eclipse.core.net@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.equinox.security.win32.x86@default:false,org.eclipse.ui.win32@default:false,org.eclipse.ui.ide@default:default,org.eclipse.equinox.p2.ui.sdk.scheduler@default:default,org.eclipse.emf.mapping.ui@default:default,org.eclipse.equinox.common@2:true,org.eclipse.jdt.debug.ui@default:default,org.eclipse.equinox.jsp.jasper.registry@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.mapping.ecore2ecore.editor@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.ui.views.log@default:default,org.eclipse.team.core@default:default,org.eclipse.osgi@-1:true,org.apache.lucene.analysis@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.emf.teneo.hibernate@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.h2.jdbc@default:default,org.eclipse.update.configurator@3:true,org.eclipse.ecf.provider.filetransfer.httpclient.ssl@default:false,org.eclipse.emf.exporter@default:default,org.eclipse.equinox.launcher.win32.win32.x86@default:false,org.eclipse.core.databinding.property@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.core.databinding.beans@default:default,org.eclipse.emf.ant@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.help@default:default,org.hibernate@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.jdt.core@default:default,org.apache.jasper@default:default,org.eclipse.update.ui@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.emf.teneo.hibernate.eclipse@default:default,org.eclipse.xsd@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.emf@default:default,org.eclipse.rcp@default:default,org.eclipse.emf.importer.rose@default:default,org.eclipse.platform.doc.isv@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.team.ui@default:default,org.eclipse.core.net.win32.x86@default:false,org.eclipse.pde.ui@default:default,org.eclipse.equinox.p2.updatechecker@default:default,org.hsqldb@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.emf.importer.ecore@default:default,org.eclipse.ui.forms@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.jdt.ui@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.http.registry@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.ecf@default:default,org.mortbay.jetty.util@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.osgi.services@default:default,org.eclipse.emf.importer@default:default,org.sat4j.pb@default:default,org.eclipse.emf.mapping.ecore2xml@default:default,org.eclipse.equinox.p2.director.app@default:default,org.eclipse.sdk@default:default,org.eclipse.emf.mapping.xsd2ecore@default:default,com.jcraft.jsch@default:default,org.eclipse.ant.core@default:default,org.eclipse.emf.teneo.ui.capabilities@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.emf.cheatsheets@default:default,org.eclipse.jdt.compiler.apt@default:false,org.hamcrest.core@default:default,com.ibm.icu@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.emf.mapping.ecore2ecore@default:default,org.eclipse.emf.converter@default:default,org.eclipse.ui.editors@default:default"/> -<stringAttribute key="selected_workspace_plugins" value="org.eclipse.emf.cdo.examples.company.edit@default:default,org.eclipse.emf.cdo.examples.company@default:default,org.eclipse.net4j.util@default:default,org.eclipse.net4j.util.ui@default:default,org.eclipse.emf.cdo.examples@default:default,org.eclipse.emf.cdo.common@default:default,org.eclipse.net4j@default:default,org.eclipse.emf.cdo.team@default:default,org.eclipse.net4j.ui@default:default,org.eclipse.emf.cdo.ui.ide@default:default,org.eclipse.emf.cdo.ui@default:default,org.eclipse.net4j.tcp@default:default,org.eclipse.emf.cdo.net4j@default:default,org.eclipse.emf.cdo@default:default,org.eclipse.emf.cdo.edit@default:default"/> +<stringAttribute key="product" value="org.eclipse.platform.ide"/> +<stringAttribute key="selected_target_plugins" value="org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.equinox.p2.director.app@default:default,org.eclipse.core.boot@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.help.ui@default:default,org.eclipse.emf.converter@default:default,org.eclipse.equinox.p2.metadata@default:default,org.h2.jdbc@default:default,org.eclipse.emf.teneo.annotations@default:default,org.eclipse.text@default:default,org.eclipse.equinox.security.win32.x86@default:false,org.eclipse.emf.teneo.ui.capabilities@default:default,org.eclipse.emf.codegen.ui@default:default,org.eclipse.equinox.event@default:default,org.eclipse.ui.editors@default:default,org.eclipse.jdt@default:default,org.eclipse.ecf.provider.filetransfer.httpclient.ssl@default:false,org.eclipse.core.databinding@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.help.appserver@default:default,org.mortbay.jetty.server@default:default,org.eclipse.equinox.app@default:default,org.eclipse.team.core@default:default,org.eclipse.emf.mapping.ui@default:default,org.eclipse.emf.codegen.ecore@default:default,org.eclipse.equinox.common@2:true,org.eclipse.emf.codegen@default:default,org.apache.jasper@default:default,org.eclipse.ui.presentations.r21@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.core.runtime@default:true,org.apache.ant@default:default,org.eclipse.help@default:default,org.eclipse.equinox.p2.operations@default:default,org.eclipse.core.resources.win32.x86@default:false,org.eclipse.ui.browser@default:default,javax.servlet.jsp@default:default,org.eclipse.emf.mapping.ecore2ecore@default:default,org.eclipse.osgi.services@default:default,org.eclipse.emf.teneo.hibernate.mapper@default:default,org.eclipse.emf.cheatsheets@default:default,org.eclipse.help.webapp@default:default,org.eclipse.equinox.p2.extensionlocation@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.jsch.core@default:default,org.eclipse.emf.common.ui@default:default,org.eclipse.jface.text@default:default,org.eclipse.emf.databinding.edit@default:default,org.eclipse.update.scheduler@default:default,org.eclipse.emf.exporter@default:default,org.eclipse.equinox.ds@default:true,org.eclipse.equinox.p2.repository.tools@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.emf.edit.ui@default:default,org.eclipse.ui.externaltools@default:default,org.eclipse.core.filesystem.win32.x86@default:false,org.eclipse.core.commands@default:default,org.eclipse.swt.win32.win32.x86_64@default:false,org.hsqldb@default:default,com.ibm.icu@default:default,org.apache.commons.logging@default:default,org.eclipse.emf.teneo.hibernate@default:default,org.eclipse.ui.ide@default:default,org.eclipse.equinox.security.ui@default:default,org.eclipse.compare@default:default,org.eclipse.equinox.p2.touchpoint.natives@default:default,org.eclipse.emf.edit@default:default,org.eclipse.equinox.p2.console@default:default,org.eclipse.core.net@default:default,org.eclipse.ui.win32@default:false,org.eclipse.jsch.ui@default:default,org.eclipse.team.ui@default:default,org.eclipse.emf.mapping.ecore2xml.ui@default:default,org.eclipse.search@default:default,org.eclipse.emf.teneo@default:default,org.eclipse.ui.forms@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.emf.importer.java@default:default,org.eclipse.jdt.core@default:default,org.eclipse.jface@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.equinox.p2.directorywatcher@default:default,org.eclipse.emf.importer.rose@default:default,org.eclipse.emf.ecore.edit@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.emf.common@default:default,org.junit@default:default,org.eclipse.core.jobs@default:default,org.eclipse.emf.teneo.eclipse@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.equinox.security@default:default,org.eclipse.swt.win32.win32.x86@default:false,org.eclipse.core.runtime.compatibility@default:default,org.eclipse.update.core@default:default,org.eclipse.ltk.core.refactoring@default:default,org.sat4j.pb@default:default,org.eclipse.debug.core@default:default,org.eclipse.ui.intro@default:default,org.mortbay.jetty.util@default:default,org.eclipse.core.externaltools@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.ecf.ssl@default:false,org.apache.commons.codec*1.3.0.v20100106-1700@default:default,org.eclipse.ui.intro.universal@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.emf.mapping@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.apache.commons.httpclient@default:default,org.eclipse.core.expressions@default:default,org.eclipse.ui.console@default:default,org.eclipse.equinox.http.registry@default:default,org.hibernate@default:default,org.eclipse.ui.net@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.equinox.p2.metadata.generator@default:default,org.sat4j.core@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.ui@default:default,org.eclipse.equinox.p2.updatechecker@default:default,javax.servlet@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.emf.ecore.editor@default:default,org.eclipse.equinox.launcher.win32.win32.x86_64@default:false,org.eclipse.equinox.p2.reconciler.dropins@default:default,org.eclipse.emf.databinding@default:default,org.apache.lucene@default:default,org.eclipse.update.configurator@3:true,org.eclipse.equinox.p2.core@default:default,org.eclipse.debug.ui@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.apache.derby@default:default,org.eclipse.core.databinding.beans@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.equinox.util@default:default,org.eclipse.swt@default:default,org.eclipse.ecf@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.core.net.win32.x86@default:false,com.mysql.jdbc@default:default,org.eclipse.core.variables@default:default,org.eclipse.emf.ant@default:default,org.eclipse.help.base@default:default,org.eclipse.emf@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.rcp@default:default,org.eclipse.emf.codegen.ecore.ui@default:default,org.eclipse.emf.mapping.ecore.editor@default:default,org.eclipse.core.filesystem.win32.x86_64@default:false,org.eclipse.emf.ecore@default:default,org.eclipse.emf.mapping.ecore2ecore.editor@default:default,org.eclipse.emf.example.installer@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.eclipse.equinox.jsp.jasper.registry@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.emf.importer.ecore@default:default,org.eclipse.emf.mapping.ecore2xml@default:default,org.apache.commons.codec*1.3.0.v20080530-1600@default:default,org.eclipse.emf.ecore.change.edit@default:default,org.eclipse.platform@default:default,org.postgresql.jdbc3@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.ui@default:default,org.eclipse.core.net.win32.x86_64@default:false,org.eclipse.jface.databinding@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.compare.win32@default:default,org.eclipse.core.resources@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.osgi@-1:true,org.apache.commons.el@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.ui.views@default:default,org.eclipse.emf.importer@default:default,org.eclipse.emf.teneo.hibernate.eclipse@default:default,org.eclipse.update.core.win32@default:false,org.apache.lucene.analysis@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.ui.workbench.compatibility@default:false,org.eclipse.ecf.provider.filetransfer.httpclient@default:default,org.eclipse.compare.core@default:default,org.eclipse.osgi.util@default:default,com.jcraft.jsch@default:default,org.hamcrest.core@default:default,org.eclipse.equinox.launcher.win32.win32.x86@default:false,org.eclipse.equinox.p2.exemplarysetup@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.equinox.launcher@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.emf.mapping.ecore@default:default,org.eclipse.update.ui@default:default,org.eclipse.equinox.jsp.jasper@default:default"/> +<stringAttribute key="selected_workspace_plugins" value="org.eclipse.emf.cdo@default:default,org.eclipse.net4j.tcp@default:default,org.eclipse.net4j.ui@default:default,org.eclipse.emf.cdo.ui.ide@default:default,org.eclipse.emf.cdo.edit@default:default,org.eclipse.emf.cdo.examples@default:default,org.eclipse.net4j.util@default:default,org.eclipse.emf.cdo.net4j@default:default,org.eclipse.net4j@default:default,org.eclipse.emf.cdo.team@default:default,org.eclipse.net4j.util.ui@default:default,org.eclipse.emf.cdo.ui@default:default,org.eclipse.emf.cdo.examples.company.edit@default:default,org.eclipse.emf.cdo.common@default:default,org.eclipse.emf.cdo.examples.company@default:default"/> <booleanAttribute key="show_selected_only" value="false"/> <stringAttribute key="templateConfig" value="${target_home}\configuration\config.ini"/> <booleanAttribute key="tracing" value="true"/> @@ -41,27 +41,27 @@ <mapEntry key="org.eclipse.debug.ui/debug/viewers/updateSequence" value="false"/> <mapEntry key="org.eclipse.osgi/trace/filename" value="runtime.traces"/> <mapEntry key="org.eclipse.net4j.pop/perf" value="false"/> -<mapEntry key="org.eclipse.jdt.core/debug" value="true"/> <mapEntry key="org.eclipse.debug.ui/debug/contextlaunching" value="false"/> +<mapEntry key="org.eclipse.jdt.core/debug" value="true"/> <mapEntry key="org.eclipse.osgi/eclipseadaptor/debug" value="false"/> <mapEntry key="org.eclipse.net4j.tcp/debug" value="true"/> <mapEntry key="org.eclipse.team.cvs.core/dirtycaching" value="false"/> <mapEntry key="org.eclipse.emf.cdo.server/debug.repository" value="true"/> <mapEntry key="org.eclipse.jdt.core/debug/javamodel" value="false"/> <mapEntry key="org.eclipse.ui.intro/trace/printHTML" value="false"/> -<mapEntry key="org.eclipse.ltk.core.refactoring/perf/participants/createChanges" value="300"/> <mapEntry key="org.eclipse.emf.cdo.common/debug.protocol" value="true"/> -<mapEntry key="org.eclipse.net4j.pop.ui/perf" value="false"/> +<mapEntry key="org.eclipse.ltk.core.refactoring/perf/participants/createChanges" value="300"/> <mapEntry key="org.eclipse.net4j.util/debug.lifecycle.dump" value="true"/> -<mapEntry key="org.eclipse.ui/listeners/IWorkbenchWindow.IPerspectiveListener" value="false"/> +<mapEntry key="org.eclipse.net4j.pop.ui/perf" value="false"/> <mapEntry key="org.eclipse.net4j.pop/debug" value="true"/> +<mapEntry key="org.eclipse.ui/listeners/IWorkbenchWindow.IPerspectiveListener" value="false"/> <mapEntry key="org.eclipse.emf.cdo/debug.util" value="true"/> <mapEntry key="org.eclipse.osgi/resolver/debug" value="false"/> <mapEntry key="org.eclipse.net4j.db.postgresql/debug" value="true"/> <mapEntry key="org.eclipse.team.core/refreshjob" value="false"/> -<mapEntry key="org.eclipse.ui/debug" value="false"/> -<mapEntry key="org.eclipse.update.core/debug/installhandler" value="false"/> <mapEntry key="org.eclipse.jface.text/debug/AbstractInformationControlManager" value="false"/> +<mapEntry key="org.eclipse.update.core/debug/installhandler" value="false"/> +<mapEntry key="org.eclipse.ui/debug" value="false"/> <mapEntry key="org.eclipse.help.ui/debug/infopop" value="false"/> <mapEntry key="org.eclipse.pde.core/classpath" value="false"/> <mapEntry key="org.eclipse.team.cvs.core/threading" value="false"/> @@ -71,8 +71,8 @@ <mapEntry key="org.eclipse.ui/trace/operations.verbose" value="false"/> <mapEntry key="org.eclipse.osgi/trace/activation" value="false"/> <mapEntry key="org.eclipse.debug.core/debug/commands" value="false"/> -<mapEntry key="org.eclipse.ui/perf/workbench.restore" value="30000"/> <mapEntry key="org.eclipse.team.core/threading" value="false"/> +<mapEntry key="org.eclipse.ui/perf/workbench.restore" value="30000"/> <mapEntry key="org.eclipse.update.core/debug/parsing" value="false"/> <mapEntry key="org.eclipse.jdt.core/debug/postaction" value="false"/> <mapEntry key="org.eclipse.jdt.apt.core/debug/generatedFileMaps" value="false"/> @@ -88,14 +88,14 @@ <mapEntry key="org.eclipse.help/debug/toc" value="false"/> <mapEntry key="org.eclipse.debug.ui/debug" value="false"/> <mapEntry key="org.eclipse.jdt.core/debug/buffermanager" value="false"/> -<mapEntry key="org.eclipse.jface.text/debug/ContentAssistSubjectAdapters" value="false"/> <mapEntry key="org.eclipse.pde.build/debug" value="false"/> +<mapEntry key="org.eclipse.jface.text/debug/ContentAssistSubjectAdapters" value="false"/> <mapEntry key="org.eclipse.jdt.ui/perf/search/participants" value="300"/> <mapEntry key="org.eclipse.ui/perf/perspective.create" value="800"/> <mapEntry key="org.eclipse.update.core/debug/type" value="false"/> <mapEntry key="org.eclipse.osgi/eclipseadaptor/debug/platformadmin" value="false"/> -<mapEntry key="org.eclipse.ui/listeners/IWorkbenchPage.IPropertyChangeListener" value="false"/> <mapEntry key="org.eclipse.osgi/resolver/generics" value="false"/> +<mapEntry key="org.eclipse.ui/listeners/IWorkbenchPage.IPropertyChangeListener" value="false"/> <mapEntry key="org.eclipse.osgi/resolver/requires" value="false"/> <mapEntry key="org.eclipse.core.resources/refresh" value="false"/> <mapEntry key="org.eclipse.jdt.core/perf/containerinitializer" value="5000"/> @@ -103,14 +103,14 @@ <mapEntry key="org.eclipse.help.webapp/debug" value="true"/> <mapEntry key="org.eclipse.jdt.core/debug/builder/stats" value="false"/> <mapEntry key="org.eclipse.jdt.ui/debug/ASTProvider" value="false"/> -<mapEntry key="org.eclipse.equinox.security.ui/debug/storage" value="false"/> <mapEntry key="org.eclipse.osgi/debug" value="false"/> +<mapEntry key="org.eclipse.equinox.security.ui/debug/storage" value="false"/> <mapEntry key="org.eclipse.emf.cdo.server/debug.types" value="true"/> <mapEntry key="org.eclipse.ui/trace/handlers" value="false"/> <mapEntry key="org.eclipse.ui/trace/contexts.performance" value="false"/> <mapEntry key="org.eclipse.net4j.buddies/debug" value="true"/> -<mapEntry key="org.eclipse.team.cvs.core/metafiles" value="false"/> <mapEntry key="org.eclipse.jdt.core/perf/completion" value="300"/> +<mapEntry key="org.eclipse.team.cvs.core/metafiles" value="false"/> <mapEntry key="org.eclipse.osgi/profile/startup" value="false"/> <mapEntry key="org.eclipse.core.jobs/jobs" value="false"/> <mapEntry key="org.eclipse.core.resources/perf/save.participants" value="500"/> @@ -124,78 +124,78 @@ <mapEntry key="org.eclipse.net4j/debug.buffer" value="false"/> <mapEntry key="org.eclipse.core.resources/contenttype/cache" value="false"/> <mapEntry key="org.eclipse.emf.cdo/debug.repository" value="true"/> -<mapEntry key="org.eclipse.update.core/debug/configuration" value="false"/> <mapEntry key="org.eclipse.core.jobs/jobs/locks" value="false"/> +<mapEntry key="org.eclipse.update.core/debug/configuration" value="false"/> <mapEntry key="org.eclipse.emf.cdo.examples/debug" value="true"/> -<mapEntry key="org.eclipse.ui/trace/handlers.verbose.commandId" value=""/> <mapEntry key="org.eclipse.core.runtime/url/debug/connect" value="false"/> +<mapEntry key="org.eclipse.ui/trace/handlers.verbose.commandId" value=""/> <mapEntry key="org.eclipse.ui.ide/debug" value="false"/> <mapEntry key="org.eclipse.osgi/profile/debug" value="false"/> <mapEntry key="org.eclipse.pde.core/debug" value="true"/> <mapEntry key="org.eclipse.ui/listeners/IWorkbenchPartReference" value="false"/> <mapEntry key="org.eclipse.ui/debug/job.stale" value="false"/> -<mapEntry key="org.eclipse.net4j.pop.repository/perf" value="false"/> <mapEntry key="org.eclipse.net4j.util/debug.registry" value="true"/> +<mapEntry key="org.eclipse.net4j.pop.repository/perf" value="false"/> <mapEntry key="org.eclipse.jdt.ui/perf/explorer/createPartControl" value="1300"/> <mapEntry key="org.eclipse.jdt.core/debug/hierarchy" value="false"/> -<mapEntry key="org.eclipse.jdt.core/perf/variableinitializer" value="5000"/> -<mapEntry key="org.eclipse.emf.cdo/debug.object" value="true"/> <mapEntry key="org.eclipse.ui.ide/debug/internalerror/openDialog" value="false"/> +<mapEntry key="org.eclipse.emf.cdo/debug.object" value="true"/> +<mapEntry key="org.eclipse.jdt.core/perf/variableinitializer" value="5000"/> <mapEntry key="org.eclipse.emf.cdo.server/debug.revision" value="false"/> <mapEntry key="org.eclipse.emf.cdo.server/debug.transaction" value="true"/> <mapEntry key="org.eclipse.core.resources/strings" value="false"/> <mapEntry key="org.eclipse.jdt.core/debug/sourcemapper" value="false"/> <mapEntry key="org.eclipse.core.resources/save/mastertable" value="false"/> <mapEntry key="org.eclipse.core.expressions/tracePropertyResolving" value="false"/> -<mapEntry key="org.eclipse.core.resources/preferences" value="false"/> -<mapEntry key="org.eclipse.jdt.core/debug/javadelta" value="false"/> <mapEntry key="org.eclipse.ui/perf/showHeapStatus" value="true"/> +<mapEntry key="org.eclipse.jdt.core/debug/javadelta" value="false"/> +<mapEntry key="org.eclipse.core.resources/preferences" value="false"/> <mapEntry key="org.eclipse.jdt.core/debug/selection" value="false"/> <mapEntry key="org.eclipse.jdt.apt.core/debug" value="false"/> <mapEntry key="org.eclipse.jdt.ui/perf/content_assist_sorters/extensions" value=""/> <mapEntry key="org.eclipse.emf.cdo.server.hibernate.id/debug" value="true"/> <mapEntry key="org.eclipse.jdt.core/debug/javamodel/cache" value="false"/> <mapEntry key="org.eclipse.emf.cdo/perf.revision" value="true"/> -<mapEntry key="org.eclipse.osgi/defaultprofile/logfilename" value=""/> <mapEntry key="org.eclipse.net4j/set.signal.thread.name" value="false"/> +<mapEntry key="org.eclipse.osgi/defaultprofile/logfilename" value=""/> <mapEntry key="org.eclipse.team.core/backgroundevents" value="false"/> <mapEntry key="org.eclipse.ui/trace/keyBindings" value="false"/> <mapEntry key="org.eclipse.emf.cdo.server/debug.session" value="true"/> <mapEntry key="org.eclipse.ui/perf/part.activate" value="200"/> <mapEntry key="org.eclipse.update.core/debug" value="true"/> <mapEntry key="org.eclipse.osgi/debug/security" value="false"/> -<mapEntry key="org.eclipse.core.resources/restore/metainfo" value="false"/> <mapEntry key="org.eclipse.core.resources/build/needbuild" value="false"/> +<mapEntry key="org.eclipse.core.resources/restore/metainfo" value="false"/> <mapEntry key="org.eclipse.ui/debug/swtdebugglobal" value="false"/> <mapEntry key="org.eclipse.core.resources/perf/builders" value="10000"/> -<mapEntry key="org.eclipse.ui/perf/perspective.listeners" value="200"/> -<mapEntry key="org.eclipse.net4j.db.hsqldb/debug" value="true"/> <mapEntry key="org.eclipse.net4j.jms.admin/debug.protocol" value="true"/> +<mapEntry key="org.eclipse.net4j.db.hsqldb/debug" value="true"/> +<mapEntry key="org.eclipse.ui/perf/perspective.listeners" value="200"/> <mapEntry key="org.eclipse.ui/debug/showAllJobs" value="false"/> -<mapEntry key="org.eclipse.core.resources/history" value="false"/> <mapEntry key="org.eclipse.emf.cdo.server/debug.store" value="true"/> +<mapEntry key="org.eclipse.core.resources/history" value="false"/> <mapEntry key="org.eclipse.net4j.http.server/debug" value="true"/> <mapEntry key="org.eclipse.ui/listeners/IWorkbenchPage.IPartListener" value="false"/> <mapEntry key="org.eclipse.jdt.core/debug/search" value="false"/> -<mapEntry key="org.eclipse.team.cvs.core/cvsprotocol" value="true"/> <mapEntry key="org.eclipse.pde.core/validation" value="false"/> +<mapEntry key="org.eclipse.team.cvs.core/cvsprotocol" value="true"/> <mapEntry key="org.eclipse.jface.text/debug/AnnotationPainter" value="false"/> <mapEntry key="org.eclipse.core.resources/restore/mastertable" value="false"/> <mapEntry key="org.eclipse.core.runtime/debug" value="false"/> <mapEntry key="org.eclipse.equinox.preferences/set" value="false"/> <mapEntry key="org.eclipse.core.resources/restore/snapshots" value="false"/> <mapEntry key="org.eclipse.ui/perf/perspective.switch" value="800"/> -<mapEntry key="org.eclipse.help.webapp/debug/workingsets" value="false"/> <mapEntry key="org.eclipse.emf.cdo/debug.protocol" value="true"/> +<mapEntry key="org.eclipse.help.webapp/debug/workingsets" value="false"/> <mapEntry key="org.eclipse.osgi/debug/bundleTime" value="false"/> -<mapEntry key="org.eclipse.equinox.security.ui/debug" value="false"/> <mapEntry key="org.eclipse.osgi/resolver/uses" value="false"/> +<mapEntry key="org.eclipse.equinox.security.ui/debug" value="false"/> <mapEntry key="org.eclipse.emf.cdo.common/perf.revision" value="true"/> <mapEntry key="org.eclipse.core.resources/restore/markers" value="false"/> <mapEntry key="org.eclipse.emf.cdo.common/debug.model" value="true"/> <mapEntry key="org.eclipse.ui/perf/workbench.start" value="45000"/> -<mapEntry key="org.eclipse.core.runtime/url/debug/cachecopy" value="false"/> <mapEntry key="org.eclipse.emf.cdo.common/perf.revision.reading" value="true"/> +<mapEntry key="org.eclipse.core.runtime/url/debug/cachecopy" value="false"/> <mapEntry key="org.eclipse.core.runtime/perf/success" value="false"/> <mapEntry key="org.eclipse.net4j/debug.connector" value="true"/> <mapEntry key="org.eclipse.jdt.core/perf/selection" value="300"/> @@ -203,11 +203,11 @@ <mapEntry key="org.eclipse.equinox.security/debug/loginFramework" value="false"/> <mapEntry key="org.eclipse.core.resources/restore" value="false"/> <mapEntry key="org.eclipse.osgi/resolver/wiring" value="false"/> -<mapEntry key="org.eclipse.core.resources/perf/snapshot" value="1000"/> <mapEntry key="org.eclipse.net4j.buddies.server/debug" value="true"/> +<mapEntry key="org.eclipse.core.resources/perf/snapshot" value="1000"/> <mapEntry key="org.eclipse.ui.intro/trace/logPerformance" value="false"/> -<mapEntry key="org.eclipse.ui/trace/contexts.verbose" value="false"/> <mapEntry key="org.eclipse.osgi/debug/loader" value="false"/> +<mapEntry key="org.eclipse.ui/trace/contexts.verbose" value="false"/> <mapEntry key="org.eclipse.jdt.ui/perf/explorer/makeActions" value="1000"/> <mapEntry key="org.eclipse.net4j/debug.acceptor" value="true"/> <mapEntry key="org.eclipse.net4j.buddies.ui/debug" value="true"/> @@ -230,8 +230,8 @@ <mapEntry key="org.eclipse.core.resources/perf/listeners" value="500"/> <mapEntry key="org.eclipse.ui.intro/flags/noBrowser" value="false"/> <mapEntry key="org.eclipse.ui/perf/part.init" value="800"/> -<mapEntry key="org.eclipse.equinox.security/debug" value="false"/> <mapEntry key="org.eclipse.core.contenttype/debug" value="false"/> +<mapEntry key="org.eclipse.equinox.security/debug" value="false"/> <mapEntry key="org.eclipse.osgi/resolver/imports" value="false"/> <mapEntry key="org.eclipse.core.resources/restore/tree" value="false"/> <mapEntry key="org.eclipse.net4j.db.postgresql/debug.sql" value="true"/> @@ -239,8 +239,8 @@ <mapEntry key="org.eclipse.help/debug/context" value="false"/> <mapEntry key="org.eclipse.net4j.template.ui/debug" value="true"/> <mapEntry key="org.eclipse.osgi/debug/manifest" value="false"/> -<mapEntry key="org.eclipse.ui/trace/multipageeditor" value="false"/> <mapEntry key="org.eclipse.emf.cdo/debug" value="true"/> +<mapEntry key="org.eclipse.ui/trace/multipageeditor" value="false"/> <mapEntry key="org.eclipse.emf.cdo.ui/debug" value="true"/> <mapEntry key="org.eclipse.net4j.examples/debug" value="true"/> <mapEntry key="org.eclipse.jdt.apt.core/debug/generatedFiles" value="false"/> @@ -256,12 +256,12 @@ <mapEntry key="org.eclipse.osgi/trace/classLoading" value="false"/> <mapEntry key="org.eclipse.net4j.jms.server.jdbc/debug" value="true"/> <mapEntry key="org.eclipse.net4j/open.channel.timeout" value="10000"/> -<mapEntry key="org.eclipse.core.jobs/jobs/errorondeadlock" value="false"/> <mapEntry key="org.eclipse.core.resources/save" value="false"/> +<mapEntry key="org.eclipse.core.jobs/jobs/errorondeadlock" value="false"/> <mapEntry key="org.eclipse.core.resources/contenttype" value="false"/> <mapEntry key="org.eclipse.jface.text/debug/FastPartitioner/PositionCache" value="false"/> -<mapEntry key="org.eclipse.jdt.core/debug/compiler" value="false"/> <mapEntry key="org.eclipse.emf.cdo.server/debug" value="true"/> +<mapEntry key="org.eclipse.jdt.core/debug/compiler" value="false"/> <mapEntry key="org.eclipse.osgi/debug/events" value="false"/> <mapEntry key="org.eclipse.ui/trace/commands" value="false"/> <mapEntry key="org.eclipse.equinox.preferences/get" value="false"/> @@ -278,18 +278,18 @@ <mapEntry key="org.eclipse.net4j.jms/debug" value="true"/> <mapEntry key="org.eclipse.osgi/eclipseadaptor/converter/debug" value="false"/> <mapEntry key="org.eclipse.emf.cdo.server/debug.resource" value="true"/> -<mapEntry key="org.eclipse.net4j.debug/debug" value="true"/> <mapEntry key="org.eclipse.net4j.db.derby/debug.sql" value="true"/> +<mapEntry key="org.eclipse.net4j.debug/debug" value="true"/> <mapEntry key="org.eclipse.pde.core/cache" value="false"/> <mapEntry key="org.eclipse.emf.cdo.ui/test" value="true"/> <mapEntry key="org.eclipse.emf.cdo/debug.transaction" value="true"/> <mapEntry key="org.eclipse.emf.cdo.server.db/debug" value="true"/> -<mapEntry key="org.eclipse.debug.core/debug/events" value="false"/> <mapEntry key="org.eclipse.net4j/debug.selector" value="true"/> +<mapEntry key="org.eclipse.debug.core/debug/events" value="false"/> <mapEntry key="org.eclipse.emf.cdo.common/perf" value="true"/> <mapEntry key="org.eclipse.jdt.ui/debug" value="true"/> -<mapEntry key="org.eclipse.net4j.db/debug.sql" value="true"/> <mapEntry key="org.eclipse.osgi/monitor/classes" value="false"/> +<mapEntry key="org.eclipse.net4j.db/debug.sql" value="true"/> <mapEntry key="org.eclipse.ui/perf/part.input" value="200"/> <mapEntry key="org.eclipse.ui.intro.universal/debug" value="true"/> <mapEntry key="org.eclipse.jdt.ui/debug/TypeConstraints" value="false"/> @@ -305,21 +305,21 @@ <mapEntry key="org.eclipse.jdt.core.manipulation/debug" value="true"/> <mapEntry key="org.eclipse.emf.cdo.common/perf.revision.writing" value="true"/> <mapEntry key="org.eclipse.net4j.jms.admin/debug" value="true"/> -<mapEntry key="org.eclipse.net4j.db.derby/debug" value="true"/> <mapEntry key="org.eclipse.emf.cdo/debug.model" value="true"/> +<mapEntry key="org.eclipse.net4j.db.derby/debug" value="true"/> <mapEntry key="org.eclipse.jdt.core/debug/cpresolution" value="false"/> -<mapEntry key="org.eclipse.help/debug/search" value="false"/> <mapEntry key="org.eclipse.help.ui/debug/embeddedBrowser" value="false"/> +<mapEntry key="org.eclipse.help/debug/search" value="false"/> <mapEntry key="org.eclipse.team.cvs.ssh/ssh_protocol" value="false"/> -<mapEntry key="org.eclipse.core.resources/build/stacktrace" value="false"/> <mapEntry key="org.eclipse.ui/perf/part.create" value="800"/> +<mapEntry key="org.eclipse.core.resources/build/stacktrace" value="false"/> <mapEntry key="org.eclipse.ui.intro/trace/logInfo" value="true"/> <mapEntry key="org.eclipse.team.core/streams" value="false"/> -<mapEntry key="org.eclipse.emf.cdo.ui/test.bulk_add" value="true"/> <mapEntry key="org.eclipse.emf.cdo.common/debug" value="true"/> +<mapEntry key="org.eclipse.emf.cdo.ui/test.bulk_add" value="true"/> <mapEntry key="org.eclipse.ui.ide/debug/undomonitor" value="false"/> -<mapEntry key="org.eclipse.jdt.ui/perf/explorer/RefactorActionGroup" value="150"/> <mapEntry key="org.eclipse.net4j.ui/debug" value="true"/> +<mapEntry key="org.eclipse.jdt.ui/perf/explorer/RefactorActionGroup" value="150"/> <mapEntry key="org.eclipse.ui/experimental/menus" value="false"/> <mapEntry key="org.eclipse.core.jobs/jobs/shutdown" value="false"/> <mapEntry key="org.eclipse.osgi/debug/packageadmin" value="false"/> @@ -337,16 +337,16 @@ <mapEntry key="org.eclipse.ui.workbench/debug" value="false"/> <mapEntry key="org.eclipse.jdt.ui/perf/content_assist/extensions" value="1000"/> <mapEntry key="org.eclipse.osgi/debug/filter" value="false"/> -<mapEntry key="org.eclipse.debug.core/debug" value="false"/> <mapEntry key="org.eclipse.net4j.buddies.common/debug" value="true"/> +<mapEntry key="org.eclipse.debug.core/debug" value="false"/> <mapEntry key="org.eclipse.core.resources/debug" value="false"/> <mapEntry key="org.eclipse.jdt.core/debug/zipaccess" value="false"/> -<mapEntry key="org.eclipse.ui.browser/debug" value="false"/> <mapEntry key="org.eclipse.emf.cdo.server/debug.protocol" value="true"/> +<mapEntry key="org.eclipse.ui.browser/debug" value="false"/> <mapEntry key="org.eclipse.osgi/profile/impl" value="org.eclipse.osgi.internal.profile.DefaultProfileLogger"/> -<mapEntry key="org.eclipse.net4j.jms.server/debug.protocol" value="true"/> -<mapEntry key="org.eclipse.update.core/debug/web" value="false"/> <mapEntry key="org.eclipse.net4j.pop.repository.ccvs/perf" value="false"/> +<mapEntry key="org.eclipse.update.core/debug/web" value="false"/> +<mapEntry key="org.eclipse.net4j.jms.server/debug.protocol" value="true"/> <mapEntry key="org.eclipse.team.cvs.core/debug" value="false"/> <mapEntry key="org.eclipse.help/debug" value="true"/> <mapEntry key="org.eclipse.core.runtime/perf" value="false"/> @@ -355,14 +355,14 @@ <mapEntry key="org.eclipse.emf.cdo/perf.revision.loading" value="true"/> <mapEntry key="org.eclipse.emf.cdo/debug.revision" value="true"/> <mapEntry key="org.eclipse.emf.cdo/debug.view" value="true"/> -<mapEntry key="org.eclipse.jdt.core/debug/formatter" value="false"/> <mapEntry key="org.eclipse.ui/perf/part.listeners" value="200"/> +<mapEntry key="org.eclipse.jdt.core/debug/formatter" value="false"/> <mapEntry key="org.eclipse.debug.ui/debug/viewers/viewer" value="false"/> <mapEntry key="org.eclipse.ui/trace/keyBindings.verbose" value="false"/> -<mapEntry key="org.eclipse.osgi/defaultprofile/buffersize" value="256"/> <mapEntry key="org.eclipse.core.resources/restore/syncinfo" value="false"/> -<mapEntry key="org.eclipse.team.cvs.core/syncchangeevents" value="false"/> +<mapEntry key="org.eclipse.osgi/defaultprofile/buffersize" value="256"/> <mapEntry key="org.eclipse.ui/perf/page.listeners" value="200"/> +<mapEntry key="org.eclipse.team.cvs.core/syncchangeevents" value="false"/> <mapEntry key="org.eclipse.net4j.http.common/debug" value="true"/> <mapEntry key="org.eclipse.jdt.core/debug/cpresolution/failure" value="false"/> <mapEntry key="org.eclipse.emf.cdo/debug.resource" value="true"/> @@ -385,8 +385,8 @@ <mapEntry key="org.eclipse.ui/listeners/IWorkbenchWindow.IPartListener" value="false"/> <mapEntry key="org.eclipse.jdt.core/debug/resolution" value="false"/> <mapEntry key="org.eclipse.update.configurator/debug" value="false"/> -<mapEntry key="org.eclipse.help.ui/debug" value="true"/> <mapEntry key="org.eclipse.debug.ui/debug/viewers/deltas" value="false"/> +<mapEntry key="org.eclipse.help.ui/debug" value="true"/> <mapEntry key="org.eclipse.osgi/eclipseadaptor/debug/location" value="false"/> <mapEntry key="org.eclipse.ui.intro.universal/trace/logInfo" value="true"/> </mapAttribute> diff --git a/plugins/org.eclipse.emf.cdo.ui/CDOClient2.launch b/plugins/org.eclipse.emf.cdo.ui/CDOClient2.launch index 8b139dd6f3..0cd51a26ce 100644 --- a/plugins/org.eclipse.emf.cdo.ui/CDOClient2.launch +++ b/plugins/org.eclipse.emf.cdo.ui/CDOClient2.launch @@ -22,10 +22,10 @@ <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/> <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms40m -Xmx512m"/> <stringAttribute key="pde.version" value="3.3"/> -<stringAttribute key="product" value="org.eclipse.sdk.ide"/> +<stringAttribute key="product" value="org.eclipse.platform.ide"/> <stringAttribute key="selectedPlugin" value="org.eclipse.emf.cdo"/> -<stringAttribute key="selected_target_plugins" value="org.eclipse.core.boot@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.ui.forms@default:default,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.jdt.junit@default:default,org.apache.commons.httpclient@default:default,org.eclipse.emf.ecore.change.edit@default:default,org.eclipse.pde.junit.runtime@default:default,org.eclipse.ui.editors@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.ui.intro.universal@default:default,org.eclipse.team.cvs.ui@default:default,org.eclipse.emf.cheatsheets@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.emf.ecore.editor@default:default,org.eclipse.ui.views@default:default,org.eclipse.ui.browser@default:default,org.eclipse.jdt.junit4.runtime@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.ecf@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.platform.doc.isv@default:default,org.eclipse.equinox.p2.ui@default:default,org.eclipse.core.net@default:default,org.eclipse.pde@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.apache.lucene@default:default,org.eclipse.emf.codegen.ecore.ui@default:default,org.eclipse.emf.doc@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.cvs@default:default,org.eclipse.emf.importer.ecore@default:default,org.eclipse.equinox.app@default:default,org.apache.ant@default:default,org.eclipse.pde.runtime@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.team.ui@default:default,org.eclipse.jdt.debug.ui@default:default,org.eclipse.equinox.p2.metadata.generator@default:default,org.eclipse.equinox.security.win32.x86@default:false,org.eclipse.help@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.emf.importer@default:default,org.eclipse.osgi@-1:true,org.eclipse.core.runtime.compatibility.auth@default:default,org.sat4j.pb@default:default,org.eclipse.pde.build@default:default,org.eclipse.ui.views.log@default:default,org.eclipse.update.configurator@3:true,org.eclipse.ui.workbench.compatibility@default:false,org.eclipse.equinox.p2.updatesite@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.jface.databinding@default:default,org.apache.commons.codec@default:default,org.eclipse.ui.intro@default:default,org.eclipse.emf.exporter@default:default,org.eclipse.equinox.security@default:default,org.eclipse.update.core.win32@default:false,org.eclipse.core.databinding@default:default,org.eclipse.emf.edit.ui@default:default,org.eclipse.emf.common@default:default,org.eclipse.equinox.launcher.win32.win32.x86@default:false,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.equinox.common@2:true,org.eclipse.swt.win32.win32.x86@default:false,org.eclipse.team.cvs.ssh2@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.osgi.util@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.pde.ui@default:default,org.eclipse.pde.ui.templates@default:default,org.junit4@default:default,org.eclipse.emf.ant@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.emf.ecore.edit@default:default,org.eclipse.emf.common.ui@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.text@default:default,org.eclipse.equinox.http.registry@default:default,org.eclipse.help.ui@default:default,org.eclipse.core.runtime.compatibility@default:default,org.eclipse.emf.edit@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.equinox.jsp.jasper@default:default,com.ibm.icu@default:default,org.eclipse.compare@default:default,org.eclipse.sdk@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.emf.converter@default:default,org.eclipse.jface@default:default,org.eclipse.update.scheduler@default:default,org.eclipse.core.net.win32.x86@default:false,org.apache.commons.logging@default:default,org.eclipse.update.ui@default:default,org.eclipse.equinox.launcher@default:default,org.eclipse.jsch.core@default:default,org.eclipse.jdt.junit.runtime@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.ui.ide@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.ecf.ssl@default:false,org.eclipse.emf.importer.java@default:default,org.eclipse.core.filesystem.win32.x86@default:false,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.osgi.services@default:default,org.eclipse.equinox.p2.repository.tools@default:default,org.eclipse.pde.launching@default:default,org.eclipse.jface.text@default:default,org.eclipse.jdt.junit.core@default:default,org.eclipse.equinox.jsp.jasper.registry@default:default,org.sat4j.core@default:default,org.eclipse.ant.launching@default:default,org.eclipse.emf.importer.rose@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,com.jcraft.jsch@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.core.expressions@default:default,org.apache.jasper@default:default,org.eclipse.core.databinding.beans@default:default,org.eclipse.jdt.doc.isv@default:default,org.hamcrest.core@default:default,javax.servlet@default:default,org.eclipse.ui.win32@default:false,org.eclipse.ui.navigator@default:default,org.mortbay.jetty.server@default:default,org.eclipse.core.commands@default:default,org.apache.commons.el@default:default,org.eclipse.emf.mapping.ecore2ecore.editor@default:default,org.eclipse.emf.mapping.ecore2xml@default:default,org.eclipse.update.core@default:default,org.eclipse.ant.core@default:default,org.eclipse.help.appserver@default:default,org.eclipse.team.cvs.core@default:default,org.eclipse.ui.navigator.resources@default:default,javax.servlet.jsp@default:default,org.eclipse.core.variables@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.pde.core@default:default,org.eclipse.swt@default:default,org.eclipse.team.core@default:default,org.eclipse.pde.doc.user@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.core.jobs@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.help.webapp@default:default,org.junit@default:default,org.eclipse.emf.codegen@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.core.resources.win32.x86@default:false,org.eclipse.core.filebuffers@default:default,org.eclipse.emf.mapping.ui@default:default,org.eclipse.debug.ui@default:default,org.eclipse.debug.core@default:default,org.eclipse.emf.mapping.ecore2xml.ui@default:default,org.eclipse.compare.core@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.search@default:default,org.eclipse.core.runtime@default:true,org.mortbay.jetty.util@default:default,org.eclipse.equinox.security.ui@default:default,org.eclipse.ui.console@default:default,org.eclipse.core.externaltools@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.ui.externaltools@default:default,org.eclipse.ui.presentations.r21@default:default,org.eclipse.jdt.doc.user@default:default,org.apache.lucene.analysis@default:default,org.eclipse.ui@default:default,org.eclipse.jdt.core@default:default,org.eclipse.emf.codegen.ui@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.help.base@default:default,org.eclipse.emf.mapping.ecore2ecore@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.emf.mapping@default:default,org.eclipse.emf.codegen.ecore@default:default,org.eclipse.ant.ui@default:default,org.eclipse.equinox.p2.exemplarysetup@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.core.resources@default:default"/> -<stringAttribute key="selected_workspace_plugins" value="org.eclipse.emf.cdo.ui@default:default,org.eclipse.emf.cdo.edit@default:default,org.eclipse.emf.cdo.net4j@default:default,org.eclipse.emf.cdo.doc@default:default,org.eclipse.emf.cdo.examples.company@default:default,org.eclipse.emf.cdo.common@default:default,org.eclipse.emf.cdo.examples.company.edit@default:default,org.eclipse.emf.cdo.team@default:default,org.eclipse.net4j.util.ui@default:default,org.eclipse.net4j.ui@default:default,org.eclipse.net4j@default:default,org.eclipse.emf.cdo.examples@default:default,org.eclipse.emf.cdo@default:default,org.eclipse.net4j.util@default:default,org.eclipse.emf.cdo.ui.ide@default:default,org.eclipse.net4j.tcp@default:default"/> +<stringAttribute key="selected_target_plugins" value="org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.core.boot@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.help.ui@default:default,org.eclipse.emf.converter@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.text@default:default,org.eclipse.equinox.security.win32.x86@default:false,org.eclipse.emf.codegen.ui@default:default,org.eclipse.ui.editors@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.help.appserver@default:default,org.mortbay.jetty.server@default:default,org.eclipse.equinox.app@default:default,org.eclipse.team.core@default:default,org.eclipse.emf.mapping.ui@default:default,org.eclipse.emf.codegen.ecore@default:default,org.eclipse.equinox.common@2:true,org.eclipse.emf.codegen@default:default,org.apache.jasper@default:default,org.eclipse.ui.presentations.r21@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.core.runtime@default:true,org.apache.ant@default:default,org.eclipse.help@default:default,org.eclipse.equinox.p2.operations@default:default,org.eclipse.core.resources.win32.x86@default:false,org.eclipse.ui.browser@default:default,javax.servlet.jsp@default:default,org.eclipse.emf.mapping.ecore2ecore@default:default,org.eclipse.osgi.services@default:default,org.eclipse.emf.cheatsheets@default:default,org.eclipse.help.webapp@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.jsch.core@default:default,org.eclipse.emf.common.ui@default:default,org.eclipse.jface.text@default:default,org.eclipse.update.scheduler@default:default,org.eclipse.emf.exporter@default:default,org.eclipse.equinox.p2.repository.tools@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.emf.edit.ui@default:default,org.eclipse.ui.externaltools@default:default,org.eclipse.core.filesystem.win32.x86@default:false,org.eclipse.core.commands@default:default,org.eclipse.swt.win32.win32.x86_64@default:false,com.ibm.icu@default:default,org.apache.commons.logging@default:default,org.eclipse.ui.ide@default:default,org.eclipse.equinox.security.ui@default:default,org.eclipse.compare@default:default,org.eclipse.emf.edit@default:default,org.eclipse.core.net@default:default,org.eclipse.ui.win32@default:false,org.eclipse.team.ui@default:default,org.eclipse.emf.mapping.ecore2xml.ui@default:default,org.eclipse.search@default:default,org.eclipse.ui.forms@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.emf.importer.java@default:default,org.eclipse.jdt.core@default:default,org.eclipse.jface@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.emf.importer.rose@default:default,org.eclipse.emf.ecore.edit@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.emf.common@default:default,org.junit@default:default,org.eclipse.core.jobs@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.equinox.security@default:default,org.eclipse.swt.win32.win32.x86@default:false,org.eclipse.core.runtime.compatibility@default:default,org.eclipse.update.core@default:default,org.eclipse.ltk.core.refactoring@default:default,org.sat4j.pb@default:default,org.eclipse.debug.core@default:default,org.eclipse.ui.intro@default:default,org.mortbay.jetty.util@default:default,org.eclipse.core.externaltools@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.ecf.ssl@default:false,org.apache.commons.codec*1.3.0.v20100106-1700@default:default,org.eclipse.ui.intro.universal@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.emf.mapping@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.apache.commons.httpclient@default:default,org.eclipse.core.expressions@default:default,org.eclipse.ui.console@default:default,org.eclipse.equinox.http.registry@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.equinox.p2.metadata.generator@default:default,org.sat4j.core@default:default,org.eclipse.ui@default:default,javax.servlet@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.emf.ecore.editor@default:default,org.eclipse.equinox.launcher.win32.win32.x86_64@default:false,org.apache.lucene@default:default,org.eclipse.update.configurator@3:true,org.eclipse.equinox.p2.core@default:default,org.eclipse.debug.ui@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.core.databinding.beans@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.swt@default:default,org.eclipse.ecf@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.core.net.win32.x86@default:false,org.eclipse.core.variables@default:default,org.eclipse.emf.ant@default:default,org.eclipse.help.base@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.emf.codegen.ecore.ui@default:default,org.eclipse.core.filesystem.win32.x86_64@default:false,org.eclipse.emf.ecore@default:default,org.eclipse.emf.mapping.ecore2ecore.editor@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.eclipse.equinox.jsp.jasper.registry@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.emf.importer.ecore@default:default,org.eclipse.emf.mapping.ecore2xml@default:default,org.apache.commons.codec*1.3.0.v20080530-1600@default:default,org.eclipse.emf.ecore.change.edit@default:default,org.eclipse.platform@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.ui@default:default,org.eclipse.core.net.win32.x86_64@default:false,org.eclipse.jface.databinding@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.core.resources@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.osgi@-1:true,org.apache.commons.el@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.ui.views@default:default,org.eclipse.emf.importer@default:default,org.eclipse.update.core.win32@default:false,org.apache.lucene.analysis@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.ui.workbench.compatibility@default:false,org.eclipse.compare.core@default:default,org.eclipse.osgi.util@default:default,com.jcraft.jsch@default:default,org.hamcrest.core@default:default,org.eclipse.equinox.launcher.win32.win32.x86@default:false,org.eclipse.equinox.p2.exemplarysetup@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.equinox.launcher@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.update.ui@default:default,org.eclipse.equinox.jsp.jasper@default:default"/> +<stringAttribute key="selected_workspace_plugins" value="org.eclipse.emf.cdo@default:default,org.eclipse.net4j.tcp@default:default,org.eclipse.net4j.ui@default:default,org.eclipse.emf.cdo.ui.ide@default:default,org.eclipse.emf.cdo.edit@default:default,org.eclipse.emf.cdo.examples@default:default,org.eclipse.net4j.util@default:default,org.eclipse.emf.cdo.net4j@default:default,org.eclipse.net4j@default:default,org.eclipse.emf.cdo.team@default:default,org.eclipse.net4j.util.ui@default:default,org.eclipse.emf.cdo.ui@default:default,org.eclipse.emf.cdo.examples.company.edit@default:default,org.eclipse.emf.cdo.doc@default:default,org.eclipse.emf.cdo.common@default:default,org.eclipse.emf.cdo.examples.company@default:default"/> <booleanAttribute key="show_selected_only" value="false"/> <stringAttribute key="templateConfig" value="${target_home}\configuration\config.ini"/> <booleanAttribute key="tracing" value="true"/> @@ -41,23 +41,23 @@ <mapEntry key="org.eclipse.ui/trace/contexts" value="false"/> <mapEntry key="org.eclipse.debug.ui/debug/viewers/updateSequence" value="false"/> <mapEntry key="org.eclipse.osgi/trace/filename" value="runtime.traces"/> -<mapEntry key="org.eclipse.jdt.core/debug" value="true"/> <mapEntry key="org.eclipse.debug.ui/debug/contextlaunching" value="false"/> +<mapEntry key="org.eclipse.jdt.core/debug" value="true"/> <mapEntry key="org.eclipse.osgi/eclipseadaptor/debug" value="false"/> <mapEntry key="org.eclipse.net4j.tcp/debug" value="true"/> <mapEntry key="org.eclipse.team.cvs.core/dirtycaching" value="false"/> <mapEntry key="org.eclipse.emf.cdo.server/debug.repository" value="true"/> <mapEntry key="org.eclipse.jdt.core/debug/javamodel" value="false"/> <mapEntry key="org.eclipse.ui.intro/trace/printHTML" value="false"/> -<mapEntry key="org.eclipse.emf.cdo.common/debug.protocol" value="true"/> <mapEntry key="org.eclipse.ltk.core.refactoring/perf/participants/createChanges" value="300"/> +<mapEntry key="org.eclipse.emf.cdo.common/debug.protocol" value="true"/> <mapEntry key="org.eclipse.net4j.util/debug.lifecycle.dump" value="true"/> <mapEntry key="org.eclipse.ui/listeners/IWorkbenchWindow.IPerspectiveListener" value="false"/> <mapEntry key="org.eclipse.emf.cdo/debug.util" value="true"/> <mapEntry key="org.eclipse.osgi/resolver/debug" value="false"/> <mapEntry key="org.eclipse.team.core/refreshjob" value="false"/> -<mapEntry key="org.eclipse.ui/debug" value="false"/> <mapEntry key="org.eclipse.update.core/debug/installhandler" value="false"/> +<mapEntry key="org.eclipse.ui/debug" value="false"/> <mapEntry key="org.eclipse.help.ui/debug/infopop" value="false"/> <mapEntry key="org.eclipse.pde.core/classpath" value="false"/> <mapEntry key="org.eclipse.team.cvs.core/threading" value="false"/> @@ -67,8 +67,8 @@ <mapEntry key="org.eclipse.ui/trace/operations.verbose" value="false"/> <mapEntry key="org.eclipse.osgi/trace/activation" value="false"/> <mapEntry key="org.eclipse.debug.core/debug/commands" value="false"/> -<mapEntry key="org.eclipse.ui/perf/workbench.restore" value="30000"/> <mapEntry key="org.eclipse.team.core/threading" value="false"/> +<mapEntry key="org.eclipse.ui/perf/workbench.restore" value="30000"/> <mapEntry key="org.eclipse.update.core/debug/parsing" value="false"/> <mapEntry key="org.eclipse.jdt.core/debug/postaction" value="false"/> <mapEntry key="org.eclipse.ui/trace/graphics" value="false"/> @@ -81,14 +81,14 @@ <mapEntry key="org.eclipse.debug.ui/debug" value="false"/> <mapEntry key="org.eclipse.jdt.core/debug/buffermanager" value="false"/> <mapEntry key="org.eclipse.help.base/debug/search" value="false"/> -<mapEntry key="org.eclipse.jface.text/debug/ContentAssistSubjectAdapters" value="false"/> <mapEntry key="org.eclipse.pde.build/debug" value="false"/> +<mapEntry key="org.eclipse.jface.text/debug/ContentAssistSubjectAdapters" value="false"/> <mapEntry key="org.eclipse.jdt.ui/perf/search/participants" value="300"/> <mapEntry key="org.eclipse.ui/perf/perspective.create" value="800"/> <mapEntry key="org.eclipse.update.core/debug/type" value="false"/> <mapEntry key="org.eclipse.osgi/eclipseadaptor/debug/platformadmin" value="false"/> -<mapEntry key="org.eclipse.ui/listeners/IWorkbenchPage.IPropertyChangeListener" value="false"/> <mapEntry key="org.eclipse.osgi/resolver/generics" value="false"/> +<mapEntry key="org.eclipse.ui/listeners/IWorkbenchPage.IPropertyChangeListener" value="false"/> <mapEntry key="org.eclipse.osgi/resolver/requires" value="false"/> <mapEntry key="org.eclipse.core.resources/refresh" value="false"/> <mapEntry key="org.eclipse.jdt.core/perf/containerinitializer" value="5000"/> @@ -100,8 +100,8 @@ <mapEntry key="org.eclipse.ui/trace/handlers" value="false"/> <mapEntry key="org.eclipse.ui/trace/contexts.performance" value="false"/> <mapEntry key="org.eclipse.net4j.buddies/debug" value="true"/> -<mapEntry key="org.eclipse.team.cvs.core/metafiles" value="false"/> <mapEntry key="org.eclipse.jdt.core/perf/completion" value="300"/> +<mapEntry key="org.eclipse.team.cvs.core/metafiles" value="false"/> <mapEntry key="org.eclipse.osgi/profile/startup" value="false"/> <mapEntry key="org.eclipse.core.jobs/jobs" value="false"/> <mapEntry key="org.eclipse.core.resources/perf/save.participants" value="500"/> @@ -117,11 +117,11 @@ <mapEntry key="org.eclipse.net4j/debug.buffer" value="false"/> <mapEntry key="org.eclipse.core.resources/contenttype/cache" value="false"/> <mapEntry key="org.eclipse.emf.cdo/debug.repository" value="true"/> -<mapEntry key="org.eclipse.update.core/debug/configuration" value="false"/> <mapEntry key="org.eclipse.core.jobs/jobs/locks" value="false"/> +<mapEntry key="org.eclipse.update.core/debug/configuration" value="false"/> <mapEntry key="org.eclipse.emf.cdo.examples/debug" value="true"/> -<mapEntry key="org.eclipse.ui/trace/handlers.verbose.commandId" value=""/> <mapEntry key="org.eclipse.core.runtime/url/debug/connect" value="false"/> +<mapEntry key="org.eclipse.ui/trace/handlers.verbose.commandId" value=""/> <mapEntry key="org.eclipse.ui.ide/debug" value="false"/> <mapEntry key="org.eclipse.osgi/profile/debug" value="false"/> <mapEntry key="org.eclipse.pde.core/debug" value="true"/> @@ -130,17 +130,17 @@ <mapEntry key="org.eclipse.net4j.util/debug.registry" value="true"/> <mapEntry key="org.eclipse.jdt.ui/perf/explorer/createPartControl" value="1300"/> <mapEntry key="org.eclipse.jdt.core/debug/hierarchy" value="false"/> -<mapEntry key="org.eclipse.jdt.core/perf/variableinitializer" value="5000"/> -<mapEntry key="org.eclipse.emf.cdo/debug.object" value="false"/> <mapEntry key="org.eclipse.ui.ide/debug/internalerror/openDialog" value="false"/> +<mapEntry key="org.eclipse.emf.cdo/debug.object" value="false"/> +<mapEntry key="org.eclipse.jdt.core/perf/variableinitializer" value="5000"/> <mapEntry key="org.eclipse.emf.cdo.server/debug.revision" value="false"/> <mapEntry key="org.eclipse.core.resources/strings" value="false"/> <mapEntry key="org.eclipse.jdt.core/debug/sourcemapper" value="false"/> <mapEntry key="org.eclipse.core.resources/save/mastertable" value="false"/> <mapEntry key="org.eclipse.core.expressions/tracePropertyResolving" value="false"/> -<mapEntry key="org.eclipse.core.resources/preferences" value="false"/> -<mapEntry key="org.eclipse.jdt.core/debug/javadelta" value="false"/> <mapEntry key="org.eclipse.ui/perf/showHeapStatus" value="true"/> +<mapEntry key="org.eclipse.jdt.core/debug/javadelta" value="false"/> +<mapEntry key="org.eclipse.core.resources/preferences" value="false"/> <mapEntry key="org.eclipse.jdt.core/debug/selection" value="false"/> <mapEntry key="org.eclipse.jdt.ui/perf/content_assist_sorters/extensions" value=""/> <mapEntry key="org.eclipse.jdt.core/debug/javamodel/cache" value="false"/> @@ -152,45 +152,45 @@ <mapEntry key="org.eclipse.ui/perf/part.activate" value="200"/> <mapEntry key="org.eclipse.update.core/debug" value="true"/> <mapEntry key="org.eclipse.osgi/debug/security" value="false"/> -<mapEntry key="org.eclipse.core.resources/restore/metainfo" value="false"/> <mapEntry key="org.eclipse.core.resources/build/needbuild" value="false"/> +<mapEntry key="org.eclipse.core.resources/restore/metainfo" value="false"/> <mapEntry key="org.eclipse.core.resources/perf/builders" value="10000"/> -<mapEntry key="org.eclipse.ui/perf/perspective.listeners" value="200"/> -<mapEntry key="org.eclipse.net4j.db.hsqldb/debug" value="true"/> <mapEntry key="org.eclipse.net4j.jms.admin/debug.protocol" value="true"/> +<mapEntry key="org.eclipse.net4j.db.hsqldb/debug" value="true"/> +<mapEntry key="org.eclipse.ui/perf/perspective.listeners" value="200"/> <mapEntry key="org.eclipse.ui/debug/showAllJobs" value="false"/> -<mapEntry key="org.eclipse.core.resources/history" value="false"/> <mapEntry key="org.eclipse.emf.cdo.server/debug.store" value="true"/> +<mapEntry key="org.eclipse.core.resources/history" value="false"/> <mapEntry key="org.eclipse.ui/listeners/IWorkbenchPage.IPartListener" value="false"/> <mapEntry key="org.eclipse.jdt.core/debug/search" value="false"/> -<mapEntry key="org.eclipse.team.cvs.core/cvsprotocol" value="true"/> <mapEntry key="org.eclipse.pde.core/validation" value="false"/> +<mapEntry key="org.eclipse.team.cvs.core/cvsprotocol" value="true"/> <mapEntry key="org.eclipse.jface.text/debug/AnnotationPainter" value="false"/> <mapEntry key="org.eclipse.core.resources/restore/mastertable" value="false"/> <mapEntry key="org.eclipse.core.runtime/debug" value="false"/> <mapEntry key="org.eclipse.equinox.preferences/set" value="false"/> <mapEntry key="org.eclipse.core.resources/restore/snapshots" value="false"/> <mapEntry key="org.eclipse.ui/perf/perspective.switch" value="800"/> -<mapEntry key="org.eclipse.help.webapp/debug/workingsets" value="false"/> <mapEntry key="org.eclipse.emf.cdo/debug.protocol" value="true"/> +<mapEntry key="org.eclipse.help.webapp/debug/workingsets" value="false"/> <mapEntry key="org.eclipse.osgi/debug/bundleTime" value="false"/> <mapEntry key="org.eclipse.emf.cdo.common/perf.revision" value="true"/> <mapEntry key="org.eclipse.core.resources/restore/markers" value="false"/> <mapEntry key="org.eclipse.emf.cdo.common/debug.model" value="true"/> <mapEntry key="org.eclipse.ui/perf/workbench.start" value="45000"/> -<mapEntry key="org.eclipse.emf.cdo.common/perf.revision.reading" value="true"/> <mapEntry key="org.eclipse.core.runtime/url/debug/cachecopy" value="false"/> +<mapEntry key="org.eclipse.emf.cdo.common/perf.revision.reading" value="true"/> <mapEntry key="org.eclipse.core.runtime/perf/success" value="false"/> <mapEntry key="org.eclipse.net4j/debug.connector" value="true"/> <mapEntry key="org.eclipse.jdt.core/perf/selection" value="300"/> <mapEntry key="org.eclipse.osgi/debug/startlevel" value="false"/> <mapEntry key="org.eclipse.core.resources/restore" value="false"/> <mapEntry key="org.eclipse.osgi/resolver/wiring" value="false"/> -<mapEntry key="org.eclipse.core.resources/perf/snapshot" value="1000"/> <mapEntry key="org.eclipse.net4j.buddies.server/debug" value="true"/> +<mapEntry key="org.eclipse.core.resources/perf/snapshot" value="1000"/> <mapEntry key="org.eclipse.ui.intro/trace/logPerformance" value="false"/> -<mapEntry key="org.eclipse.ui/trace/contexts.verbose" value="false"/> <mapEntry key="org.eclipse.osgi/debug/loader" value="false"/> +<mapEntry key="org.eclipse.ui/trace/contexts.verbose" value="false"/> <mapEntry key="org.eclipse.osgi/resolver/grouping" value="false"/> <mapEntry key="org.eclipse.jdt.ui/perf/explorer/makeActions" value="1000"/> <mapEntry key="org.eclipse.net4j/debug.acceptor" value="true"/> @@ -217,8 +217,8 @@ <mapEntry key="org.eclipse.ui.intro.universal/trace/logPerformance" value="false"/> <mapEntry key="org.eclipse.help/debug/context" value="false"/> <mapEntry key="org.eclipse.osgi/debug/manifest" value="false"/> -<mapEntry key="org.eclipse.ui/trace/multipageeditor" value="false"/> <mapEntry key="org.eclipse.emf.cdo/debug" value="true"/> +<mapEntry key="org.eclipse.ui/trace/multipageeditor" value="false"/> <mapEntry key="org.eclipse.emf.cdo.ui/debug" value="true"/> <mapEntry key="org.eclipse.net4j.examples/debug" value="true"/> <mapEntry key="org.eclipse.core.resources/build/needbuildstack" value="false"/> @@ -231,12 +231,12 @@ <mapEntry key="org.eclipse.emf.cdo.common/debug.revision" value="true"/> <mapEntry key="org.eclipse.osgi/trace/classLoading" value="false"/> <mapEntry key="org.eclipse.net4j.jms.server.jdbc/debug" value="true"/> -<mapEntry key="org.eclipse.core.jobs/jobs/errorondeadlock" value="false"/> <mapEntry key="org.eclipse.core.resources/save" value="false"/> +<mapEntry key="org.eclipse.core.jobs/jobs/errorondeadlock" value="false"/> <mapEntry key="org.eclipse.core.resources/contenttype" value="false"/> <mapEntry key="org.eclipse.jface.text/debug/FastPartitioner/PositionCache" value="false"/> -<mapEntry key="org.eclipse.jdt.core/debug/compiler" value="false"/> <mapEntry key="org.eclipse.emf.cdo.server/debug" value="true"/> +<mapEntry key="org.eclipse.jdt.core/debug/compiler" value="false"/> <mapEntry key="org.eclipse.osgi/debug/events" value="false"/> <mapEntry key="org.eclipse.ui/trace/commands" value="false"/> <mapEntry key="org.eclipse.equinox.preferences/get" value="false"/> @@ -253,25 +253,25 @@ <mapEntry key="org.eclipse.net4j.jms/debug" value="true"/> <mapEntry key="org.eclipse.osgi/eclipseadaptor/converter/debug" value="false"/> <mapEntry key="org.eclipse.emf.cdo.server/debug.resource" value="true"/> -<mapEntry key="org.eclipse.net4j.debug/debug" value="true"/> <mapEntry key="org.eclipse.net4j.db.derby/debug.sql" value="true"/> +<mapEntry key="org.eclipse.net4j.debug/debug" value="true"/> <mapEntry key="org.eclipse.pde.core/cache" value="false"/> <mapEntry key="org.eclipse.emf.cdo/debug.transaction" value="true"/> <mapEntry key="org.eclipse.emf.cdo.server.db/debug" value="true"/> -<mapEntry key="org.eclipse.debug.core/debug/events" value="false"/> <mapEntry key="org.eclipse.net4j/debug.selector" value="true"/> +<mapEntry key="org.eclipse.debug.core/debug/events" value="false"/> <mapEntry key="org.eclipse.emf.cdo.common/perf" value="true"/> <mapEntry key="org.eclipse.jdt.ui/debug" value="true"/> -<mapEntry key="org.eclipse.net4j.db/debug.sql" value="true"/> <mapEntry key="org.eclipse.osgi/monitor/classes" value="false"/> +<mapEntry key="org.eclipse.net4j.db/debug.sql" value="true"/> <mapEntry key="org.eclipse.ui/perf/part.input" value="200"/> <mapEntry key="org.eclipse.ui.intro.universal/debug" value="true"/> <mapEntry key="org.eclipse.jdt.ui/debug/TypeConstraints" value="false"/> <mapEntry key="org.eclipse.osgi/debug/messageBundles" value="false"/> <mapEntry key="org.eclipse.core.resources/build/invoking" value="false"/> <mapEntry key="org.eclipse.jdt.core/debug/javadelta/verbose" value="false"/> -<mapEntry key="org.eclipse.net4j.fileshare.ui/debug" value="true"/> <mapEntry key="org.eclipse.net4j.util/debug.concurrency" value="true"/> +<mapEntry key="org.eclipse.net4j.fileshare.ui/debug" value="true"/> <mapEntry key="org.eclipse.core.resources/save/tree" value="false"/> <mapEntry key="org.eclipse.ui/debug/contributions" value="false"/> <mapEntry key="org.eclipse.update.core/debug/warning" value="false"/> @@ -279,20 +279,20 @@ <mapEntry key="org.eclipse.jdt.core.manipulation/debug" value="true"/> <mapEntry key="org.eclipse.emf.cdo.common/perf.revision.writing" value="true"/> <mapEntry key="org.eclipse.net4j.jms.admin/debug" value="true"/> -<mapEntry key="org.eclipse.net4j.db.derby/debug" value="true"/> <mapEntry key="org.eclipse.emf.cdo/debug.model" value="true"/> +<mapEntry key="org.eclipse.net4j.db.derby/debug" value="true"/> <mapEntry key="org.eclipse.jdt.core/debug/cpresolution" value="false"/> -<mapEntry key="org.eclipse.help/debug/search" value="false"/> <mapEntry key="org.eclipse.help.ui/debug/embeddedBrowser" value="false"/> +<mapEntry key="org.eclipse.help/debug/search" value="false"/> <mapEntry key="org.eclipse.team.cvs.ssh/ssh_protocol" value="false"/> -<mapEntry key="org.eclipse.core.resources/build/stacktrace" value="false"/> <mapEntry key="org.eclipse.ui/perf/part.create" value="800"/> +<mapEntry key="org.eclipse.core.resources/build/stacktrace" value="false"/> <mapEntry key="org.eclipse.ui.intro/trace/logInfo" value="true"/> <mapEntry key="org.eclipse.team.core/streams" value="false"/> <mapEntry key="org.eclipse.emf.cdo.common/debug" value="true"/> <mapEntry key="org.eclipse.ui.ide/debug/undomonitor" value="false"/> -<mapEntry key="org.eclipse.jdt.ui/perf/explorer/RefactorActionGroup" value="150"/> <mapEntry key="org.eclipse.net4j.ui/debug" value="true"/> +<mapEntry key="org.eclipse.jdt.ui/perf/explorer/RefactorActionGroup" value="150"/> <mapEntry key="org.eclipse.ui/experimental/menus" value="false"/> <mapEntry key="org.eclipse.core.jobs/jobs/shutdown" value="false"/> <mapEntry key="org.eclipse.osgi/debug/packageadmin" value="false"/> @@ -309,15 +309,15 @@ <mapEntry key="org.eclipse.ui.workbench/debug" value="false"/> <mapEntry key="org.eclipse.jdt.ui/perf/content_assist/extensions" value="1000"/> <mapEntry key="org.eclipse.osgi/debug/filter" value="false"/> -<mapEntry key="org.eclipse.debug.core/debug" value="false"/> <mapEntry key="org.eclipse.net4j.buddies.common/debug" value="true"/> +<mapEntry key="org.eclipse.debug.core/debug" value="false"/> <mapEntry key="org.eclipse.core.resources/debug" value="false"/> <mapEntry key="org.eclipse.jdt.core/debug/zipaccess" value="false"/> -<mapEntry key="org.eclipse.ui.browser/debug" value="false"/> <mapEntry key="org.eclipse.emf.cdo.server/debug.protocol" value="true"/> +<mapEntry key="org.eclipse.ui.browser/debug" value="false"/> <mapEntry key="org.eclipse.osgi/profile/impl" value="org.eclipse.osgi.internal.profile.DefaultProfileLogger"/> -<mapEntry key="org.eclipse.net4j.jms.server/debug.protocol" value="true"/> <mapEntry key="org.eclipse.update.core/debug/web" value="false"/> +<mapEntry key="org.eclipse.net4j.jms.server/debug.protocol" value="true"/> <mapEntry key="org.eclipse.team.cvs.core/debug" value="false"/> <mapEntry key="org.eclipse.help/debug" value="true"/> <mapEntry key="org.eclipse.core.runtime/perf" value="false"/> @@ -329,10 +329,10 @@ <mapEntry key="org.eclipse.ui/perf/part.listeners" value="200"/> <mapEntry key="org.eclipse.debug.ui/debug/viewers/viewer" value="false"/> <mapEntry key="org.eclipse.ui/trace/keyBindings.verbose" value="false"/> -<mapEntry key="org.eclipse.osgi/defaultprofile/buffersize" value="256"/> <mapEntry key="org.eclipse.core.resources/restore/syncinfo" value="false"/> -<mapEntry key="org.eclipse.team.cvs.core/syncchangeevents" value="false"/> +<mapEntry key="org.eclipse.osgi/defaultprofile/buffersize" value="256"/> <mapEntry key="org.eclipse.ui/perf/page.listeners" value="200"/> +<mapEntry key="org.eclipse.team.cvs.core/syncchangeevents" value="false"/> <mapEntry key="org.eclipse.emf.cdo/debug.resource" value="true"/> <mapEntry key="org.eclipse.ui/trace/handlers.verbose" value="false"/> <mapEntry key="org.eclipse.osgi/monitor/resources" value="false"/> @@ -349,8 +349,8 @@ <mapEntry key="org.eclipse.ui/listeners/IWorkbenchWindow.IPartListener" value="false"/> <mapEntry key="org.eclipse.jdt.core/debug/resolution" value="false"/> <mapEntry key="org.eclipse.update.configurator/debug" value="false"/> -<mapEntry key="org.eclipse.help.ui/debug" value="true"/> <mapEntry key="org.eclipse.debug.ui/debug/viewers/deltas" value="false"/> +<mapEntry key="org.eclipse.help.ui/debug" value="true"/> <mapEntry key="org.eclipse.osgi/eclipseadaptor/debug/location" value="false"/> <mapEntry key="org.eclipse.ui.intro.universal/trace/logInfo" value="true"/> </mapAttribute> diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/perspectives/CDOExplorerPerspective.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/perspectives/CDOExplorerPerspective.java index c4df5107b4..9f953621eb 100644 --- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/perspectives/CDOExplorerPerspective.java +++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/perspectives/CDOExplorerPerspective.java @@ -7,7 +7,7 @@ * * Contributors: * Victor Roldan Betancort - initial API and implementation - * Eike Stepper - maintenance + * Eike Stepper - maintenance */ package org.eclipse.emf.cdo.internal.ui.perspectives; @@ -18,6 +18,7 @@ import org.eclipse.emf.cdo.internal.ui.views.CDOWatchListView; import org.eclipse.ui.IFolderLayout; import org.eclipse.ui.IPageLayout; import org.eclipse.ui.IPerspectiveFactory; +import org.eclipse.ui.PlatformUI; /** * @author Victor Roldan Betancort @@ -80,4 +81,11 @@ public class CDOExplorerPerspective implements IPerspectiveFactory { pageLayout.addPerspectiveShortcut(ID); } + + static public boolean isCurrent() + { + return PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getPerspective().getId().equals( + CDOExplorerPerspective.ID); + } + } diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOViewTargetChangedEvent.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOViewTargetChangedEvent.java index 2393a86f57..8f2cd8acd6 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOViewTargetChangedEvent.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOViewTargetChangedEvent.java @@ -7,7 +7,7 @@ * * Contributors: * Victor Roldan Betancort - initial API and implementation - * Eike Stepper - maintenance + * Eike Stepper - maintenance */ package org.eclipse.emf.cdo.view; |
