Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn')
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/DawnRuntimePlugin.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/actions/HandleConflictsAction.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/actions/LockObjectsAction.java88
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/actions/UnLockObjectsAction.java88
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/appearance/DawnElementStylizer.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/appearance/IDawnElementStylizerFactory.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/commands/CreateSemanticResourceRecordingCommand.java98
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/conflicts/ResourceSynchronizer.java176
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/editors/IDawnEditor.java46
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/editors/IDawnEditorSupport.java42
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/editors/impl/DawnAbstractEditorSupport.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/helper/DawnEditorHelper.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/notifications/BasicDawnListener.java182
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/notifications/BasicDawnLockingHandler.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/notifications/BasicDawnTransactionHandler.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/notifications/IDawnListener.java98
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/notifications/IDawnTransactionHandler.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/preferences/DawnRemotePreferencePage.java116
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/preferences/PreferenceConstants.java110
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/preferences/PreferenceInitializer.java80
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/resources/DawnResourceFactory.java42
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/resources/DawnWrapperResource.java46
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/resources/impl/DawnResourceFactoryImpl.java60
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/resources/impl/DawnWrapperResourceImpl.java348
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/spi/DawnState.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/spi/IDawnEditingSupport.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/spi/IDawnUIElement.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/transaction/DawnTransactionChangeRecorder.java96
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/transaction/DawnTransactionalEditingDomainImpl.java100
29 files changed, 920 insertions, 920 deletions
diff --git a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/DawnRuntimePlugin.java b/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/DawnRuntimePlugin.java
index ad6e99267e..481f7e52f2 100644
--- a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/DawnRuntimePlugin.java
+++ b/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/DawnRuntimePlugin.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.
+ * Copyright (c) 2004 - 2012 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
diff --git a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/actions/HandleConflictsAction.java b/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/actions/HandleConflictsAction.java
index 2eb56259f4..5518b0a3d4 100644
--- a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/actions/HandleConflictsAction.java
+++ b/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/actions/HandleConflictsAction.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.
+ * Copyright (c) 2004 - 2012 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
diff --git a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/actions/LockObjectsAction.java b/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/actions/LockObjectsAction.java
index 3973d2c4e5..d48d51d25f 100644
--- a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/actions/LockObjectsAction.java
+++ b/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/actions/LockObjectsAction.java
@@ -1,44 +1,44 @@
-/*
- * Copyright (c) 2004 - 2011 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:
- * Martin Fluegge - initial API and implementation
- */
-package org.eclipse.emf.cdo.dawn.actions;
-
-import org.eclipse.emf.cdo.dawn.helper.DawnEditorHelper;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.ui.IObjectActionDelegate;
-import org.eclipse.ui.IWorkbenchPart;
-
-/**
- * @author Martin Fluegge
- */
-public class LockObjectsAction implements IObjectActionDelegate
-{
- public final static String ID = "org.eclipse.emf.cdo.dawn.LockObjectsAction";
-
- public LockObjectsAction()
- {
- }
-
- public void run(IAction action)
- {
- MessageDialog.openInformation(DawnEditorHelper.getActiveShell(), "", "Locking not yet supported.");
- }
-
- public void selectionChanged(IAction action, ISelection selection)
- {
- }
-
- public void setActivePart(IAction action, IWorkbenchPart targetPart)
- {
- }
-}
+/*
+ * Copyright (c) 2004 - 2012 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:
+ * Martin Fluegge - initial API and implementation
+ */
+package org.eclipse.emf.cdo.dawn.actions;
+
+import org.eclipse.emf.cdo.dawn.helper.DawnEditorHelper;
+
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.ui.IObjectActionDelegate;
+import org.eclipse.ui.IWorkbenchPart;
+
+/**
+ * @author Martin Fluegge
+ */
+public class LockObjectsAction implements IObjectActionDelegate
+{
+ public final static String ID = "org.eclipse.emf.cdo.dawn.LockObjectsAction";
+
+ public LockObjectsAction()
+ {
+ }
+
+ public void run(IAction action)
+ {
+ MessageDialog.openInformation(DawnEditorHelper.getActiveShell(), "", "Locking not yet supported.");
+ }
+
+ public void selectionChanged(IAction action, ISelection selection)
+ {
+ }
+
+ public void setActivePart(IAction action, IWorkbenchPart targetPart)
+ {
+ }
+}
diff --git a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/actions/UnLockObjectsAction.java b/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/actions/UnLockObjectsAction.java
index 0591e1997c..6df111b6a3 100644
--- a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/actions/UnLockObjectsAction.java
+++ b/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/actions/UnLockObjectsAction.java
@@ -1,44 +1,44 @@
-/*
- * Copyright (c) 2004 - 2011 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:
- * Martin Fluegge - initial API and implementation
- */
-package org.eclipse.emf.cdo.dawn.actions;
-
-import org.eclipse.emf.cdo.dawn.helper.DawnEditorHelper;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.ui.IObjectActionDelegate;
-import org.eclipse.ui.IWorkbenchPart;
-
-/**
- * @author Martin Fluegge
- */
-public class UnLockObjectsAction implements IObjectActionDelegate
-{
- public final static String ID = "org.eclipse.emf.cdo.dawn.UnlockObjectsAction";
-
- public UnLockObjectsAction()
- {
- }
-
- public void run(IAction action)
- {
- MessageDialog.openInformation(DawnEditorHelper.getActiveShell(), "", "Locking not yet supported");
- }
-
- public void selectionChanged(IAction action, ISelection selection)
- {
- }
-
- public void setActivePart(IAction action, IWorkbenchPart targetPart)
- {
- }
-}
+/*
+ * Copyright (c) 2004 - 2012 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:
+ * Martin Fluegge - initial API and implementation
+ */
+package org.eclipse.emf.cdo.dawn.actions;
+
+import org.eclipse.emf.cdo.dawn.helper.DawnEditorHelper;
+
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.ui.IObjectActionDelegate;
+import org.eclipse.ui.IWorkbenchPart;
+
+/**
+ * @author Martin Fluegge
+ */
+public class UnLockObjectsAction implements IObjectActionDelegate
+{
+ public final static String ID = "org.eclipse.emf.cdo.dawn.UnlockObjectsAction";
+
+ public UnLockObjectsAction()
+ {
+ }
+
+ public void run(IAction action)
+ {
+ MessageDialog.openInformation(DawnEditorHelper.getActiveShell(), "", "Locking not yet supported");
+ }
+
+ public void selectionChanged(IAction action, ISelection selection)
+ {
+ }
+
+ public void setActivePart(IAction action, IWorkbenchPart targetPart)
+ {
+ }
+}
diff --git a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/appearance/DawnElementStylizer.java b/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/appearance/DawnElementStylizer.java
index ad4026a7bb..9ed9cc518a 100644
--- a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/appearance/DawnElementStylizer.java
+++ b/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/appearance/DawnElementStylizer.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.
+ * Copyright (c) 2004 - 2012 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
diff --git a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/appearance/IDawnElementStylizerFactory.java b/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/appearance/IDawnElementStylizerFactory.java
index 13559164e9..36ff3af48a 100644
--- a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/appearance/IDawnElementStylizerFactory.java
+++ b/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/appearance/IDawnElementStylizerFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.
+ * Copyright (c) 2004 - 2012 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
diff --git a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/commands/CreateSemanticResourceRecordingCommand.java b/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/commands/CreateSemanticResourceRecordingCommand.java
index 4ac897103c..7873751915 100644
--- a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/commands/CreateSemanticResourceRecordingCommand.java
+++ b/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/commands/CreateSemanticResourceRecordingCommand.java
@@ -1,49 +1,49 @@
-/*
- * Copyright (c) 2004 - 2011 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:
- * Martin Fluegge - initial API and implementation
- */
-package org.eclipse.emf.cdo.dawn.commands;
-
-import org.eclipse.emf.cdo.transaction.CDOTransaction;
-
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-
-/**
- * @author Martin Fluegge
- */
-public class CreateSemanticResourceRecordingCommand extends RecordingCommand
-{
-
- private final CDOTransaction cdoTransaction;
-
- private Resource resource;
-
- private final String resourcePath;
-
- public CreateSemanticResourceRecordingCommand(TransactionalEditingDomain editingDomain,
- CDOTransaction cdoTransaction, String resourcePath)
- {
- super(editingDomain);
- this.cdoTransaction = cdoTransaction;
- this.resourcePath = resourcePath;
- }
-
- @Override
- protected void doExecute()
- {
- resource = cdoTransaction.getOrCreateResource(resourcePath.replace("cdo:", ""));
- }
-
- public Resource getResource()
- {
- return resource;
- }
-}
+/*
+ * Copyright (c) 2004 - 2012 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:
+ * Martin Fluegge - initial API and implementation
+ */
+package org.eclipse.emf.cdo.dawn.commands;
+
+import org.eclipse.emf.cdo.transaction.CDOTransaction;
+
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.transaction.RecordingCommand;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+
+/**
+ * @author Martin Fluegge
+ */
+public class CreateSemanticResourceRecordingCommand extends RecordingCommand
+{
+
+ private final CDOTransaction cdoTransaction;
+
+ private Resource resource;
+
+ private final String resourcePath;
+
+ public CreateSemanticResourceRecordingCommand(TransactionalEditingDomain editingDomain,
+ CDOTransaction cdoTransaction, String resourcePath)
+ {
+ super(editingDomain);
+ this.cdoTransaction = cdoTransaction;
+ this.resourcePath = resourcePath;
+ }
+
+ @Override
+ protected void doExecute()
+ {
+ resource = cdoTransaction.getOrCreateResource(resourcePath.replace("cdo:", ""));
+ }
+
+ public Resource getResource()
+ {
+ return resource;
+ }
+}
diff --git a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/conflicts/ResourceSynchronizer.java b/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/conflicts/ResourceSynchronizer.java
index a6a0a82928..f69506b40a 100644
--- a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/conflicts/ResourceSynchronizer.java
+++ b/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/conflicts/ResourceSynchronizer.java
@@ -1,88 +1,88 @@
-/*
- * Copyright (c) 2004 - 2011 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:
- * Martin Fluegge - initial API and implementation
- */
-package org.eclipse.emf.cdo.dawn.conflicts;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-
-import java.util.Map;
-import java.util.Observer;
-import java.util.Set;
-
-/**
- * Since Dawn 2.0 this interface is deprecated and will be removed soon. Because it was never really used, there will be
- * no surragote.
- *
- * @author Martin Fluegge
- */
-@Deprecated
-public interface ResourceSynchronizer
-{
- public static final int NO_CONFLICT = -1;
-
- public static final int REMOTELY_DELTETION_CONFLICT = 0;
-
- public static final int LOCALLY_DELTETION_CONFLICT = 1;
-
- public static final int REMOTELY_AND_LOCALLY_CHANGED_CONFLICT = 2;
-
- void loadLastResource();
-
- void saveLastResource(Resource localResource);
-
- void setGloballyLocked(Set<String> lockedObjects);
-
- Set<String> getGloballyLocked();
-
- void setRemoteLocks(Map<String, Integer> lockedObjects);
-
- void setIgnored(EObject obj);
-
- void setIgnored(String id);
-
- void setLastResource(Resource lastResource);
-
- Resource getLastResource();
-
- void unIgnored(String id);
-
- int getConflictType(String key);
-
- void resolveDeletedLocallyConflict(String xmiId);
-
- void resolveChangedLocalyAndRemotellyConflict(String xmiId);
-
- void resolveDeletedRemotellyConflict(String xmiId);
-
- // void updateViewWithRemoteView(View obj);
- //
- // void lastResourceDeleteView(View newView);
- //
- // void lastResourceChangeView(View newView);
-
- boolean isConflicted();
-
- void cleanIgnoreList();
-
- void setSelectedElements(Set<EObject> selectedElements);
-
- Set<EObject> getSelectedElements();
-
- void setIgnoreList(Set<String> ignoreList);
-
- Set<String> getIgnoreList();
-
- void setLocallyLocked(Set<String> locallyLocked);
-
- Set<String> getLocallyLocked();
-
- void addObserver(Observer observer);
-}
+/*
+ * Copyright (c) 2004 - 2012 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:
+ * Martin Fluegge - initial API and implementation
+ */
+package org.eclipse.emf.cdo.dawn.conflicts;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.Resource;
+
+import java.util.Map;
+import java.util.Observer;
+import java.util.Set;
+
+/**
+ * Since Dawn 2.0 this interface is deprecated and will be removed soon. Because it was never really used, there will be
+ * no surragote.
+ *
+ * @author Martin Fluegge
+ */
+@Deprecated
+public interface ResourceSynchronizer
+{
+ public static final int NO_CONFLICT = -1;
+
+ public static final int REMOTELY_DELTETION_CONFLICT = 0;
+
+ public static final int LOCALLY_DELTETION_CONFLICT = 1;
+
+ public static final int REMOTELY_AND_LOCALLY_CHANGED_CONFLICT = 2;
+
+ void loadLastResource();
+
+ void saveLastResource(Resource localResource);
+
+ void setGloballyLocked(Set<String> lockedObjects);
+
+ Set<String> getGloballyLocked();
+
+ void setRemoteLocks(Map<String, Integer> lockedObjects);
+
+ void setIgnored(EObject obj);
+
+ void setIgnored(String id);
+
+ void setLastResource(Resource lastResource);
+
+ Resource getLastResource();
+
+ void unIgnored(String id);
+
+ int getConflictType(String key);
+
+ void resolveDeletedLocallyConflict(String xmiId);
+
+ void resolveChangedLocalyAndRemotellyConflict(String xmiId);
+
+ void resolveDeletedRemotellyConflict(String xmiId);
+
+ // void updateViewWithRemoteView(View obj);
+ //
+ // void lastResourceDeleteView(View newView);
+ //
+ // void lastResourceChangeView(View newView);
+
+ boolean isConflicted();
+
+ void cleanIgnoreList();
+
+ void setSelectedElements(Set<EObject> selectedElements);
+
+ Set<EObject> getSelectedElements();
+
+ void setIgnoreList(Set<String> ignoreList);
+
+ Set<String> getIgnoreList();
+
+ void setLocallyLocked(Set<String> locallyLocked);
+
+ Set<String> getLocallyLocked();
+
+ void addObserver(Observer observer);
+}
diff --git a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/editors/IDawnEditor.java b/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/editors/IDawnEditor.java
index 79f230e322..cb4925c153 100644
--- a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/editors/IDawnEditor.java
+++ b/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/editors/IDawnEditor.java
@@ -1,23 +1,23 @@
-/*
- * Copyright (c) 2004 - 2011 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:
- * Martin Fluegge - initial API and implementation
- */
-package org.eclipse.emf.cdo.dawn.editors;
-
-import org.eclipse.emf.cdo.dawn.spi.IDawnUIElement;
-
-import org.eclipse.ui.IEditorPart;
-
-/**
- * @author Martin Fluegge
- */
-public interface IDawnEditor extends IDawnUIElement, IEditorPart
-{
- public String getContributorID();
-}
+/*
+ * Copyright (c) 2004 - 2012 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:
+ * Martin Fluegge - initial API and implementation
+ */
+package org.eclipse.emf.cdo.dawn.editors;
+
+import org.eclipse.emf.cdo.dawn.spi.IDawnUIElement;
+
+import org.eclipse.ui.IEditorPart;
+
+/**
+ * @author Martin Fluegge
+ */
+public interface IDawnEditor extends IDawnUIElement, IEditorPart
+{
+ public String getContributorID();
+}
diff --git a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/editors/IDawnEditorSupport.java b/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/editors/IDawnEditorSupport.java
index 1cecf69c95..092ca9863d 100644
--- a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/editors/IDawnEditorSupport.java
+++ b/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/editors/IDawnEditorSupport.java
@@ -1,21 +1,21 @@
-/*
- * Copyright (c) 2004 - 2011 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:
- * Martin Fluegge - initial API and implementation
- */
-package org.eclipse.emf.cdo.dawn.editors;
-
-import org.eclipse.emf.cdo.dawn.spi.IDawnEditingSupport;
-
-/**
- * @author Martin Fluegge
- */
-public interface IDawnEditorSupport extends IDawnEditingSupport
-{
-
-}
+/*
+ * Copyright (c) 2004 - 2012 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:
+ * Martin Fluegge - initial API and implementation
+ */
+package org.eclipse.emf.cdo.dawn.editors;
+
+import org.eclipse.emf.cdo.dawn.spi.IDawnEditingSupport;
+
+/**
+ * @author Martin Fluegge
+ */
+public interface IDawnEditorSupport extends IDawnEditingSupport
+{
+
+}
diff --git a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/editors/impl/DawnAbstractEditorSupport.java b/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/editors/impl/DawnAbstractEditorSupport.java
index 954aad8c6f..251ecd1d50 100644
--- a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/editors/impl/DawnAbstractEditorSupport.java
+++ b/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/editors/impl/DawnAbstractEditorSupport.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.
+ * Copyright (c) 2004 - 2012 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
diff --git a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/helper/DawnEditorHelper.java b/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/helper/DawnEditorHelper.java
index 83369936a0..bfb9a4d7c3 100644
--- a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/helper/DawnEditorHelper.java
+++ b/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/helper/DawnEditorHelper.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.
+ * Copyright (c) 2004 - 2012 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
diff --git a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/notifications/BasicDawnListener.java b/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/notifications/BasicDawnListener.java
index 5d4b2c6ab2..d7e96d967f 100644
--- a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/notifications/BasicDawnListener.java
+++ b/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/notifications/BasicDawnListener.java
@@ -1,91 +1,91 @@
-/*
- * Copyright (c) 2004 - 2011 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:
- * Martin Fluegge - initial API and implementation
- */
-package org.eclipse.emf.cdo.dawn.notifications;
-
-import org.eclipse.emf.cdo.dawn.editors.IDawnEditor;
-import org.eclipse.emf.cdo.transaction.CDOTransactionConflictEvent;
-import org.eclipse.emf.cdo.view.CDOViewInvalidationEvent;
-import org.eclipse.emf.cdo.view.CDOViewLocksChangedEvent;
-
-import org.eclipse.net4j.util.event.IEvent;
-
-/**
- * @author Martin Fluegge
- */
-public abstract class BasicDawnListener implements IDawnListener// implements IListener
-{
- protected IDawnEditor editor;
-
- /**
- * @since 1.0
- */
- public void setEditor(IDawnEditor editor)
- {
- this.editor = editor;
- }
-
- /**
- * @since 1.0
- */
- public BasicDawnListener()
- {
- }
-
- /**
- * @since 1.0
- */
- public BasicDawnListener(IDawnEditor editor)
- {
- this.editor = editor;
- }
-
- public void notifyEvent(IEvent event)
- {
- if (event instanceof CDOViewInvalidationEvent)
- {
- handleViewInvalidationEvent((CDOViewInvalidationEvent)event);
- }
- else if (event instanceof CDOTransactionConflictEvent)
- {
- handleTransactionConflictEvent((CDOTransactionConflictEvent)event);
- }
- else if (event instanceof CDOViewLocksChangedEvent)
- {
- handleLocksChangedEvent((CDOViewLocksChangedEvent)event);
- }
- else
- {
- handleEvent(event);
- }
- }
-
- public void handleViewInvalidationEvent(CDOViewInvalidationEvent event)
- {
- }
-
- public void handleTransactionConflictEvent(CDOTransactionConflictEvent event)
- {
- }
-
- /**
- * @since 2.0
- */
- public void handleLocksChangedEvent(CDOViewLocksChangedEvent event)
- {
- }
-
- /**
- * @since 2.0
- */
- public void handleEvent(IEvent event)
- {
- }
-}
+/*
+ * Copyright (c) 2004 - 2012 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:
+ * Martin Fluegge - initial API and implementation
+ */
+package org.eclipse.emf.cdo.dawn.notifications;
+
+import org.eclipse.emf.cdo.dawn.editors.IDawnEditor;
+import org.eclipse.emf.cdo.transaction.CDOTransactionConflictEvent;
+import org.eclipse.emf.cdo.view.CDOViewInvalidationEvent;
+import org.eclipse.emf.cdo.view.CDOViewLocksChangedEvent;
+
+import org.eclipse.net4j.util.event.IEvent;
+
+/**
+ * @author Martin Fluegge
+ */
+public abstract class BasicDawnListener implements IDawnListener// implements IListener
+{
+ protected IDawnEditor editor;
+
+ /**
+ * @since 1.0
+ */
+ public void setEditor(IDawnEditor editor)
+ {
+ this.editor = editor;
+ }
+
+ /**
+ * @since 1.0
+ */
+ public BasicDawnListener()
+ {
+ }
+
+ /**
+ * @since 1.0
+ */
+ public BasicDawnListener(IDawnEditor editor)
+ {
+ this.editor = editor;
+ }
+
+ public void notifyEvent(IEvent event)
+ {
+ if (event instanceof CDOViewInvalidationEvent)
+ {
+ handleViewInvalidationEvent((CDOViewInvalidationEvent)event);
+ }
+ else if (event instanceof CDOTransactionConflictEvent)
+ {
+ handleTransactionConflictEvent((CDOTransactionConflictEvent)event);
+ }
+ else if (event instanceof CDOViewLocksChangedEvent)
+ {
+ handleLocksChangedEvent((CDOViewLocksChangedEvent)event);
+ }
+ else
+ {
+ handleEvent(event);
+ }
+ }
+
+ public void handleViewInvalidationEvent(CDOViewInvalidationEvent event)
+ {
+ }
+
+ public void handleTransactionConflictEvent(CDOTransactionConflictEvent event)
+ {
+ }
+
+ /**
+ * @since 2.0
+ */
+ public void handleLocksChangedEvent(CDOViewLocksChangedEvent event)
+ {
+ }
+
+ /**
+ * @since 2.0
+ */
+ public void handleEvent(IEvent event)
+ {
+ }
+}
diff --git a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/notifications/BasicDawnLockingHandler.java b/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/notifications/BasicDawnLockingHandler.java
index a0c02b6e06..cfd8867d57 100644
--- a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/notifications/BasicDawnLockingHandler.java
+++ b/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/notifications/BasicDawnLockingHandler.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.
+ * Copyright (c) 2004 - 2012 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
diff --git a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/notifications/BasicDawnTransactionHandler.java b/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/notifications/BasicDawnTransactionHandler.java
index 042398772a..4a342dc4c7 100644
--- a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/notifications/BasicDawnTransactionHandler.java
+++ b/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/notifications/BasicDawnTransactionHandler.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.
+ * Copyright (c) 2004 - 2012 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
diff --git a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/notifications/IDawnListener.java b/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/notifications/IDawnListener.java
index 81f629ed09..88016109f5 100644
--- a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/notifications/IDawnListener.java
+++ b/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/notifications/IDawnListener.java
@@ -1,49 +1,49 @@
-/*
- * Copyright (c) 2004 - 2011 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:
- * Martin Fluegge - initial API and implementation
- */
-package org.eclipse.emf.cdo.dawn.notifications;
-
-import org.eclipse.emf.cdo.transaction.CDOTransactionConflictEvent;
-import org.eclipse.emf.cdo.view.CDOViewInvalidationEvent;
-import org.eclipse.emf.cdo.view.CDOViewLocksChangedEvent;
-
-import org.eclipse.net4j.util.event.IEvent;
-import org.eclipse.net4j.util.event.IListener;
-
-/**
- * @author Martin Fluegge
- * @since 1.0
- */
-public interface IDawnListener extends IListener
-{
- /**
- * allows to react an view invalidations
- */
- public void handleViewInvalidationEvent(CDOViewInvalidationEvent event);
-
- /**
- * Allows to react on conflicts
- */
- public void handleTransactionConflictEvent(CDOTransactionConflictEvent event);
-
- /**
- * Allows the user to react on lock change notifications:
- *
- * @since 2.0
- */
- public void handleLocksChangedEvent(CDOViewLocksChangedEvent event);
-
- /**
- * This method typically will be called for unprocessed events.
- *
- * @since 2.0
- */
- public void handleEvent(IEvent event);
-}
+/*
+ * Copyright (c) 2004 - 2012 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:
+ * Martin Fluegge - initial API and implementation
+ */
+package org.eclipse.emf.cdo.dawn.notifications;
+
+import org.eclipse.emf.cdo.transaction.CDOTransactionConflictEvent;
+import org.eclipse.emf.cdo.view.CDOViewInvalidationEvent;
+import org.eclipse.emf.cdo.view.CDOViewLocksChangedEvent;
+
+import org.eclipse.net4j.util.event.IEvent;
+import org.eclipse.net4j.util.event.IListener;
+
+/**
+ * @author Martin Fluegge
+ * @since 1.0
+ */
+public interface IDawnListener extends IListener
+{
+ /**
+ * allows to react an view invalidations
+ */
+ public void handleViewInvalidationEvent(CDOViewInvalidationEvent event);
+
+ /**
+ * Allows to react on conflicts
+ */
+ public void handleTransactionConflictEvent(CDOTransactionConflictEvent event);
+
+ /**
+ * Allows the user to react on lock change notifications:
+ *
+ * @since 2.0
+ */
+ public void handleLocksChangedEvent(CDOViewLocksChangedEvent event);
+
+ /**
+ * This method typically will be called for unprocessed events.
+ *
+ * @since 2.0
+ */
+ public void handleEvent(IEvent event);
+}
diff --git a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/notifications/IDawnTransactionHandler.java b/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/notifications/IDawnTransactionHandler.java
index b641e4038b..9950de17ae 100644
--- a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/notifications/IDawnTransactionHandler.java
+++ b/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/notifications/IDawnTransactionHandler.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.
+ * Copyright (c) 2004 - 2012 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
diff --git a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/preferences/DawnRemotePreferencePage.java b/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/preferences/DawnRemotePreferencePage.java
index a0f48d8a3a..d6be877bda 100644
--- a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/preferences/DawnRemotePreferencePage.java
+++ b/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/preferences/DawnRemotePreferencePage.java
@@ -1,58 +1,58 @@
-/*
- * Copyright (c) 2004 - 2011 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:
- * Martin Fluegge - initial API and implementation
- */
-package org.eclipse.emf.cdo.dawn.preferences;
-
-import org.eclipse.emf.cdo.dawn.DawnRuntimePlugin;
-
-import org.eclipse.jface.preference.FieldEditorPreferencePage;
-import org.eclipse.jface.preference.IntegerFieldEditor;
-import org.eclipse.jface.preference.StringFieldEditor;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-/**
- * @author Martin Fluegge
- */
-public class DawnRemotePreferencePage extends FieldEditorPreferencePage implements IWorkbenchPreferencePage
-{
-
- public DawnRemotePreferencePage()
- {
- super(GRID);
- AbstractUIPlugin pluginInstance = DawnRuntimePlugin.getDefault();
- setPreferenceStore(pluginInstance.getPreferenceStore()); // TODO generation
- setDescription("Dawn Reference Pages");
- }
-
- /**
- * Creates the field editors. Field editors are abstractions of the common GUI blocks needed to manipulate various
- * types of preferences. Each field editor knows how to save and restore itself.
- */
- @Override
- public void createFieldEditors()
- {
- addField(new StringFieldEditor(PreferenceConstants.P_SERVER_NAME, "server name:", getFieldEditorParent()));
- addField(new IntegerFieldEditor(PreferenceConstants.P_SERVER_PORT, "server port:", getFieldEditorParent()));
- addField(new StringFieldEditor(PreferenceConstants.P_REPOSITORY_NAME, "repository:", getFieldEditorParent()));
- // TODO change this to a list of repositories to allow auto connection for the clients
- addField(new StringFieldEditor(PreferenceConstants.P_PROTOCOL, "protocol:", getFieldEditorParent()));
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench)
- */
- public void init(IWorkbench workbench)
- {
- }
-
-}
+/*
+ * Copyright (c) 2004 - 2012 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:
+ * Martin Fluegge - initial API and implementation
+ */
+package org.eclipse.emf.cdo.dawn.preferences;
+
+import org.eclipse.emf.cdo.dawn.DawnRuntimePlugin;
+
+import org.eclipse.jface.preference.FieldEditorPreferencePage;
+import org.eclipse.jface.preference.IntegerFieldEditor;
+import org.eclipse.jface.preference.StringFieldEditor;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.IWorkbenchPreferencePage;
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+
+/**
+ * @author Martin Fluegge
+ */
+public class DawnRemotePreferencePage extends FieldEditorPreferencePage implements IWorkbenchPreferencePage
+{
+
+ public DawnRemotePreferencePage()
+ {
+ super(GRID);
+ AbstractUIPlugin pluginInstance = DawnRuntimePlugin.getDefault();
+ setPreferenceStore(pluginInstance.getPreferenceStore()); // TODO generation
+ setDescription("Dawn Reference Pages");
+ }
+
+ /**
+ * Creates the field editors. Field editors are abstractions of the common GUI blocks needed to manipulate various
+ * types of preferences. Each field editor knows how to save and restore itself.
+ */
+ @Override
+ public void createFieldEditors()
+ {
+ addField(new StringFieldEditor(PreferenceConstants.P_SERVER_NAME, "server name:", getFieldEditorParent()));
+ addField(new IntegerFieldEditor(PreferenceConstants.P_SERVER_PORT, "server port:", getFieldEditorParent()));
+ addField(new StringFieldEditor(PreferenceConstants.P_REPOSITORY_NAME, "repository:", getFieldEditorParent()));
+ // TODO change this to a list of repositories to allow auto connection for the clients
+ addField(new StringFieldEditor(PreferenceConstants.P_PROTOCOL, "protocol:", getFieldEditorParent()));
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench)
+ */
+ public void init(IWorkbench workbench)
+ {
+ }
+
+}
diff --git a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/preferences/PreferenceConstants.java b/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/preferences/PreferenceConstants.java
index 5e64258329..d59c945070 100644
--- a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/preferences/PreferenceConstants.java
+++ b/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/preferences/PreferenceConstants.java
@@ -1,55 +1,55 @@
-/*
- * Copyright (c) 2004 - 2011 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:
- * Martin Fluegge - initial API and implementation
- */
-package org.eclipse.emf.cdo.dawn.preferences;
-
-import org.eclipse.emf.cdo.dawn.DawnRuntimePlugin;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-
-/**
- * @author Martin Fluegge
- */
-public class PreferenceConstants
-{
-
- public static final String P_SERVER_NAME = "serverURL";
-
- public static final String P_SERVER_PORT = "serverPort";
-
- public static final String P_REPOSITORY_NAME = "repositoryName";
-
- public static final String P_PROTOCOL = "protocol";
-
- public static String getServerName()
- {
- return getPreferenceStore().getString(P_SERVER_NAME);
- }
-
- public static String getServerPort()
- {
- return getPreferenceStore().getString(P_SERVER_PORT);
- }
-
- public static String getRepositoryName()
- {
- return getPreferenceStore().getString(P_REPOSITORY_NAME);
- }
-
- public static String getProtocol()
- {
- return getPreferenceStore().getString(P_PROTOCOL);
- }
-
- private static IPreferenceStore getPreferenceStore()
- {
- return DawnRuntimePlugin.getDefault().getPreferenceStore();
- }
-}
+/*
+ * Copyright (c) 2004 - 2012 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:
+ * Martin Fluegge - initial API and implementation
+ */
+package org.eclipse.emf.cdo.dawn.preferences;
+
+import org.eclipse.emf.cdo.dawn.DawnRuntimePlugin;
+
+import org.eclipse.jface.preference.IPreferenceStore;
+
+/**
+ * @author Martin Fluegge
+ */
+public class PreferenceConstants
+{
+
+ public static final String P_SERVER_NAME = "serverURL";
+
+ public static final String P_SERVER_PORT = "serverPort";
+
+ public static final String P_REPOSITORY_NAME = "repositoryName";
+
+ public static final String P_PROTOCOL = "protocol";
+
+ public static String getServerName()
+ {
+ return getPreferenceStore().getString(P_SERVER_NAME);
+ }
+
+ public static String getServerPort()
+ {
+ return getPreferenceStore().getString(P_SERVER_PORT);
+ }
+
+ public static String getRepositoryName()
+ {
+ return getPreferenceStore().getString(P_REPOSITORY_NAME);
+ }
+
+ public static String getProtocol()
+ {
+ return getPreferenceStore().getString(P_PROTOCOL);
+ }
+
+ private static IPreferenceStore getPreferenceStore()
+ {
+ return DawnRuntimePlugin.getDefault().getPreferenceStore();
+ }
+}
diff --git a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/preferences/PreferenceInitializer.java b/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/preferences/PreferenceInitializer.java
index d26dacff6a..3cd61a41cd 100644
--- a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/preferences/PreferenceInitializer.java
+++ b/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/preferences/PreferenceInitializer.java
@@ -1,40 +1,40 @@
-/*
- * Copyright (c) 2004 - 2011 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:
- * Martin Fluegge - initial API and implementation
- */
-package org.eclipse.emf.cdo.dawn.preferences;
-
-import org.eclipse.emf.cdo.dawn.DawnRuntimePlugin;
-
-import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-/**
- * @author Martin Fluegge
- */
-public class PreferenceInitializer extends AbstractPreferenceInitializer
-{
-
- public PreferenceInitializer()
- {
- }
-
- @Override
- public void initializeDefaultPreferences()
- {
- AbstractUIPlugin pluginInstance = DawnRuntimePlugin.getDefault();
-
- IPreferenceStore store = pluginInstance.getPreferenceStore();
- store.setDefault(PreferenceConstants.P_SERVER_NAME, "localhost");
- store.setDefault(PreferenceConstants.P_SERVER_PORT, 2036);
- store.setDefault(PreferenceConstants.P_PROTOCOL, "tcp");
- store.setDefault(PreferenceConstants.P_REPOSITORY_NAME, "repo1");
- }
-}
+/*
+ * Copyright (c) 2004 - 2012 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:
+ * Martin Fluegge - initial API and implementation
+ */
+package org.eclipse.emf.cdo.dawn.preferences;
+
+import org.eclipse.emf.cdo.dawn.DawnRuntimePlugin;
+
+import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+
+/**
+ * @author Martin Fluegge
+ */
+public class PreferenceInitializer extends AbstractPreferenceInitializer
+{
+
+ public PreferenceInitializer()
+ {
+ }
+
+ @Override
+ public void initializeDefaultPreferences()
+ {
+ AbstractUIPlugin pluginInstance = DawnRuntimePlugin.getDefault();
+
+ IPreferenceStore store = pluginInstance.getPreferenceStore();
+ store.setDefault(PreferenceConstants.P_SERVER_NAME, "localhost");
+ store.setDefault(PreferenceConstants.P_SERVER_PORT, 2036);
+ store.setDefault(PreferenceConstants.P_PROTOCOL, "tcp");
+ store.setDefault(PreferenceConstants.P_REPOSITORY_NAME, "repo1");
+ }
+}
diff --git a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/resources/DawnResourceFactory.java b/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/resources/DawnResourceFactory.java
index f1df7e8f42..134b237488 100644
--- a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/resources/DawnResourceFactory.java
+++ b/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/resources/DawnResourceFactory.java
@@ -1,21 +1,21 @@
-/*
- * Copyright (c) 2004 - 2011 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:
- * Martin Fluegge - initial API and implementation
- */
-package org.eclipse.emf.cdo.dawn.resources;
-
-import org.eclipse.emf.cdo.eresource.CDOResourceFactory;
-
-/**
- * @author Martin Fluegge
- */
-public interface DawnResourceFactory extends CDOResourceFactory
-{
-
-}
+/*
+ * Copyright (c) 2004 - 2012 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:
+ * Martin Fluegge - initial API and implementation
+ */
+package org.eclipse.emf.cdo.dawn.resources;
+
+import org.eclipse.emf.cdo.eresource.CDOResourceFactory;
+
+/**
+ * @author Martin Fluegge
+ */
+public interface DawnResourceFactory extends CDOResourceFactory
+{
+
+}
diff --git a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/resources/DawnWrapperResource.java b/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/resources/DawnWrapperResource.java
index ef08d8584a..44bd03ced3 100644
--- a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/resources/DawnWrapperResource.java
+++ b/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/resources/DawnWrapperResource.java
@@ -1,23 +1,23 @@
-/*
- * Copyright (c) 2004 - 2011 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:
- * Martin Fluegge - initial API and implementation
- */
-package org.eclipse.emf.cdo.dawn.resources;
-
-import org.eclipse.emf.cdo.eresource.CDOResource;
-
-import org.eclipse.emf.ecore.xmi.XMLResource;
-
-/**
- * @author Martin Fluegge
- */
-public interface DawnWrapperResource extends CDOResource, XMLResource
-{
-
-}
+/*
+ * Copyright (c) 2004 - 2012 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:
+ * Martin Fluegge - initial API and implementation
+ */
+package org.eclipse.emf.cdo.dawn.resources;
+
+import org.eclipse.emf.cdo.eresource.CDOResource;
+
+import org.eclipse.emf.ecore.xmi.XMLResource;
+
+/**
+ * @author Martin Fluegge
+ */
+public interface DawnWrapperResource extends CDOResource, XMLResource
+{
+
+}
diff --git a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/resources/impl/DawnResourceFactoryImpl.java b/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/resources/impl/DawnResourceFactoryImpl.java
index 3c31c7cd42..52827ce99e 100644
--- a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/resources/impl/DawnResourceFactoryImpl.java
+++ b/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/resources/impl/DawnResourceFactoryImpl.java
@@ -1,30 +1,30 @@
-/*
- * Copyright (c) 2004 - 2011 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:
- * Martin Fluegge - initial API and implementation
- */
-package org.eclipse.emf.cdo.dawn.resources.impl;
-
-import org.eclipse.emf.cdo.dawn.resources.DawnResourceFactory;
-import org.eclipse.emf.cdo.eresource.impl.CDOResourceFactoryImpl;
-import org.eclipse.emf.cdo.eresource.impl.CDOResourceImpl;
-
-import org.eclipse.emf.common.util.URI;
-
-/**
- * @author Martin Fluegge
- */
-public class DawnResourceFactoryImpl extends CDOResourceFactoryImpl implements DawnResourceFactory
-{
- @Override
- protected CDOResourceImpl createCDOResource(URI uri)
- {
- uri = URI.createURI(uri.toString().replace("dawn:", "cdo:"));
- return new DawnWrapperResourceImpl(uri);
- }
-}
+/*
+ * Copyright (c) 2004 - 2012 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:
+ * Martin Fluegge - initial API and implementation
+ */
+package org.eclipse.emf.cdo.dawn.resources.impl;
+
+import org.eclipse.emf.cdo.dawn.resources.DawnResourceFactory;
+import org.eclipse.emf.cdo.eresource.impl.CDOResourceFactoryImpl;
+import org.eclipse.emf.cdo.eresource.impl.CDOResourceImpl;
+
+import org.eclipse.emf.common.util.URI;
+
+/**
+ * @author Martin Fluegge
+ */
+public class DawnResourceFactoryImpl extends CDOResourceFactoryImpl implements DawnResourceFactory
+{
+ @Override
+ protected CDOResourceImpl createCDOResource(URI uri)
+ {
+ uri = URI.createURI(uri.toString().replace("dawn:", "cdo:"));
+ return new DawnWrapperResourceImpl(uri);
+ }
+}
diff --git a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/resources/impl/DawnWrapperResourceImpl.java b/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/resources/impl/DawnWrapperResourceImpl.java
index db133229f1..769a8b8b62 100644
--- a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/resources/impl/DawnWrapperResourceImpl.java
+++ b/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/resources/impl/DawnWrapperResourceImpl.java
@@ -1,174 +1,174 @@
-/*
- * Copyright (c) 2004 - 2011 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:
- * Martin Fluegge - initial API and implementation
- */
-package org.eclipse.emf.cdo.dawn.resources.impl;
-
-import org.eclipse.emf.cdo.dawn.resources.DawnWrapperResource;
-import org.eclipse.emf.cdo.eresource.impl.CDOResourceImpl;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.xmi.DOMHandler;
-import org.eclipse.emf.ecore.xmi.DOMHelper;
-import org.eclipse.emf.ecore.xml.type.AnyType;
-
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-import org.xml.sax.InputSource;
-
-import java.io.IOException;
-import java.io.Writer;
-import java.util.Map;
-
-/**
- * This class wrapper CDOResource and combines it with a XMLResource to avoid problems with all frameworks which are
- * internally using an XMLResource
- *
- * @author Martin Fluegge
- */
-public class DawnWrapperResourceImpl extends CDOResourceImpl implements DawnWrapperResource
-{
-
- public DawnWrapperResourceImpl(URI uri)
- {
- super(uri);
- }
-
- @Override
- public void setRoot(boolean root)
- {
- super.setRoot(root);
- }
-
- @Override
- protected void setExisting(boolean existing)
- {
- super.setExisting(existing);
-
- }
-
- /************ XML STUFF BEGIN ********************/
-
- public DOMHelper getDOMHelper()
- {
- throw new UnsupportedOperationException();
- }
-
- public Map<Object, Object> getDefaultLoadOptions()
- {
- throw new UnsupportedOperationException();
- }
-
- public Map<Object, Object> getDefaultSaveOptions()
- {
- throw new UnsupportedOperationException();
- }
-
- public Map<EObject, AnyType> getEObjectToExtensionMap()
- {
-
- throw new UnsupportedOperationException();
- }
-
- @Deprecated
- public Map<EObject, String> getEObjectToIDMap()
- {
- throw new UnsupportedOperationException();
- }
-
- public String getEncoding()
- {
- throw new UnsupportedOperationException();
- }
-
- public String getID(EObject eObject)
- {
- return getURIFragment(eObject);
- }
-
- @Deprecated
- public Map<String, EObject> getIDToEObjectMap()
- {
- throw new UnsupportedOperationException();
- }
-
- public String getPublicId()
- {
- throw new UnsupportedOperationException();
- }
-
- public String getSystemId()
- {
- throw new UnsupportedOperationException();
- }
-
- public String getXMLVersion()
- {
- throw new UnsupportedOperationException();
- }
-
- public void load(Node node, Map<?, ?> options) throws IOException
- {
- throw new UnsupportedOperationException();
- }
-
- public void load(InputSource inputSource, Map<?, ?> options) throws IOException
- {
- throw new UnsupportedOperationException();
- }
-
- public void save(Writer writer, Map<?, ?> options) throws IOException
- {
- throw new UnsupportedOperationException();
- }
-
- public Document save(Document document, Map<?, ?> options, DOMHandler handler)
- {
- throw new UnsupportedOperationException();
- }
-
- public void setDoctypeInfo(String publicId, String systemId)
- {
- throw new UnsupportedOperationException();
- }
-
- public void setEncoding(String encoding)
- {
- throw new UnsupportedOperationException();
- }
-
- public void setID(EObject eObject, String id)
- {
- throw new UnsupportedOperationException();
- }
-
- public void setUseZip(boolean useZip)
- {
- throw new UnsupportedOperationException();
- }
-
- public void setXMLVersion(String version)
- {
- throw new UnsupportedOperationException();
- }
-
- public boolean useZip()
- {
- return false;
- }
-
- /************ XML STUFF END ********************/
- @Override
- public String toString()
- {
-
- return "DawnWrapperResource (" + super.toString() + ")";
- }
-}
+/*
+ * Copyright (c) 2004 - 2012 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:
+ * Martin Fluegge - initial API and implementation
+ */
+package org.eclipse.emf.cdo.dawn.resources.impl;
+
+import org.eclipse.emf.cdo.dawn.resources.DawnWrapperResource;
+import org.eclipse.emf.cdo.eresource.impl.CDOResourceImpl;
+
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.xmi.DOMHandler;
+import org.eclipse.emf.ecore.xmi.DOMHelper;
+import org.eclipse.emf.ecore.xml.type.AnyType;
+
+import org.w3c.dom.Document;
+import org.w3c.dom.Node;
+import org.xml.sax.InputSource;
+
+import java.io.IOException;
+import java.io.Writer;
+import java.util.Map;
+
+/**
+ * This class wrapper CDOResource and combines it with a XMLResource to avoid problems with all frameworks which are
+ * internally using an XMLResource
+ *
+ * @author Martin Fluegge
+ */
+public class DawnWrapperResourceImpl extends CDOResourceImpl implements DawnWrapperResource
+{
+
+ public DawnWrapperResourceImpl(URI uri)
+ {
+ super(uri);
+ }
+
+ @Override
+ public void setRoot(boolean root)
+ {
+ super.setRoot(root);
+ }
+
+ @Override
+ protected void setExisting(boolean existing)
+ {
+ super.setExisting(existing);
+
+ }
+
+ /************ XML STUFF BEGIN ********************/
+
+ public DOMHelper getDOMHelper()
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ public Map<Object, Object> getDefaultLoadOptions()
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ public Map<Object, Object> getDefaultSaveOptions()
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ public Map<EObject, AnyType> getEObjectToExtensionMap()
+ {
+
+ throw new UnsupportedOperationException();
+ }
+
+ @Deprecated
+ public Map<EObject, String> getEObjectToIDMap()
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ public String getEncoding()
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ public String getID(EObject eObject)
+ {
+ return getURIFragment(eObject);
+ }
+
+ @Deprecated
+ public Map<String, EObject> getIDToEObjectMap()
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ public String getPublicId()
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ public String getSystemId()
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ public String getXMLVersion()
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ public void load(Node node, Map<?, ?> options) throws IOException
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ public void load(InputSource inputSource, Map<?, ?> options) throws IOException
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ public void save(Writer writer, Map<?, ?> options) throws IOException
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ public Document save(Document document, Map<?, ?> options, DOMHandler handler)
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ public void setDoctypeInfo(String publicId, String systemId)
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ public void setEncoding(String encoding)
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ public void setID(EObject eObject, String id)
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ public void setUseZip(boolean useZip)
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ public void setXMLVersion(String version)
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ public boolean useZip()
+ {
+ return false;
+ }
+
+ /************ XML STUFF END ********************/
+ @Override
+ public String toString()
+ {
+
+ return "DawnWrapperResource (" + super.toString() + ")";
+ }
+}
diff --git a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/spi/DawnState.java b/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/spi/DawnState.java
index e1d9cd3b0b..3f65b27902 100644
--- a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/spi/DawnState.java
+++ b/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/spi/DawnState.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.
+ * Copyright (c) 2004 - 2012 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
diff --git a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/spi/IDawnEditingSupport.java b/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/spi/IDawnEditingSupport.java
index 12287d393f..6ffc97d492 100644
--- a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/spi/IDawnEditingSupport.java
+++ b/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/spi/IDawnEditingSupport.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.
+ * Copyright (c) 2004 - 2012 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
diff --git a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/spi/IDawnUIElement.java b/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/spi/IDawnUIElement.java
index 78e481f8fd..b5d46cc4a5 100644
--- a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/spi/IDawnUIElement.java
+++ b/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/spi/IDawnUIElement.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.
+ * Copyright (c) 2004 - 2012 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
diff --git a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/transaction/DawnTransactionChangeRecorder.java b/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/transaction/DawnTransactionChangeRecorder.java
index 0fcaaaed8c..98631079dd 100644
--- a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/transaction/DawnTransactionChangeRecorder.java
+++ b/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/transaction/DawnTransactionChangeRecorder.java
@@ -1,48 +1,48 @@
-/*
- * Copyright (c) 2004 - 2011 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:
- * Eike Stepper - initial API and implementation
- */
-package org.eclipse.emf.cdo.dawn.transaction;
-
-import org.eclipse.emf.cdo.CDODeltaNotification;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.transaction.impl.InternalTransactionalEditingDomain;
-import org.eclipse.emf.transaction.impl.TransactionChangeRecorder;
-
-/**
- * @author Martin Fluegge
- */
-public class DawnTransactionChangeRecorder extends TransactionChangeRecorder
-{
- /**
- * @since 2.0
- */
- public DawnTransactionChangeRecorder(InternalTransactionalEditingDomain domain, ResourceSet rset)
- {
- super(domain, rset);
- }
-
- /**
- * @since 1.0
- */
- @Override
- public void notifyChanged(Notification notification)
- {
- if (!(notification.getOldValue() instanceof ResourceSet && notification.getNewValue() == null && notification
- .getEventType() == Notification.SET))
- {
- if (!(notification instanceof CDODeltaNotification))
- {
- super.notifyChanged(notification);
- }
- }
- }
-}
+/*
+ * Copyright (c) 2004 - 2012 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:
+ * Eike Stepper - initial API and implementation
+ */
+package org.eclipse.emf.cdo.dawn.transaction;
+
+import org.eclipse.emf.cdo.CDODeltaNotification;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.transaction.impl.InternalTransactionalEditingDomain;
+import org.eclipse.emf.transaction.impl.TransactionChangeRecorder;
+
+/**
+ * @author Martin Fluegge
+ */
+public class DawnTransactionChangeRecorder extends TransactionChangeRecorder
+{
+ /**
+ * @since 2.0
+ */
+ public DawnTransactionChangeRecorder(InternalTransactionalEditingDomain domain, ResourceSet rset)
+ {
+ super(domain, rset);
+ }
+
+ /**
+ * @since 1.0
+ */
+ @Override
+ public void notifyChanged(Notification notification)
+ {
+ if (!(notification.getOldValue() instanceof ResourceSet && notification.getNewValue() == null && notification
+ .getEventType() == Notification.SET))
+ {
+ if (!(notification instanceof CDODeltaNotification))
+ {
+ super.notifyChanged(notification);
+ }
+ }
+ }
+}
diff --git a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/transaction/DawnTransactionalEditingDomainImpl.java b/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/transaction/DawnTransactionalEditingDomainImpl.java
index 6eb462d8d0..674ce68892 100644
--- a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/transaction/DawnTransactionalEditingDomainImpl.java
+++ b/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/transaction/DawnTransactionalEditingDomainImpl.java
@@ -1,50 +1,50 @@
-/*
- * Copyright (c) 2004 - 2011 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:
- * Eike Stepper - initial API and implementation
- */
-package org.eclipse.emf.cdo.dawn.transaction;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.transaction.TransactionalCommandStack;
-import org.eclipse.emf.transaction.impl.TransactionChangeRecorder;
-import org.eclipse.emf.transaction.impl.TransactionalEditingDomainImpl;
-
-/**
- * @author Martin Fluegge
- */
-public class DawnTransactionalEditingDomainImpl extends TransactionalEditingDomainImpl
-{
- public DawnTransactionalEditingDomainImpl(AdapterFactory adapterFactory, ResourceSet resourceSet)
- {
- super(adapterFactory, resourceSet);
- }
-
- public DawnTransactionalEditingDomainImpl(AdapterFactory adapterFactory)
- {
- super(adapterFactory);
- }
-
- public DawnTransactionalEditingDomainImpl(AdapterFactory adapterFactory, TransactionalCommandStack stack,
- ResourceSet resourceSet)
- {
- super(adapterFactory, stack, resourceSet);
- }
-
- public DawnTransactionalEditingDomainImpl(AdapterFactory adapterFactory, TransactionalCommandStack stack)
- {
- super(adapterFactory, stack);
- }
-
- @Override
- protected TransactionChangeRecorder createChangeRecorder(ResourceSet rset)
- {
- return new DawnTransactionChangeRecorder(this, rset);
- }
-}
+/*
+ * Copyright (c) 2004 - 2012 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:
+ * Eike Stepper - initial API and implementation
+ */
+package org.eclipse.emf.cdo.dawn.transaction;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.transaction.TransactionalCommandStack;
+import org.eclipse.emf.transaction.impl.TransactionChangeRecorder;
+import org.eclipse.emf.transaction.impl.TransactionalEditingDomainImpl;
+
+/**
+ * @author Martin Fluegge
+ */
+public class DawnTransactionalEditingDomainImpl extends TransactionalEditingDomainImpl
+{
+ public DawnTransactionalEditingDomainImpl(AdapterFactory adapterFactory, ResourceSet resourceSet)
+ {
+ super(adapterFactory, resourceSet);
+ }
+
+ public DawnTransactionalEditingDomainImpl(AdapterFactory adapterFactory)
+ {
+ super(adapterFactory);
+ }
+
+ public DawnTransactionalEditingDomainImpl(AdapterFactory adapterFactory, TransactionalCommandStack stack,
+ ResourceSet resourceSet)
+ {
+ super(adapterFactory, stack, resourceSet);
+ }
+
+ public DawnTransactionalEditingDomainImpl(AdapterFactory adapterFactory, TransactionalCommandStack stack)
+ {
+ super(adapterFactory, stack);
+ }
+
+ @Override
+ protected TransactionChangeRecorder createChangeRecorder(ResourceSet rset)
+ {
+ return new DawnTransactionChangeRecorder(this, rset);
+ }
+}

Back to the top