Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCamille Letavernier2014-02-17 09:57:21 -0500
committerCamille Letavernier2014-02-17 10:35:24 -0500
commitd4e5df984084fecf43efa22fa398d18dcdfb3a62 (patch)
treedf85369458d8b3f848b5a12e6df39cfaef519f59
parent486f94f98343d30f35398005eec21d23af83f64d (diff)
downloadorg.eclipse.papyrus-d4e5df984084fecf43efa22fa398d18dcdfb3a62.tar.gz
org.eclipse.papyrus-d4e5df984084fecf43efa22fa398d18dcdfb3a62.tar.xz
org.eclipse.papyrus-d4e5df984084fecf43efa22fa398d18dcdfb3a62.zip
[Tests] Fix various regressions based on test results (SashEditor, CSS,
ExtendedTypes)
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/SimpleSashWindowsContentProvider.java79
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/singlefolder/SingleFolderContentProvider.java34
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/EnumerationPreferencePage.java7
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.pkg/plugin.xml204
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.pkg/src-gen/org/eclipse/papyrus/uml/diagram/pkg/preferences/ModelPreferencePage.java4
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.pkg/src-gen/org/eclipse/papyrus/uml/diagram/pkg/preferences/PackagePreferencePage.java4
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.pkg/src/org/eclipse/papyrus/uml/diagram/pkg/CustomModelPreferencePage.java2
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.pkg/src/org/eclipse/papyrus/uml/diagram/pkg/CustomPackagePreferencePage.java2
-rw-r--r--tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/tests/AllTests.java2
-rw-r--r--tests/junit/plugins/core/org.eclipse.papyrus.tests/META-INF/MANIFEST.MF3
-rw-r--r--tests/junit/plugins/core/org.eclipse.papyrus.tests/test/org/eclipse/papyrus/tests/AllTests.java2
11 files changed, 270 insertions, 73 deletions
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/SimpleSashWindowsContentProvider.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/SimpleSashWindowsContentProvider.java
index 48690ff6ae3..f3482d4a5ed 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/SimpleSashWindowsContentProvider.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/simple/SimpleSashWindowsContentProvider.java
@@ -23,6 +23,7 @@ import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IContentChanged
import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel;
import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashWindowsContentProvider;
import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel;
+import org.eclipse.papyrus.infra.core.sasheditor.internal.SashWindowsContainer;
import org.eclipse.swt.SWT;
/**
@@ -95,42 +96,26 @@ public class SimpleSashWindowsContentProvider implements ISashWindowsContentProv
* Add the page which should be an IPageModel instance. {@inheritDoc}
*/
public void addPage(Object newModel, int index) {
- addPage((IPageModel)newModel, index);
+ addPage(index, (IPageModel)newModel);
}
- /**
- *
- * {@inheritDoc}
- */
public void addPage(IPageModel newModel) {
currentTabFolder.doAddItem(newModel);
firePropertyChanged(new ContentEvent(ContentEvent.ADDED, this, newModel));
}
- /**
- *
- * {@inheritDoc}
- */
public void addPage(ITabFolderModel toFolderModel, IPageModel newModel) {
TabFolderModel srcFolder = (TabFolderModel)toFolderModel;
srcFolder.doAddItem(newModel);
firePropertyChanged(new ContentEvent(ContentEvent.ADDED, this, newModel));
}
- /**
- *
- * {@inheritDoc}
- */
- public void addPage(IPageModel newModel, int index) {
+ public void addPage(int index, IPageModel newModel) {
currentTabFolder.doAddItem(index, newModel);
firePropertyChanged(new ContentEvent(ContentEvent.ADDED, this, newModel));
}
- /**
- *
- * {@inheritDoc}
- */
- public void addPage(ITabFolderModel toFolderModel, IPageModel newModel, int index) {
+ public void addPage(ITabFolderModel toFolderModel, int index, IPageModel newModel) {
TabFolderModel srcFolder = (TabFolderModel)toFolderModel;
srcFolder.doAddItem(index, newModel);
firePropertyChanged(new ContentEvent(ContentEvent.ADDED, this, newModel));
@@ -184,7 +169,7 @@ public class SimpleSashWindowsContentProvider implements ISashWindowsContentProv
* @param targetFolderModel
*/
private void doSetCurrentFolder(TabFolderModel newCurrentFolder) {
- currentTabFolder = (TabFolderModel)newCurrentFolder;
+ currentTabFolder = newCurrentFolder;
}
/**
@@ -192,25 +177,29 @@ public class SimpleSashWindowsContentProvider implements ISashWindowsContentProv
*
* The change event is sent only once after the complete operation is performed. {@inheritDoc}
*
- * @param referenceFolder The folder used as reference to insert the newly created Folder.
- * @param side The side to which the created folder is inserted. Can be SWT.TOP, DOWN, LEFT, RIGHT.
+ * @param referenceFolder
+ * The folder used as reference to insert the newly created Folder.
+ * @param side
+ * The side to which the created folder is inserted. Can be SWT.TOP, DOWN, LEFT, RIGHT.
*/
public void createFolder(ITabFolderModel sourceFolder, int tabIndex, ITabFolderModel referenceFolder, int side) {
org.eclipse.papyrus.infra.core.sasheditor.Activator.log.debug("createFolder()");
- ITabFolderModel newFolder = doCreateFolder((TabFolderModel)sourceFolder, tabIndex, (TabFolderModel)referenceFolder, side);
+ doCreateFolder((TabFolderModel)sourceFolder, tabIndex, (TabFolderModel)referenceFolder, side);
contentChangedListenerManager.fireContentChanged(new ContentEvent(ContentEvent.CHANGED, this, sourceFolder));
// return newFolder;
}
/**
* Create a new folder and insert it at the specified side of the reference folder.
- * The change event is sent only once after the complete operation is performed.
+ * The change event is sent only once after the complete operation is performed.
*
* This method is not part of the {@link SashWindowsContainer} API. It is here to help writing junit tests.
*
- * @param referenceFolder The folder used as reference to insert the newly created Folder.
- * @param side The side to which the created folder is inserted. Can be SWT.TOP, DOWN, LEFT, RIGHT.
+ * @param referenceFolder
+ * The folder used as reference to insert the newly created Folder.
+ * @param side
+ * The side to which the created folder is inserted. Can be SWT.TOP, DOWN, LEFT, RIGHT.
*/
public ITabFolderModel createFolder(ITabFolderModel referenceFolder, int side) {
org.eclipse.papyrus.infra.core.sasheditor.Activator.log.debug("createFolder()");
@@ -236,17 +225,17 @@ public class SimpleSashWindowsContentProvider implements ISashWindowsContentProv
/**
* Move a tab from folder to folder.
* The tab is added at the end of the target folder.
- * The change event is sent only once after the complete operation is performed. {@inheritDoc}
+ * The change event is sent only once after the complete operation is performed.
*/
private void doMoveTab(TabFolderModel srcFolderModel, int sourceIndex, TabFolderModel targetFolderModel) {
// Move all
- if( sourceIndex < 0) {
+ if(sourceIndex < 0) {
targetFolderModel.getChildren().addAll(srcFolderModel.getChildren());
srcFolderModel.getChildren().clear();
return;
}
-
+
IPageModel tab = srcFolderModel.doRemoveTab(sourceIndex);
targetFolderModel.doAddItem(tab);
}
@@ -292,13 +281,15 @@ public class SimpleSashWindowsContentProvider implements ISashWindowsContentProv
*/
private void removeEmptyFolder(TabFolderModel tabFolder) {
// Check if empty
- if(tabFolder.getChildren().size() > 0)
+ if(tabFolder.getChildren().size() > 0) {
return;
+ }
AbstractModel parent = tabFolder.getParent();
// Forbid removing of the last folder
- if(parent == rootModel)
+ if(parent == rootModel) {
return;
+ }
// Parent is a sash. Ask it to remove the child and itself
((SashPanelModel)parent).delete(tabFolder);
@@ -319,10 +310,11 @@ public class SimpleSashWindowsContentProvider implements ISashWindowsContentProv
int direction;
// Compute sash direction
- if(side == SWT.LEFT || side == SWT.RIGHT)
+ if(side == SWT.LEFT || side == SWT.RIGHT) {
direction = SWT.HORIZONTAL;
- else
+ } else {
direction = SWT.VERTICAL;
+ }
// Create sash
if(side == SWT.LEFT || side == SWT.UP) {
newSash = new SashPanelModel(refParent, folderToInsert, refFolder, direction);
@@ -371,13 +363,13 @@ public class SimpleSashWindowsContentProvider implements ISashWindowsContentProv
}
/**
- * Remove the specified tab from its parent. {@inheritDoc}
+ * Remove the specified tab from its parent.
*/
public void removePage(IPageModel tabItem) {
TabFolderModel folder = lookupPageFolder(tabItem);
-// if(folder != null)
-// folder.removeTab(tabItem);
+ // if(folder != null)
+ // folder.removeTab(tabItem);
if(folder != null) {
folder.doRemoveTab(tabItem);
removeEmptyFolder(folder);
@@ -469,12 +461,14 @@ public class SimpleSashWindowsContentProvider implements ISashWindowsContentProv
* @param listener
*/
public void addContentChangedListener(IContentChangedListener listener) {
- if(listeners == null)
+ if(listeners == null) {
createListeners();
+ }
// Check if already exists.
- if(listeners.contains(listener))
+ if(listeners.contains(listener)) {
return;
+ }
listeners.add(listener);
}
@@ -486,8 +480,9 @@ public class SimpleSashWindowsContentProvider implements ISashWindowsContentProv
* @param listener
*/
public void removeContentChangedListener(IContentChangedListener listener) {
- if(listeners == null)
+ if(listeners == null) {
return;
+ }
listeners.remove(listener);
}
@@ -496,8 +491,9 @@ public class SimpleSashWindowsContentProvider implements ISashWindowsContentProv
* Create the list of listeners.
*/
private void createListeners() {
- if(listeners == null)
+ if(listeners == null) {
listeners = new ArrayList<IContentChangedListener>();
+ }
}
@@ -507,8 +503,9 @@ public class SimpleSashWindowsContentProvider implements ISashWindowsContentProv
* @param event
*/
public void fireContentChanged(ContentEvent event) {
- if(listeners == null)
+ if(listeners == null) {
return;
+ }
for(IContentChangedListener listener : listeners) {
listener.contentChanged(event);
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/singlefolder/SingleFolderContentProvider.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/singlefolder/SingleFolderContentProvider.java
index 9fab42698f2..4fba90e6770 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/singlefolder/SingleFolderContentProvider.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/contentprovider/singlefolder/SingleFolderContentProvider.java
@@ -86,23 +86,15 @@ public class SingleFolderContentProvider implements ISashWindowsContentProvider,
* Add the page which should be an IPageModel instance. {@inheritDoc}
*/
public void addPage(Object newModel, int index) {
- addPage((IPageModel)newModel, index);
+ addPage(index, (IPageModel)newModel);
}
- /**
- *
- * {@inheritDoc}
- */
public void addPage(IPageModel newModel) {
currentTabFolder.addItem(newModel);
}
- /**
- *
- * {@inheritDoc}
- */
- public void addPage(IPageModel newModel, int index) {
+ public void addPage(int index, IPageModel newModel) {
currentTabFolder.addItem(index, newModel);
}
@@ -110,7 +102,7 @@ public class SingleFolderContentProvider implements ISashWindowsContentProvider,
* Do nothing because this implementation doesn't allows folders. {@inheritDoc}
*/
public void createFolder(ITabFolderModel tabFolder, int tabIndex, ITabFolderModel targetFolder, int side) {
-
+ //Nothing
}
/**
@@ -145,10 +137,6 @@ public class SingleFolderContentProvider implements ISashWindowsContentProvider,
currentTabFolder.removeTab(index);
}
- /**
- *
- * {@inheritDoc}
- */
public void removePage(IPageModel tabItem) {
currentTabFolder.removeTab(tabItem);
}
@@ -177,6 +165,7 @@ public class SingleFolderContentProvider implements ISashWindowsContentProvider,
* @param rawModel
*/
public void setCurrentFolder(Object rawModel) {
+ //Nothing
}
/**
@@ -195,12 +184,14 @@ public class SingleFolderContentProvider implements ISashWindowsContentProvider,
* @param listener
*/
public void addContentChangedListener(IContentChangedListener listener) {
- if(listeners == null)
+ if(listeners == null) {
createListeners();
+ }
// Check if already exists.
- if(listeners.contains(listener))
+ if(listeners.contains(listener)) {
return;
+ }
listeners.add(listener);
}
@@ -212,8 +203,9 @@ public class SingleFolderContentProvider implements ISashWindowsContentProvider,
* @param listener
*/
public void removeContentChangedListener(IContentChangedListener listener) {
- if(listeners == null)
+ if(listeners == null) {
return;
+ }
listeners.remove(listener);
}
@@ -222,8 +214,9 @@ public class SingleFolderContentProvider implements ISashWindowsContentProvider,
* Create the list of listeners.
*/
private void createListeners() {
- if(listeners == null)
+ if(listeners == null) {
listeners = new ArrayList<IContentChangedListener>();
+ }
}
@@ -233,8 +226,9 @@ public class SingleFolderContentProvider implements ISashWindowsContentProvider,
* @param event
*/
public void fireContentChanged(ContentEvent event) {
- if(listeners == null)
+ if(listeners == null) {
return;
+ }
for(IContentChangedListener listener : listeners) {
listener.contentChanged(event);
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/EnumerationPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/EnumerationPreferencePage.java
index 79e281d4684..2b615ec78fb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/EnumerationPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/EnumerationPreferencePage.java
@@ -29,7 +29,7 @@ public class EnumerationPreferencePage extends AbstractPapyrusNodePreferencePage
/**
* @generated
*/
- public static final String compartments[] = { "EnumerationLiteralCompartment" };
+ public static final String compartments[] = { "literals" };
/**
* @generated
@@ -89,7 +89,7 @@ public class EnumerationPreferencePage extends AbstractPapyrusNodePreferencePage
*/
private static TreeMap<String, Boolean> getStaticCompartmentVisibilityPreferences() {
TreeMap<String, Boolean> map = new TreeMap<String, Boolean>();
- map.put("EnumerationLiteralCompartment", Boolean.TRUE);
+ map.put("literals", Boolean.TRUE);
return map;
}
@@ -98,13 +98,14 @@ public class EnumerationPreferencePage extends AbstractPapyrusNodePreferencePage
*/
private static TreeMap<String, Boolean> getStaticCompartmentTitleVisibilityPreferences() {
TreeMap<String, Boolean> map = new TreeMap<String, Boolean>();
- map.put("EnumerationLiteralCompartment", Boolean.FALSE);
+ map.put("literals", Boolean.FALSE);
return map;
}
/**
* @generated
*/
+ @Override
protected TreeMap<String, Boolean> getCompartmentTitleVisibilityPreferences() {
return getStaticCompartmentTitleVisibilityPreferences();
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.pkg/plugin.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.pkg/plugin.xml
index 9b056b8a84a..c7d6758a721 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.pkg/plugin.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.pkg/plugin.xml
@@ -478,6 +478,210 @@
<diagramMappings diagramID="Package">
<mapping type="Package" humanReadableType="PackageDiagram"/>
<!-- Compartments -->
+ <mapping
+ humanReadableType="attributes"
+ type="7011">
+ </mapping>
+
+ <mapping
+ humanReadableType="operations"
+ type="7012">
+ </mapping>
+
+ <mapping
+ humanReadableType="nested classifiers"
+ type="7013">
+ </mapping>
+
+ <mapping
+ humanReadableType="attributes"
+ type="7023">
+ </mapping>
+
+ <mapping
+ humanReadableType="operations"
+ type="7024">
+ </mapping>
+
+ <mapping
+ humanReadableType="nested classifiers"
+ type="7025">
+ </mapping>
+
+ <mapping
+ humanReadableType="attributes"
+ type="7026">
+ </mapping>
+
+ <mapping
+ humanReadableType="attributes"
+ type="7027">
+ </mapping>
+
+ <mapping
+ humanReadableType="operations"
+ type="7028">
+ </mapping>
+
+ <mapping
+ humanReadableType="nested classifiers"
+ type="7029">
+ </mapping>
+
+ <mapping
+ humanReadableType="attributes"
+ type="7041">
+ </mapping>
+
+ <mapping
+ humanReadableType="operations"
+ type="7042">
+ </mapping>
+
+ <mapping
+ humanReadableType="attributes"
+ type="7032">
+ </mapping>
+
+ <mapping
+ humanReadableType="operations"
+ type="7033">
+ </mapping>
+
+ <mapping
+ humanReadableType="packaged elements"
+ type="7030">
+ </mapping>
+
+ <mapping
+ humanReadableType="packaged elements"
+ type="7010">
+ </mapping>
+
+ <mapping
+ humanReadableType="literals"
+ type="7031">
+ </mapping>
+
+ <mapping
+ humanReadableType="slots"
+ type="7035">
+ </mapping>
+
+ <mapping
+ humanReadableType="attributes"
+ type="7017">
+ </mapping>
+
+ <mapping
+ humanReadableType="operations"
+ type="7018">
+ </mapping>
+
+ <mapping
+ humanReadableType="nested classifiers"
+ type="7019">
+ </mapping>
+
+ <mapping
+ humanReadableType="attributes"
+ type="7002">
+ </mapping>
+
+ <mapping
+ humanReadableType="operations"
+ type="7003">
+ </mapping>
+
+ <mapping
+ humanReadableType="nested classifiers"
+ type="7004">
+ </mapping>
+
+ <mapping
+ humanReadableType="attributes"
+ type="7006">
+ </mapping>
+
+ <mapping
+ humanReadableType="operations"
+ type="7007">
+ </mapping>
+
+ <mapping
+ humanReadableType="nested classifiers"
+ type="7008">
+ </mapping>
+
+ <mapping
+ humanReadableType="attributes"
+ type="7039">
+ </mapping>
+
+ <mapping
+ humanReadableType="operations"
+ type="7040">
+ </mapping>
+
+ <mapping
+ humanReadableType="attributes"
+ type="7020">
+ </mapping>
+
+ <mapping
+ humanReadableType="operations"
+ type="7021">
+ </mapping>
+
+ <mapping
+ humanReadableType="attributes"
+ type="7034">
+ </mapping>
+
+ <mapping
+ humanReadableType="slots"
+ type="7001">
+ </mapping>
+
+ <mapping
+ humanReadableType="attributes"
+ type="7005">
+ </mapping>
+
+ <mapping
+ humanReadableType="packaged elements"
+ type="7009">
+ </mapping>
+
+ <mapping
+ humanReadableType="packaged elements"
+ type="7016">
+ </mapping>
+
+ <mapping
+ humanReadableType="literals"
+ type="7015">
+ </mapping>
+
+ <mapping
+ humanReadableType="operations"
+ type="7036">
+ </mapping>
+
+ <mapping
+ humanReadableType="nested classifiers"
+ type="7037">
+ </mapping>
+
+ <mapping
+ humanReadableType="TemplateParameter"
+ type="7014">
+ </mapping>
+
+ <mapping
+ humanReadableType="TemplateParameter"
+ type="7038">
+ </mapping>
<!-- Link labels -->
</diagramMappings>
</extension>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.pkg/src-gen/org/eclipse/papyrus/uml/diagram/pkg/preferences/ModelPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.pkg/src-gen/org/eclipse/papyrus/uml/diagram/pkg/preferences/ModelPreferencePage.java
index b65cdb493dd..e5684450c39 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.pkg/src-gen/org/eclipse/papyrus/uml/diagram/pkg/preferences/ModelPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.pkg/src-gen/org/eclipse/papyrus/uml/diagram/pkg/preferences/ModelPreferencePage.java
@@ -35,10 +35,10 @@ public class ModelPreferencePage extends PackageDiagramNodePreferencePage {
/** Static attribute initialization */
static {
compartmentDefaultVisibilityMap = new LinkedHashMap<String, Boolean>();
- compartmentDefaultVisibilityMap.put("PackageableElementCompartment", Boolean.TRUE); //$NON-NLS-1$
+ compartmentDefaultVisibilityMap.put("packaged elements", Boolean.TRUE); //$NON-NLS-1$
compartmentTitleDefaultVisibilityMap = new LinkedHashMap<String, Boolean>();
- compartmentTitleDefaultVisibilityMap.put("PackageableElementCompartment", Boolean.TRUE); //$NON-NLS-1$
+ compartmentTitleDefaultVisibilityMap.put("packaged elements", Boolean.TRUE); //$NON-NLS-1$
// Start of user code custom static initializations
// End of user code
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.pkg/src-gen/org/eclipse/papyrus/uml/diagram/pkg/preferences/PackagePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.pkg/src-gen/org/eclipse/papyrus/uml/diagram/pkg/preferences/PackagePreferencePage.java
index 981e2158c01..b765504af9f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.pkg/src-gen/org/eclipse/papyrus/uml/diagram/pkg/preferences/PackagePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.pkg/src-gen/org/eclipse/papyrus/uml/diagram/pkg/preferences/PackagePreferencePage.java
@@ -35,10 +35,10 @@ public class PackagePreferencePage extends PackageDiagramNodePreferencePage {
/** Static attribute initialization */
static {
compartmentDefaultVisibilityMap = new LinkedHashMap<String, Boolean>();
- compartmentDefaultVisibilityMap.put("PackageableElementCompartment", Boolean.TRUE); //$NON-NLS-1$
+ compartmentDefaultVisibilityMap.put("packaged elements", Boolean.TRUE); //$NON-NLS-1$
compartmentTitleDefaultVisibilityMap = new LinkedHashMap<String, Boolean>();
- compartmentTitleDefaultVisibilityMap.put("PackageableElementCompartment", Boolean.TRUE); //$NON-NLS-1$
+ compartmentTitleDefaultVisibilityMap.put("packaged elements", Boolean.TRUE); //$NON-NLS-1$
// Start of user code custom static initializations
// End of user code
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.pkg/src/org/eclipse/papyrus/uml/diagram/pkg/CustomModelPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.pkg/src/org/eclipse/papyrus/uml/diagram/pkg/CustomModelPreferencePage.java
index d51b074bd9d..9f2c29565fd 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.pkg/src/org/eclipse/papyrus/uml/diagram/pkg/CustomModelPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.pkg/src/org/eclipse/papyrus/uml/diagram/pkg/CustomModelPreferencePage.java
@@ -20,7 +20,7 @@ import org.eclipse.papyrus.uml.diagram.pkg.preferences.ModelPreferencePage;
public class CustomModelPreferencePage extends ModelPreferencePage {
static {
- compartmentTitleDefaultVisibilityMap.put("PackageableElementCompartment", Boolean.FALSE); //$NON-NLS-1$
+ compartmentTitleDefaultVisibilityMap.put("packaged elements", Boolean.FALSE); //$NON-NLS-1$
}
/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.pkg/src/org/eclipse/papyrus/uml/diagram/pkg/CustomPackagePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.pkg/src/org/eclipse/papyrus/uml/diagram/pkg/CustomPackagePreferencePage.java
index 1e2c4baac7f..7332b08f5b9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.pkg/src/org/eclipse/papyrus/uml/diagram/pkg/CustomPackagePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.pkg/src/org/eclipse/papyrus/uml/diagram/pkg/CustomPackagePreferencePage.java
@@ -20,7 +20,7 @@ import org.eclipse.papyrus.uml.diagram.pkg.preferences.PackagePreferencePage;
public class CustomPackagePreferencePage extends PackagePreferencePage {
static {
- compartmentTitleDefaultVisibilityMap.put("PackageableElementCompartment", Boolean.FALSE); //$NON-NLS-1$
+ compartmentTitleDefaultVisibilityMap.put("packaged elements", Boolean.FALSE); //$NON-NLS-1$
}
/**
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/tests/AllTests.java b/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/tests/AllTests.java
index 153a1a60b01..b8e961a87e7 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/tests/AllTests.java
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/tests/AllTests.java
@@ -28,5 +28,5 @@ org.eclipse.papyrus.infra.core.sasheditor.internal.AllTests.class,
org.eclipse.papyrus.infra.core.sasheditor.tests.texteditor.AllTests.class
})
public class AllTests {
-
+ //Testsuite
}
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/core/org.eclipse.papyrus.tests/META-INF/MANIFEST.MF
index fada8580ad3..d19c63bc9d1 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.tests/META-INF/MANIFEST.MF
@@ -38,7 +38,8 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.papyrus.uml.tools.tests;bundle-version="0.10.2",
org.eclipse.papyrus.uml.diagram.interactionoverview.tests;bundle-version="0.10.2",
org.eclipse.papyrus.uml.diagram.sequence.tests;bundle-version="0.10.2",
- org.eclipse.papyrus.uml.diagram.composite.tests;bundle-version="0.10.2"
+ org.eclipse.papyrus.uml.diagram.composite.tests;bundle-version="0.10.2",
+ org.eclipse.papyrus.infra.extendedtypes.tests;bundle-version="0.10.2"
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
Bundle-Version: 0.10.2.qualifier
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.tests/test/org/eclipse/papyrus/tests/AllTests.java b/tests/junit/plugins/core/org.eclipse.papyrus.tests/test/org/eclipse/papyrus/tests/AllTests.java
index 8cbfb3ed0fd..7b8933a19e5 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.tests/test/org/eclipse/papyrus/tests/AllTests.java
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.tests/test/org/eclipse/papyrus/tests/AllTests.java
@@ -44,7 +44,7 @@ public class AllTests {
suiteClasses.add(new FragmentTestSuiteClass(org.eclipse.papyrus.infra.services.edit.Activator.PLUGIN_ID, "org.eclipse.papyrus.infra.services.edit.tests.suites.AllTests"));
suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.services.labelprovider.tests.AllTests.class));
suiteClasses.add(new FragmentTestSuiteClass(org.eclipse.papyrus.infra.emf.Activator.PLUGIN_ID, "org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForResourceTest"));
- suiteClasses.add(new FragmentTestSuiteClass(org.eclipse.papyrus.infra.extendedtypes.Activator.PLUGIN_ID, "org.eclipse.papyrus.infra.extendedtypes.AllTests"));
+ suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.extendedtypes.tests.AllTests.class));
// suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.services.openelement.tests.AllTests.class));
/* views */
suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.views.modelexplorer.tests.AllTests.class));

Back to the top