Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2015-06-10 16:06:56 +0000
committerCamille Letavernier2015-06-10 17:13:09 +0000
commitcf0e0ef3b9ef75e04f381b0b20a14393d761d9da (patch)
treed00a098043b027fa36d301875b5dd3f40da84450
parent69893d8e3dac838fafe0498c06a8dce0869e100d (diff)
downloadorg.eclipse.papyrus-cf0e0ef3b9ef75e04f381b0b20a14393d761d9da.tar.gz
org.eclipse.papyrus-cf0e0ef3b9ef75e04f381b0b20a14393d761d9da.tar.xz
org.eclipse.papyrus-cf0e0ef3b9ef75e04f381b0b20a14393d761d9da.zip
Papyrus/CDO documentation update
Change-Id: I7c6eb5ca7446667750177f88da8595824942cc0b Signed-off-by: Eike Stepper <stepper@esc-net.de> Reviewed-on: https://git.eclipse.org/r/49937 Tested-by: Camille Letavernier <camille.letavernier@cea.fr> Reviewed-by: Camille Letavernier <camille.letavernier@cea.fr>
-rw-r--r--plugins/doc/org.eclipse.papyrus.cdo.ui.doc/resource/bugs/cdo-bugs.markdown1
-rw-r--r--plugins/doc/org.eclipse.papyrus.cdo.ui.doc/resource/start/addrepo.pngbin56434 -> 26870 bytes
-rw-r--r--plugins/doc/org.eclipse.papyrus.cdo.ui.doc/resource/start/cdo-start.markdown10
-rw-r--r--plugins/doc/org.eclipse.papyrus.cdo.ui.doc/resource/start/modelreposview.pngbin25875 -> 11068 bytes
4 files changed, 3 insertions, 8 deletions
diff --git a/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/resource/bugs/cdo-bugs.markdown b/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/resource/bugs/cdo-bugs.markdown
index 47643dcada2..bda47fd0063 100644
--- a/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/resource/bugs/cdo-bugs.markdown
+++ b/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/resource/bugs/cdo-bugs.markdown
@@ -15,7 +15,6 @@ The following Papyrus capabilities are supported on models in CDO repositories:
Some capabilities of Papyrus are not support on models in CDO repositories in this release:
-* compare/merge: the **Model Repositories** view does not support branches and no "compare with each other" action is provided
* although CSS styling of diagrams is supported, this extends only to CSS stylsheets deployed in plug-ins. Custom stylesheets stored locally in the workspace or in a repository are not supported
* controlled resources are not supported
* attaching documents to model elements is not supported \ No newline at end of file
diff --git a/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/resource/start/addrepo.png b/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/resource/start/addrepo.png
index 0d379a8a77a..86f7efecff5 100644
--- a/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/resource/start/addrepo.png
+++ b/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/resource/start/addrepo.png
Binary files differ
diff --git a/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/resource/start/cdo-start.markdown b/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/resource/start/cdo-start.markdown
index a63f6961934..a838cacc7be 100644
--- a/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/resource/start/cdo-start.markdown
+++ b/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/resource/start/cdo-start.markdown
@@ -11,17 +11,13 @@ The CDO Model Repository integration feature is not installed by default with Pa
Select the CDO integration feature by checking the box on the left side and press **Finish** to perform the installation.
## <a id="Connecting">Connecting to a Repository</a>
-Repository connections are managed in the **Model Repositories** view. Use the **Add Repository...** button in the view to create a new repository connection:
+Repository connections are managed in the **CDO Repositories** view. Use the green plus (**+**) button in the view to create a new repository connection:
![Add repository](addrepo.png)
-If your repository requires user authentication, a login dialog will appear to accept your credentials.
+The new repository is then added to the view. Select the new repository and pick **Checkout** in the context menu. Complete the wizard. A new checkout representing the contents of the repository now appears in the **Project Explorer** view. Note that this checkout looks like a workspace project but does not physically exist in your workspace. An online checkout does not store model data on your local disk at all; an offline checkout stores the checked-out baseline locally (but not in the workspace). You can create as many checkouts from a repository as you want, for example when working with different branches.
-The new repository is then added to the view. Select the new repository and pick **New Papyrus Model** in the context menu. Complete the wizard. You should now have a new blank model open and something like this in the **Model Repositories** view:
-
-![Model Repositories view](modelreposview.png)
-
-Note that because it is necessary to explicitly connect to model repositories, any model editors that are open when shutting down the Papyrus workbench are not re-opened on next launch.
+Creating new or opening existing Papyrus models in a checkout works similar to local workspace projects. Note that because it is necessary to explicitly connect to model repositories, any model editors that are open when shutting down the Papyrus workbench are not re-opened on next launch.
## <a id="Importing">Importing Models from the Workspace</a>
diff --git a/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/resource/start/modelreposview.png b/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/resource/start/modelreposview.png
index 932508075f6..ab8f1166dad 100644
--- a/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/resource/start/modelreposview.png
+++ b/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/resource/start/modelreposview.png
Binary files differ

Back to the top