Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian W. Damus2016-03-01 21:12:57 +0000
committerChristian W. Damus2016-03-03 13:10:34 +0000
commitfd67537c8be16b59b5ba508cea8e9e8585523b7c (patch)
tree1313f88f62a32f44f3cbd4951c86f38f2a08eb65 /plugins/infra/core
parent9e6a1135bc8d0712f9d8f1bedd99a5f4fe00077d (diff)
downloadorg.eclipse.papyrus-fd67537c8be16b59b5ba508cea8e9e8585523b7c.tar.gz
org.eclipse.papyrus-fd67537c8be16b59b5ba508cea8e9e8585523b7c.tar.xz
org.eclipse.papyrus-fd67537c8be16b59b5ba508cea8e9e8585523b7c.zip
Bug 488791: [Tests] Discontinue packaging of tests as fragment bundles
Deprecate the FragmentTestSuiteClass. Convert all test fragments in the Papyrus Main Tests to plug-ins (does require some changes in the tests themselves, especially in the finding of test resources within the bundles and a few cases of making API accessible for testing). Update the aggregate suites accordingly. Change-Id: I91b38b3152fb147d3c4185b00240248344cce95b
Diffstat (limited to 'plugins/infra/core')
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/RootModel.java167
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/SashWindowsContainer.java38
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core/META-INF/MANIFEST.MF2
3 files changed, 110 insertions, 97 deletions
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/RootModel.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/RootModel.java
index 722c24a31aa..a348a921277 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/RootModel.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/RootModel.java
@@ -1,82 +1,85 @@
-/*****************************************************************************
- * Copyright (c) 2009 CEA LIST & LIFL
- *
- *
- * 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:
- * Cedric Dumoulin Cedric.dumoulin@lifl.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple;
-
-import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel;
-
-/**
- * @author dumoulin
- */
-public class RootModel extends AbstractModel {
-
- /**
- * Child of this root model.
- */
- private AbstractPanelModel child;
-
- /**
- * Constructor.
- *
- * @param child
- */
- public RootModel(AbstractPanelModel child) {
- this.child = child;
- child.setParent(this);
- }
-
- /**
- * Return the parent of the model. Can be null in the case of rootModel.
- *
- * @return the parent
- */
- @Override
- public AbstractModel getParent() {
- return null;
- }
-
- /**
- * @param parent
- * the parent to set
- */
- @Override
- public void setParent(AbstractModel parent) {
- }
-
- /**
- * Replace the actual child by the new child.
- *
- */
- @Override
- public void replaceChild(AbstractPanelModel oldChild, AbstractPanelModel newChild) {
-
- assert (child == oldChild);
- child = newChild;
-
- }
-
- /**
- * Lookup the folder containing the specified tabItem.
- *
- * @param tabItem
- * @return
- */
- protected TabFolderModel lookupTabFolder(IPageModel tabItem) {
- return child.lookupTabFolder(tabItem);
- }
-
- protected AbstractPanelModel getChild() {
- return child;
- }
-
-}
+/*****************************************************************************
+ * Copyright (c) 2009, 2016 LIFL, CEA LIST, Christian W. Damus, 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:
+ * Cedric Dumoulin Cedric.dumoulin@lifl.fr - Initial API and implementation
+ * Christian W. Damus - bug 488791
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple;
+
+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel;
+
+/**
+ * @author dumoulin
+ */
+public class RootModel extends AbstractModel {
+
+ /**
+ * Child of this root model.
+ */
+ private AbstractPanelModel child;
+
+ /**
+ * Constructor.
+ *
+ * @param child
+ */
+ public RootModel(AbstractPanelModel child) {
+ this.child = child;
+ child.setParent(this);
+ }
+
+ /**
+ * Return the parent of the model. Can be null in the case of rootModel.
+ *
+ * @return the parent
+ */
+ @Override
+ public AbstractModel getParent() {
+ return null;
+ }
+
+ /**
+ * @param parent
+ * the parent to set
+ */
+ @Override
+ public void setParent(AbstractModel parent) {
+ }
+
+ /**
+ * Replace the actual child by the new child.
+ *
+ */
+ @Override
+ public void replaceChild(AbstractPanelModel oldChild, AbstractPanelModel newChild) {
+
+ assert (child == oldChild);
+ child = newChild;
+
+ }
+
+ /**
+ * Lookup the folder containing the specified tabItem.
+ *
+ * @param tabItem
+ * @return
+ */
+ protected TabFolderModel lookupTabFolder(IPageModel tabItem) {
+ return child.lookupTabFolder(tabItem);
+ }
+
+ /**
+ * @noreference This method is not intended to be referenced by clients.
+ */
+ public AbstractPanelModel getChild() {
+ return child;
+ }
+
+}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/SashWindowsContainer.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/SashWindowsContainer.java
index c141eb52742..5290f34e95a 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/SashWindowsContainer.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/internal/SashWindowsContainer.java
@@ -1,5 +1,5 @@
/*****************************************************************************
- * Copyright (c) 2009, 2014 LIFL, CEA LIST, and others.
+ * Copyright (c) 2009, 2016 LIFL, CEA LIST, Christian W. Damus, and others.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -9,6 +9,7 @@
* Contributors:
* Cedric Dumoulin Cedric.dumoulin@lifl.fr - Initial API and implementation
* Christian W. Damus (CEA) - bug 437217
+ * Christian W. Damus - bug 488791
*
*****************************************************************************/
package org.eclipse.papyrus.infra.core.sasheditor.internal;
@@ -273,7 +274,12 @@ public class SashWindowsContainer implements ISashWindowsContainer {
* <li>properties are cleaned in order to help the GC</li>
* <li>swt controls are not disposed again</li>
* </ul>
- * <li></li> <li></li> <li></li> <li></li> <li></li> </ul>
+ * <li></li>
+ * <li></li>
+ * <li></li>
+ * <li></li>
+ * <li></li>
+ * </ul>
*
*/
public void dispose() {
@@ -557,7 +563,7 @@ public class SashWindowsContainer implements ISashWindowsContainer {
return visitor.getVisiblePages();
}
-
+
/**
*
* @see org.eclipse.papyrus.infra.core.sasheditor.editor.ISashWindowsContainer#getNextPage()
@@ -569,7 +575,7 @@ public class SashWindowsContainer implements ISashWindowsContainer {
CollectNextPageVisitor visitor = new CollectNextPageVisitor(false);
return getPage(visitor);
}
-
+
/**
*
* @see org.eclipse.papyrus.infra.core.sasheditor.editor.ISashWindowsContainer#getNextPage()
@@ -581,15 +587,15 @@ public class SashWindowsContainer implements ISashWindowsContainer {
CollectNextPageVisitor visitor = new CollectNextPageVisitor(true);
return getPage(visitor);
}
-
+
/**
* Use the provided visitor to get the next page and return it.
*/
private IPage getPage(CollectNextPageVisitor visitor) {
if (visitor != null) {
- rootPart.visit(visitor);
+ rootPart.visit(visitor);
if (!visitor.getNextPages().isEmpty()) {
- return (IPage) visitor.getNextPages().get(0);
+ return visitor.getNextPages().get(0);
}
}
return null;
@@ -885,8 +891,10 @@ public class SashWindowsContainer implements ISashWindowsContainer {
* Visit the Part associated to the container. This method visibility is protected in order to be able to access it
* from junit tests.
* It is not intended to be used by public API or from outside.
+ *
+ * @noreference This method is not intended to be referenced by clients.
*/
- protected void visit(IPartVisitor visitor) {
+ public void visit(IPartVisitor visitor) {
rootPart.visit(visitor);
}
@@ -1314,7 +1322,7 @@ public class SashWindowsContainer implements ISashWindowsContainer {
}
}
-
+
/**
* Inner class.
* A visitor used to collect the next page of the next opened tab (right or left).
@@ -1323,7 +1331,7 @@ public class SashWindowsContainer implements ISashWindowsContainer {
private class CollectNextPageVisitor extends PartVisitor {
private List<IPage> nextPages = new ArrayList<IPage>();
-
+
private final boolean isPrevious;
/**
@@ -1348,14 +1356,14 @@ public class SashWindowsContainer implements ISashWindowsContainer {
public boolean accept(TabFolderPart part) {
PagePart activePage = activePageTracker.getActiveEditor();
PagePart visiblePage = part.getVisiblePagePart();
-
+
if (activePage == visiblePage) {
CTabFolder tabFolder = part.getTabFolder();
int itemCount = tabFolder.getItemCount();
-
+
if (itemCount > 1) {
int selectionIndex = tabFolder.getSelectionIndex();
-
+
if (isPrevious) {
selectionIndex--;
if (selectionIndex < 0) {
@@ -1367,14 +1375,14 @@ public class SashWindowsContainer implements ISashWindowsContainer {
selectionIndex = 0;
}
}
-
+
IPage nextPage = part.getPagePart(selectionIndex);
if (nextPage != null) {
nextPages.add(nextPage);
}
}
}
-
+
return true;
}
}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/META-INF/MANIFEST.MF b/plugins/infra/core/org.eclipse.papyrus.infra.core/META-INF/MANIFEST.MF
index 13277bf4d84..7d28645a912 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/META-INF/MANIFEST.MF
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/META-INF/MANIFEST.MF
@@ -4,6 +4,7 @@ Export-Package: org.eclipse.papyrus.infra.core,
org.eclipse.papyrus.infra.core.editor,
org.eclipse.papyrus.infra.core.extension,
org.eclipse.papyrus.infra.core.internal.expressions;x-internal:=true,
+ org.eclipse.papyrus.infra.core.internal.language;x-internal:=true,
org.eclipse.papyrus.infra.core.internal.sashmodel;x-internal:=true,
org.eclipse.papyrus.infra.core.language,
org.eclipse.papyrus.infra.core.listenerservice,
@@ -15,6 +16,7 @@ Export-Package: org.eclipse.papyrus.infra.core,
org.eclipse.papyrus.infra.core.resource.additional,
org.eclipse.papyrus.infra.core.resource.sasheditor,
org.eclipse.papyrus.infra.core.services,
+ org.eclipse.papyrus.infra.core.services.internal;x-internal:=true,
org.eclipse.papyrus.infra.core.services.spi,
org.eclipse.papyrus.infra.core.utils
Require-Bundle: org.eclipse.emf.workspace;bundle-version="[1.5.0,2.0.0)",

Back to the top