Skip to content

Commit

Permalink
488126: Mail example with two Parsley modules
Browse files Browse the repository at this point in the history
Also added SWTBot tests for the Mail example

Change-Id: I76a3a8f8b5f5dd0c964c9b97192d842a7088ff08
Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=488126
  • Loading branch information
LorenzoBettini committed Feb 23, 2016
1 parent 72e6dd8 commit 5846225
Show file tree
Hide file tree
Showing 49 changed files with 439 additions and 143 deletions.
7 changes: 7 additions & 0 deletions devtools/org.eclipse.emf.parsley.workspace/feature.xml
Expand Up @@ -167,4 +167,11 @@
version="0.0.0"
unpack="false"/>

<plugin
id="org.eclipse.emf.parsley.tests.swtbot.examples"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>

</feature>
Expand Up @@ -10,7 +10,7 @@
import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.parsley.edit.ui.provider.ViewerContentProvider;
import org.eclipse.emf.parsley.examples.mail.Folder;
import org.eclipse.emf.parsley.examples.mail.unifiedfoldersview.UnifiedFolderContainer;
import org.eclipse.emf.parsley.examples.mail.accountsview.unifiedfolders.UnifiedFolderContainer;
import org.eclipse.xtext.xbase.lib.CollectionLiterals;
import org.eclipse.xtext.xbase.lib.Functions.Function1;
import org.eclipse.xtext.xbase.lib.IteratorExtensions;
Expand Down
Expand Up @@ -4,8 +4,8 @@
<extension
point="org.eclipse.ui.views">
<view
category="org.eclipse.emf.parsley"
class="org.eclipse.emf.parsley.examples.mail.unifiedfoldersview.UnifiedfoldersviewExecutableExtensionFactory:org.eclipse.emf.parsley.examples.mail.unifiedfoldersview.UnifiedFoldersView"
category="org.eclipse.emf.parsley.examples.mail.accountsview"
class="org.eclipse.emf.parsley.examples.mail.unifiedfoldersview.UnifiedfoldersviewExecutableExtensionFactory:org.eclipse.emf.parsley.examples.mail.accountsview.unifiedfolders.UnifiedFoldersView"
id="org.eclipse.emf.parsley.examples.mail.unifiedfoldersview"
name="Unified Folders"
restorable="true">
Expand Down
Expand Up @@ -5,7 +5,7 @@
import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
import org.eclipse.emf.parsley.examples.mail.Folder;
import org.eclipse.emf.parsley.examples.mail.accountsview.ui.provider.AccountsviewLabelProvider;
import org.eclipse.emf.parsley.examples.mail.unifiedfoldersview.UnifiedFolderContainer;
import org.eclipse.emf.parsley.examples.mail.accountsview.unifiedfolders.UnifiedFolderContainer;
import org.eclipse.xtext.xbase.lib.StringExtensions;

@SuppressWarnings("all")
Expand Down
Expand Up @@ -15,5 +15,12 @@
name="Mail Accounts View"
restorable="true">
</view>
<view
category="org.eclipse.emf.parsley.examples.mail.accountsview"
class="org.eclipse.emf.parsley.examples.mail.unifiedfoldersview.UnifiedfoldersviewExecutableExtensionFactory:org.eclipse.emf.parsley.examples.mail.accountsview.unifiedfolders.UnifiedFoldersView"
id="org.eclipse.emf.parsley.examples.mail.unifiedfoldersview"
name="Unified Folders"
restorable="true">
</view>
</extension>
</plugin>
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<relativePath>../../releng/org.eclipse.emf.parsley.parent/pom.xml</relativePath>
<groupId>org.eclipse.emf.parsley</groupId>
<artifactId>org.eclipse.emf.parsley.parent</artifactId>
<version>0.7.0-SNAPSHOT</version>
</parent>

<artifactId>org.eclipse.emf.parsley.examples.mail.accountsview</artifactId>
<packaging>eclipse-plugin</packaging>

</project>
Expand Up @@ -8,7 +8,7 @@
* Contributors:
* Lorenzo Bettini - initial API and implementation
*******************************************************************************/
package org.eclipse.emf.parsley.examples.mail.unifiedfoldersview;
package org.eclipse.emf.parsley.examples.mail.accountsview;

import org.eclipse.emf.common.command.Command;
import org.eclipse.emf.parsley.examples.mail.accountsview.views.AccountsView;
Expand Down
Expand Up @@ -2,8 +2,8 @@ import org.eclipse.emf.ecore.resource.Resource
import org.eclipse.emf.parsley.examples.mail.Folder
import org.eclipse.emf.parsley.examples.mail.accountsview.AccountsviewEmfParsleyGuiceModule
import org.eclipse.emf.parsley.examples.mail.accountsview.ui.provider.AccountsviewLabelProvider
import org.eclipse.emf.parsley.examples.mail.unifiedfoldersview.UnifiedFolderContainer
import org.eclipse.emf.parsley.examples.mail.unifiedfoldersview.UnifiedFoldersView
import org.eclipse.emf.parsley.examples.mail.accountsview.unifiedfolders.UnifiedFolderContainer
import org.eclipse.emf.parsley.examples.mail.accountsview.unifiedfolders.UnifiedFoldersView

/* org.eclipse.emf.parsley.examples.mail.unifiedfoldersview Emf Parsley Dsl Module file */
module org.eclipse.emf.parsley.examples.mail.unifiedfoldersview extends AccountsviewEmfParsleyGuiceModule {
Expand All @@ -12,6 +12,7 @@ module org.eclipse.emf.parsley.examples.mail.unifiedfoldersview extends Accounts
viewpart org.eclipse.emf.parsley.examples.mail.unifiedfoldersview {
viewname "Unified Folders"
viewclass UnifiedFoldersView
viewcategory org.eclipse.emf.parsley.examples.mail.accountsview
}
}

Expand Down
Expand Up @@ -8,7 +8,7 @@
* Contributors:
* Lorenzo Bettini - initial API and implementation
*******************************************************************************/
package org.eclipse.emf.parsley.examples.mail.unifiedfoldersview;
package org.eclipse.emf.parsley.examples.mail.accountsview.unifiedfolders;

import org.eclipse.emf.ecore.resource.Resource;

Expand Down
@@ -0,0 +1,27 @@
/*******************************************************************************
* Copyright (c) 2013 RCP Vision (http://www.rcp-vision.com) 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:
* Lorenzo Bettini - initial API and implementation
*******************************************************************************/
package org.eclipse.emf.parsley.examples.mail.accountsview.unifiedfolders;

import org.eclipse.emf.common.command.Command;
import org.eclipse.emf.parsley.examples.mail.accountsview.views.AccountsView;

public class UnifiedFoldersView extends AccountsView {

public static final String ID = "org.eclipse.emf.parsley.examples.mail.unifiedfoldersview";

@Override
public void mostRecentCommandAffectsResource(Command mostRecentCommand) {
super.mostRecentCommandAffectsResource(mostRecentCommand);
// if a child changes the parent is not refreshed by default
getViewer().refresh();
getViewer().expandAll();
}
}
16 changes: 16 additions & 0 deletions examples/org.eclipse.emf.parsley.examples.mail.mailsview/pom.xml
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<relativePath>../../releng/org.eclipse.emf.parsley.parent/pom.xml</relativePath>
<groupId>org.eclipse.emf.parsley</groupId>
<artifactId>org.eclipse.emf.parsley.parent</artifactId>
<version>0.7.0-SNAPSHOT</version>
</parent>

<artifactId>org.eclipse.emf.parsley.examples.mail.mailsview</artifactId>
<packaging>eclipse-plugin</packaging>

</project>
16 changes: 16 additions & 0 deletions examples/org.eclipse.emf.parsley.examples.mail.messageview/pom.xml
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<relativePath>../../releng/org.eclipse.emf.parsley.parent/pom.xml</relativePath>
<groupId>org.eclipse.emf.parsley</groupId>
<artifactId>org.eclipse.emf.parsley.parent</artifactId>
<version>0.7.0-SNAPSHOT</version>
</parent>

<artifactId>org.eclipse.emf.parsley.examples.mail.messageview</artifactId>
<packaging>eclipse-plugin</packaging>

</project>
16 changes: 16 additions & 0 deletions examples/org.eclipse.emf.parsley.examples.mail.model/pom.xml
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<relativePath>../../releng/org.eclipse.emf.parsley.parent/pom.xml</relativePath>
<groupId>org.eclipse.emf.parsley</groupId>
<artifactId>org.eclipse.emf.parsley.parent</artifactId>
<version>0.7.0-SNAPSHOT</version>
</parent>

<artifactId>org.eclipse.emf.parsley.examples.mail.model</artifactId>
<packaging>eclipse-plugin</packaging>

</project>
Expand Up @@ -77,11 +77,4 @@
version="0.0.0"
unpack="false"/>

<plugin
id="org.eclipse.emf.parsley.examples.mail.unifiedfoldersview"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>

</feature>
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<relativePath>../../releng/org.eclipse.emf.parsley.parent/pom.xml</relativePath>
<groupId>org.eclipse.emf.parsley</groupId>
<artifactId>org.eclipse.emf.parsley.parent</artifactId>
<version>0.7.0-SNAPSHOT</version>
</parent>

<artifactId>org.eclipse.emf.parsley.examples.mail.product.feature</artifactId>

<packaging>eclipse-feature</packaging>
</project>
Expand Up @@ -8,7 +8,6 @@ Bundle-Vendor: Eclipse Modeling Project
Require-Bundle: org.eclipse.ui;bundle-version="3.5.0",
org.eclipse.core.runtime;bundle-version="3.5.0",
org.eclipse.emf.parsley.examples.mail.accountsview,
org.eclipse.emf.parsley.examples.mail.model,
org.eclipse.emf.parsley.examples.mail.unifiedfoldersview
org.eclipse.emf.parsley.examples.mail.model
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
16 changes: 16 additions & 0 deletions examples/org.eclipse.emf.parsley.examples.mail.rcp/pom.xml
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<relativePath>../../releng/org.eclipse.emf.parsley.parent/pom.xml</relativePath>
<groupId>org.eclipse.emf.parsley</groupId>
<artifactId>org.eclipse.emf.parsley.parent</artifactId>
<version>0.7.0-SNAPSHOT</version>
</parent>

<artifactId>org.eclipse.emf.parsley.examples.mail.rcp</artifactId>
<packaging>eclipse-plugin</packaging>

</project>
Expand Up @@ -11,8 +11,8 @@
package org.eclipse.emf.parsley.examples.mail.rcp;


import org.eclipse.emf.parsley.examples.mail.accountsview.UnifiedFoldersView;
import org.eclipse.emf.parsley.examples.mail.accountsview.views.AccountsView;
import org.eclipse.emf.parsley.examples.mail.unifiedfoldersview.UnifiedFoldersView;
import org.eclipse.ui.IFolderLayout;
import org.eclipse.ui.IPageLayout;
import org.eclipse.ui.IPerspectiveFactory;
Expand Down

This file was deleted.

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

This file was deleted.

This file was deleted.

1 change: 0 additions & 1 deletion plugins/org.eclipse.emf.parsley.ui.examples/build.xml
Expand Up @@ -38,7 +38,6 @@
<zip_example name="org.eclipse.emf.parsley.examples.mail.accountsview" />
<zip_example name="org.eclipse.emf.parsley.examples.mail.mailsview" />
<zip_example name="org.eclipse.emf.parsley.examples.mail.messageview" />
<zip_example name="org.eclipse.emf.parsley.examples.mail.unifiedfoldersview" />
<zip_example name="org.eclipse.emf.parsley.examples.mail.product.feature" />
<zip_example name="org.eclipse.emf.parsley.examples.firstexample" />
<zip_example name="org.eclipse.emf.parsley.examples.eclipse4" />
Expand Down
5 changes: 0 additions & 5 deletions plugins/org.eclipse.emf.parsley.ui.examples/plugin.xml
Expand Up @@ -257,11 +257,6 @@
description="Mail Message View"
name="org.eclipse.emf.parsley.examples.mail.messageview">
</projectDescriptor>
<projectDescriptor
contentURI="contents/org.eclipse.emf.parsley.examples.mail.unifiedfoldersview.zip"
description="Unified Folders View"
name="org.eclipse.emf.parsley.examples.mail.unifiedfoldersview">
</projectDescriptor>
<projectDescriptor
contentURI="contents/org.eclipse.emf.parsley.examples.mail.product.feature.zip"
description="Mail Product Feature"
Expand Down

0 comments on commit 5846225

Please sign in to comment.