Commit b02f2507 authored by Carmen Carlan's avatar Carmen Carlan

Different ecore models for safety cases and requirements patterns. (working version)

parent beed03dc
......@@ -31,7 +31,7 @@
<modelEditorBinding
binding="org.fortiss.af3.safetycases.ui.editor.FormForNewDefinitionsEditorBinding">
<modelElementClass
modelElementClass="org.fortiss.af3.safetycases.model.requirementsPattern.RequirementsPattern">
modelElementClass="org.fortiss.af3.requirementspatterns.model.RequirementsPattern">
</modelElementClass>
</modelEditorBinding>
</extension>
......@@ -148,37 +148,37 @@
<modelElementHandler
handler="org.fortiss.af3.safetycases.ui.handler.PatternsDatabaseHandler">
<modelElementClass
modelElementClass="org.fortiss.af3.safetycases.model.requirementsPattern.PatternsDatabase">
modelElementClass="org.fortiss.af3.requirementspatterns.model.PatternsDatabase">
</modelElementClass>
</modelElementHandler>
<modelElementHandler
handler="org.fortiss.af3.safetycases.ui.handler.WordAndObjectTypeHandler">
<modelElementClass
modelElementClass="org.fortiss.af3.safetycases.model.requirementsPattern.WordAndObjectType">
modelElementClass="org.fortiss.af3.requirementspatterns.model.WordAndObjectType">
</modelElementClass>
</modelElementHandler>
<modelElementHandler
handler="org.fortiss.af3.safetycases.ui.handler.RequirementsPatternHandler">
<modelElementClass
modelElementClass="org.fortiss.af3.safetycases.model.requirementsPattern.RequirementsPattern">
modelElementClass="org.fortiss.af3.requirementspatterns.model.RequirementsPattern">
</modelElementClass>
</modelElementHandler>
<modelElementHandler
handler="org.fortiss.af3.safetycases.ui.handler.SentenceHandler">
<modelElementClass
modelElementClass="org.fortiss.af3.safetycases.model.requirementsPattern.Sentence">
modelElementClass="org.fortiss.af3.requirementspatterns.model.Sentence">
</modelElementClass>
</modelElementHandler>
<modelElementHandler
handler="org.fortiss.af3.safetycases.ui.handler.LibraryPatternsDatabaseHandler">
<modelElementClass
modelElementClass="org.fortiss.af3.safetycases.model.requirementsPattern.LibraryPatternsDatabase">
modelElementClass="org.fortiss.af3.requirementspatterns.model.LibraryPatternsDatabase">
</modelElementClass>
</modelElementHandler>
<modelElementHandler
handler="org.fortiss.af3.safetycases.ui.handler.LibraryPatternsDatabasePackageHandler">
<modelElementClass
modelElementClass="org.fortiss.af3.safetycases.model.requirementsPattern.LibraryPatternsDatabasePackage">
modelElementClass="org.fortiss.af3.requirementspatterns.model.LibraryPatternsDatabasePackage">
</modelElementClass>
</modelElementHandler>
</extension>
......@@ -319,19 +319,19 @@
<modelElementCompositor
compositor="org.fortiss.af3.safetycases.ui.compose.PatternsDatabaseCompositor">
<modelElementClass
modelElementClass="org.fortiss.af3.safetycases.model.requirementsPattern.PatternsDatabase">
modelElementClass="org.fortiss.af3.requirementspatterns.model.PatternsDatabase">
</modelElementClass>
</modelElementCompositor>
<modelElementCompositor
compositor="org.fortiss.af3.safetycases.ui.compose.SentenceCompositor">
<modelElementClass
modelElementClass="org.fortiss.af3.safetycases.model.requirementsPattern.Sentence">
modelElementClass="org.fortiss.af3.requirementspatterns.model.Sentence">
</modelElementClass>
</modelElementCompositor>
<modelElementCompositor
compositor="org.fortiss.af3.safetycases.ui.compose.RequirementsPatternCompositor">
<modelElementClass
modelElementClass="org.fortiss.af3.safetycases.model.requirementsPattern.RequirementsPattern">
modelElementClass="org.fortiss.af3.requirementspatterns.model.RequirementsPattern">
</modelElementClass>
</modelElementCompositor>
</extension>
......@@ -514,7 +514,7 @@
id="org.fortiss.af3.safetycases.ui.properties.SentencePropertySection"
tab="org.fortiss.tooling.kernel.ui.property.tab.general">
<input
type="org.fortiss.af3.safetycases.model.requirementsPattern.Sentence">
type="org.fortiss.af3.requirementspatterns.model.Sentence">
</input>
</propertySection>
<propertySection
......@@ -523,7 +523,7 @@
id="org.fortiss.af3.safetycases.ui.properties.WordPropertySentence"
tab="org.fortiss.tooling.kernel.ui.property.tab.general">
<input
type="org.fortiss.af3.safetycases.model.requirementsPattern.WordAndObjectType">
type="org.fortiss.af3.requirementspatterns.model.WordAndObjectType">
</input>
</propertySection>
<propertySection
......
......@@ -31,10 +31,10 @@ import org.eclipse.jface.action.ActionContributionItem;
import org.eclipse.jface.action.IContributionItem;
import org.eclipse.ui.PlatformUI;
import org.fortiss.af3.project.model.FileProject;
import org.fortiss.af3.safetycases.model.requirementsPattern.LibraryPatternsDatabase;
import org.fortiss.af3.safetycases.model.requirementsPattern.PatternsDatabase;
import org.fortiss.af3.safetycases.model.requirementsPattern.PatternsDatabaseRef;
import org.fortiss.af3.safetycases.model.requirementsPattern.RequirementsPatternFactory;
import org.fortiss.af3.requirementspatterns.model.LibraryPatternsDatabase;
import org.fortiss.af3.requirementspatterns.model.PatternsDatabase;
import org.fortiss.af3.requirementspatterns.model.PatternsDatabaseRef;
import org.fortiss.af3.requirementspatterns.model.RequirementsPatternsFactory;
import org.fortiss.af3.safetycases.ui.AF3SafetyCasesUIActivator;
import org.fortiss.tooling.base.model.element.IHierarchicElement;
import org.fortiss.tooling.kernel.extension.data.ITopLevelElement;
......@@ -123,7 +123,7 @@ public class DownloadPatternsDatabaseFromLibrary implements IContextMenuContribu
PatternsDatabase patternsDatabase = patternDatabaseLib.getPatternsDatabase();
final PatternsDatabaseRef ref =
RequirementsPatternFactory.eINSTANCE.createPatternsDatabaseRef();
RequirementsPatternsFactory.eINSTANCE.createPatternsDatabaseRef();
ref.setLibraryElementShadow(EcoreUtil.copy(patternsDatabase));
for(IHierarchicElement element : patternsDatabase.getPatterns()) {
......
......@@ -22,8 +22,8 @@ import static org.fortiss.tooling.base.layout.DefaultLayoutConstants.DEFAULT_GRI
import static org.fortiss.tooling.base.ui.utils.RectangleLayoutUtils.layoutNodeInRoot;
import org.eclipse.emf.ecore.EObject;
import org.fortiss.af3.safetycases.model.requirementsPattern.PatternsDatabase;
import org.fortiss.af3.safetycases.model.requirementsPattern.RequirementsPattern;
import org.fortiss.af3.requirementspatterns.model.PatternsDatabase;
import org.fortiss.af3.requirementspatterns.model.RequirementsPattern;
import org.fortiss.tooling.base.decompose.HierarchicElementCompositorBase;
import org.fortiss.tooling.base.model.element.IHierarchicElement;
import org.fortiss.tooling.base.model.layout.ILayoutedModelElement;
......
......@@ -22,9 +22,9 @@ import static org.fortiss.tooling.base.layout.DefaultLayoutConstants.DEFAULT_GRI
import static org.fortiss.tooling.base.ui.utils.RectangleLayoutUtils.layoutNodeInRoot;
import org.eclipse.emf.ecore.EObject;
import org.fortiss.af3.safetycases.model.requirementsPattern.RequirementsPattern;
import org.fortiss.af3.safetycases.model.requirementsPattern.Sentence;
import org.fortiss.af3.safetycases.model.requirementsPattern.WordAndObjectType;
import org.fortiss.af3.requirementspatterns.model.RequirementsPattern;
import org.fortiss.af3.requirementspatterns.model.Sentence;
import org.fortiss.af3.requirementspatterns.model.WordAndObjectType;
import org.fortiss.tooling.base.decompose.HierarchicElementCompositorBase;
import org.fortiss.tooling.base.model.element.IHierarchicElement;
import org.fortiss.tooling.base.model.layout.ILayoutedModelElement;
......
......@@ -20,8 +20,8 @@ package org.fortiss.af3.safetycases.ui.compose;
import static org.conqat.lib.commons.reflect.ReflectionUtils.isInstanceOfAny;
import org.eclipse.emf.ecore.EObject;
import org.fortiss.af3.safetycases.model.requirementsPattern.Sentence;
import org.fortiss.af3.safetycases.model.requirementsPattern.WordAndObjectType;
import org.fortiss.af3.requirementspatterns.model.Sentence;
import org.fortiss.af3.requirementspatterns.model.WordAndObjectType;
import org.fortiss.tooling.base.decompose.HierarchicElementCompositorBase;
import org.fortiss.tooling.base.model.element.IHierarchicElement;
import org.fortiss.tooling.kernel.extension.IElementCompositor;
......
......@@ -17,17 +17,17 @@ $Id$
+--------------------------------------------------------------------------*/
package org.fortiss.af3.safetycases.ui.editor;
import static org.fortiss.af3.safetycases.model.requirementsPattern.RequirementsPatternPackage.Literals.REQUIREMENTS_PATTERN__ALSO_KNOWN_AS;
import static org.fortiss.af3.safetycases.model.requirementsPattern.RequirementsPatternPackage.Literals.REQUIREMENTS_PATTERN__APPLICABILITY;
import static org.fortiss.af3.safetycases.model.requirementsPattern.RequirementsPatternPackage.Literals.REQUIREMENTS_PATTERN__COLLABORATIONS;
import static org.fortiss.af3.safetycases.model.requirementsPattern.RequirementsPatternPackage.Literals.REQUIREMENTS_PATTERN__CONSEQUENCES;
import static org.fortiss.af3.safetycases.model.requirementsPattern.RequirementsPatternPackage.Literals.REQUIREMENTS_PATTERN__EXAMPLE_TEXTUAL_INFORMATION;
import static org.fortiss.af3.safetycases.model.requirementsPattern.RequirementsPatternPackage.Literals.REQUIREMENTS_PATTERN__IMPLEMENTATION;
import static org.fortiss.af3.safetycases.model.requirementsPattern.RequirementsPatternPackage.Literals.REQUIREMENTS_PATTERN__INTENT;
import static org.fortiss.af3.safetycases.model.requirementsPattern.RequirementsPatternPackage.Literals.REQUIREMENTS_PATTERN__KNOWN_USES;
import static org.fortiss.af3.safetycases.model.requirementsPattern.RequirementsPatternPackage.Literals.REQUIREMENTS_PATTERN__MOTIVATION;
import static org.fortiss.af3.safetycases.model.requirementsPattern.RequirementsPatternPackage.Literals.REQUIREMENTS_PATTERN__PARTICIPANTS;
import static org.fortiss.af3.safetycases.model.requirementsPattern.RequirementsPatternPackage.Literals.REQUIREMENTS_PATTERN__RELATED_PATTERNS;
import static org.fortiss.af3.requirementspatterns.model.RequirementsPatternsPackage.Literals.REQUIREMENTS_PATTERN__ALSO_KNOWN_AS;
import static org.fortiss.af3.requirementspatterns.model.RequirementsPatternsPackage.Literals.REQUIREMENTS_PATTERN__APPLICABILITY;
import static org.fortiss.af3.requirementspatterns.model.RequirementsPatternsPackage.Literals.REQUIREMENTS_PATTERN__COLLABORATIONS;
import static org.fortiss.af3.requirementspatterns.model.RequirementsPatternsPackage.Literals.REQUIREMENTS_PATTERN__CONSEQUENCES;
import static org.fortiss.af3.requirementspatterns.model.RequirementsPatternsPackage.Literals.REQUIREMENTS_PATTERN__EXAMPLE_TEXTUAL_INFORMATION;
import static org.fortiss.af3.requirementspatterns.model.RequirementsPatternsPackage.Literals.REQUIREMENTS_PATTERN__IMPLEMENTATION;
import static org.fortiss.af3.requirementspatterns.model.RequirementsPatternsPackage.Literals.REQUIREMENTS_PATTERN__INTENT;
import static org.fortiss.af3.requirementspatterns.model.RequirementsPatternsPackage.Literals.REQUIREMENTS_PATTERN__KNOWN_USES;
import static org.fortiss.af3.requirementspatterns.model.RequirementsPatternsPackage.Literals.REQUIREMENTS_PATTERN__MOTIVATION;
import static org.fortiss.af3.requirementspatterns.model.RequirementsPatternsPackage.Literals.REQUIREMENTS_PATTERN__PARTICIPANTS;
import static org.fortiss.af3.requirementspatterns.model.RequirementsPatternsPackage.Literals.REQUIREMENTS_PATTERN__RELATED_PATTERNS;
import static org.fortiss.tooling.kernel.utils.KernelModelElementUtils.getRootElement;
import java.util.ArrayList;
......@@ -41,6 +41,9 @@ import org.eclipse.swt.widgets.Event;
import org.eclipse.swt.widgets.Link;
import org.eclipse.swt.widgets.Listener;
import org.eclipse.swt.widgets.Text;
import org.fortiss.af3.requirementspatterns.model.PatternsDatabase;
import org.fortiss.af3.requirementspatterns.model.RequirementsPattern;
import org.fortiss.af3.requirementspatterns.model.Sentence;
import org.fortiss.af3.safetycases.model.ArgumentElement;
import org.fortiss.af3.safetycases.model.ArgumentModule;
import org.fortiss.af3.safetycases.model.Assumption;
......@@ -55,9 +58,6 @@ import org.fortiss.af3.safetycases.model.SafetyCase;
import org.fortiss.af3.safetycases.model.Solution;
import org.fortiss.af3.safetycases.model.Strategy;
import org.fortiss.af3.safetycases.model.SupportedBy;
import org.fortiss.af3.safetycases.model.requirementsPattern.PatternsDatabase;
import org.fortiss.af3.safetycases.model.requirementsPattern.RequirementsPattern;
import org.fortiss.af3.safetycases.model.requirementsPattern.Sentence;
import org.fortiss.tooling.base.ui.editor.FormsEditorBase;
import org.fortiss.tooling.kernel.model.FortissToolingKernelPackage;
import org.fortiss.tooling.kernel.ui.service.IModelEditorBindingService;
......
......@@ -18,7 +18,7 @@ $Id$
package org.fortiss.af3.safetycases.ui.editor;
import org.eclipse.ui.IEditorPart;
import org.fortiss.af3.safetycases.model.requirementsPattern.PatternsDatabase;
import org.fortiss.af3.requirementspatterns.model.PatternsDatabase;
import org.fortiss.tooling.kernel.ui.extension.IModelEditorBinding;
/**
......
package org.fortiss.af3.safetycases.ui.editor;
import org.eclipse.emf.ecore.EObject;
import org.fortiss.af3.requirementspatterns.model.PatternsDatabase;
import org.fortiss.af3.safetycases.model.Assumption;
import org.fortiss.af3.safetycases.model.Context;
import org.fortiss.af3.safetycases.model.EntryConnector;
......@@ -13,7 +14,6 @@ import org.fortiss.af3.safetycases.model.SafetyCase;
import org.fortiss.af3.safetycases.model.Solution;
import org.fortiss.af3.safetycases.model.Strategy;
import org.fortiss.af3.safetycases.model.SupportedBy;
import org.fortiss.af3.safetycases.model.requirementsPattern.PatternsDatabase;
import org.fortiss.tooling.base.ui.editor.DiagramEditorBase;
/**
......
......@@ -24,7 +24,7 @@ import java.util.List;
import org.conqat.lib.commons.collections.CollectionUtils;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.jface.resource.ImageDescriptor;
import org.fortiss.af3.safetycases.model.requirementsPattern.LibraryPatternsDatabase;
import org.fortiss.af3.requirementspatterns.model.LibraryPatternsDatabase;
import org.fortiss.tooling.kernel.ui.extension.IModelElementHandler;
import org.fortiss.tooling.kernel.ui.extension.base.NamedCommentedModelElementHandlerBase;
......
......@@ -24,8 +24,8 @@ import java.util.List;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.jface.resource.ImageDescriptor;
import org.fortiss.af3.safetycases.model.requirementsPattern.LibraryPatternsDatabase;
import org.fortiss.af3.safetycases.model.requirementsPattern.LibraryPatternsDatabasePackage;
import org.fortiss.af3.requirementspatterns.model.LibraryPatternsDatabase;
import org.fortiss.af3.requirementspatterns.model.LibraryPatternsDatabasePackage;
import org.fortiss.tooling.kernel.ui.extension.IModelElementHandler;
import org.fortiss.tooling.kernel.ui.extension.base.NamedCommentedModelElementHandlerBase;
......
......@@ -24,7 +24,7 @@ import java.util.List;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.jface.resource.ImageDescriptor;
import org.fortiss.af3.safetycases.model.requirementsPattern.PatternsDatabase;
import org.fortiss.af3.requirementspatterns.model.PatternsDatabase;
import org.fortiss.tooling.kernel.ui.extension.IModelElementHandler;
import org.fortiss.tooling.kernel.ui.extension.base.NamedCommentedModelElementHandlerBase;
......
......@@ -23,7 +23,7 @@ import java.util.List;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.jface.resource.ImageDescriptor;
import org.fortiss.af3.safetycases.model.requirementsPattern.RequirementsPattern;
import org.fortiss.af3.requirementspatterns.model.RequirementsPattern;
import org.fortiss.tooling.kernel.ui.extension.IModelElementHandler;
import org.fortiss.tooling.kernel.ui.extension.base.NamedCommentedModelElementHandlerBase;
......
......@@ -23,7 +23,7 @@ import java.util.List;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.jface.resource.ImageDescriptor;
import org.fortiss.af3.safetycases.model.requirementsPattern.Sentence;
import org.fortiss.af3.requirementspatterns.model.Sentence;
import org.fortiss.tooling.kernel.ui.extension.IModelElementHandler;
import org.fortiss.tooling.kernel.ui.extension.base.NamedCommentedModelElementHandlerBase;
......
......@@ -23,7 +23,7 @@ import java.util.List;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.jface.resource.ImageDescriptor;
import org.fortiss.af3.safetycases.model.requirementsPattern.WordAndObjectType;
import org.fortiss.af3.requirementspatterns.model.WordAndObjectType;
import org.fortiss.tooling.kernel.ui.extension.IModelElementHandler;
import org.fortiss.tooling.kernel.ui.extension.base.NamedCommentedModelElementHandlerBase;
......
......@@ -27,9 +27,9 @@ import org.eclipse.emf.ecore.EObject;
import org.eclipse.jface.action.Action;
import org.eclipse.jface.action.ActionContributionItem;
import org.eclipse.jface.action.IContributionItem;
import org.fortiss.af3.safetycases.model.requirementsPattern.LibraryPatternsDatabasePackage;
import org.fortiss.af3.safetycases.model.requirementsPattern.PatternsDatabase;
import org.fortiss.af3.safetycases.model.requirementsPattern.PatternsDatabaseRef;
import org.fortiss.af3.requirementspatterns.model.LibraryPatternsDatabasePackage;
import org.fortiss.af3.requirementspatterns.model.PatternsDatabase;
import org.fortiss.af3.requirementspatterns.model.PatternsDatabaseRef;
import org.fortiss.af3.safetycases.ui.AF3SafetyCasesUIActivator;
import org.fortiss.tooling.base.library.ModelElementLibraryService;
import org.fortiss.tooling.kernel.extension.data.ITopLevelElement;
......
......@@ -26,8 +26,8 @@ import org.eclipse.jface.action.Action;
import org.eclipse.jface.action.ActionContributionItem;
import org.eclipse.jface.action.IContributionItem;
import org.fortiss.af3.component.ui.AF3ComponentUIActivator;
import org.fortiss.af3.safetycases.model.requirementsPattern.PatternsDatabase;
import org.fortiss.af3.safetycases.model.requirementsPattern.PatternsDatabaseRef;
import org.fortiss.af3.requirementspatterns.model.PatternsDatabase;
import org.fortiss.af3.requirementspatterns.model.PatternsDatabaseRef;
import org.fortiss.af3.safetycases.utils.SafetyCasesModelElementLibraryService;
import org.fortiss.tooling.kernel.ui.extension.IContextMenuContributor;
import org.fortiss.tooling.kernel.ui.extension.data.ContextMenuContextProvider;
......
......@@ -51,6 +51,9 @@ import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
import org.fortiss.af3.component.model.Component;
import org.fortiss.af3.component.model.ComponentArchitecture;
import org.fortiss.af3.mira.model.Analysis;
import org.fortiss.af3.requirementspatterns.model.PatternsDatabase;
import org.fortiss.af3.requirementspatterns.model.Sentence;
import org.fortiss.af3.requirementspatterns.model.WordAndObjectType;
import org.fortiss.af3.safetycases.model.ArgumentElement;
import org.fortiss.af3.safetycases.model.EntryConnector;
import org.fortiss.af3.safetycases.model.ExitConnector;
......@@ -60,9 +63,6 @@ import org.fortiss.af3.safetycases.model.Module;
import org.fortiss.af3.safetycases.model.OptionEntity;
import org.fortiss.af3.safetycases.model.Solution;
import org.fortiss.af3.safetycases.model.SupportedBy;
import org.fortiss.af3.safetycases.model.requirementsPattern.PatternsDatabase;
import org.fortiss.af3.safetycases.model.requirementsPattern.Sentence;
import org.fortiss.af3.safetycases.model.requirementsPattern.WordAndObjectType;
import org.fortiss.af3.sil.model.SafetyRequirement;
import org.fortiss.tooling.base.ui.fieldassist.FieldAssist;
import org.fortiss.tooling.base.ui.fieldassist.ProposalProviderBase;
......
......@@ -17,8 +17,8 @@ $Id$
+--------------------------------------------------------------------------*/
package org.fortiss.af3.safetycases.ui.properties;
import static org.fortiss.af3.safetycases.model.requirementsPattern.RequirementsPatternPackage.Literals.SENTENCE__SENTENCE;
import static org.fortiss.af3.safetycases.model.requirementsPattern.RequirementsPatternPackage.Literals.SENTENCE__TYPE_OF_GSN_ELEMENT;
import static org.fortiss.af3.requirementspatterns.model.RequirementsPatternsPackage.Literals.SENTENCE__SENTENCE;
import static org.fortiss.af3.requirementspatterns.model.RequirementsPatternsPackage.Literals.SENTENCE__TYPE_OF_GSN_ELEMENT;
import java.util.ArrayList;
import java.util.regex.Matcher;
......@@ -40,13 +40,13 @@ import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Text;
import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
import org.fortiss.af3.component.model.Component;
import org.fortiss.af3.requirementspatterns.model.Sentence;
import org.fortiss.af3.requirementspatterns.model.WordAndObjectType;
import org.fortiss.af3.safetycases.model.Assumption;
import org.fortiss.af3.safetycases.model.Context;
import org.fortiss.af3.safetycases.model.Goal;
import org.fortiss.af3.safetycases.model.Justification;
import org.fortiss.af3.safetycases.model.Strategy;
import org.fortiss.af3.safetycases.model.requirementsPattern.Sentence;
import org.fortiss.af3.safetycases.model.requirementsPattern.WordAndObjectType;
import org.fortiss.af3.safetycases.utils.SafetyCasesModelElementFactory;
import org.fortiss.af3.sil.model.SafetyRequirement;
import org.fortiss.tooling.kernel.extension.data.ITopLevelElement;
......
......@@ -17,8 +17,8 @@ $Id$
+--------------------------------------------------------------------------*/
package org.fortiss.af3.safetycases.ui.properties;
import static org.fortiss.af3.safetycases.model.requirementsPattern.RequirementsPatternPackage.Literals.WORD_AND_OBJECT_TYPE__OBJECT_TYPE;
import static org.fortiss.af3.safetycases.model.requirementsPattern.RequirementsPatternPackage.Literals.WORD_AND_OBJECT_TYPE__WORD;
import static org.fortiss.af3.requirementspatterns.model.RequirementsPatternsPackage.Literals.WORD_AND_OBJECT_TYPE__OBJECT_TYPE;
import static org.fortiss.af3.requirementspatterns.model.RequirementsPatternsPackage.Literals.WORD_AND_OBJECT_TYPE__WORD;
import org.eclipse.core.databinding.observable.value.IObservableValue;
import org.eclipse.emf.ecore.EObject;
......@@ -27,7 +27,7 @@ import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Text;
import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
import org.fortiss.af3.safetycases.model.requirementsPattern.WordAndObjectType;
import org.fortiss.af3.requirementspatterns.model.WordAndObjectType;
import org.fortiss.tooling.kernel.model.INamedCommentedElement;
import org.fortiss.tooling.kernel.ui.extension.IModelElementHandler;
import org.fortiss.tooling.kernel.ui.extension.base.PropertySectionBase;
......
......@@ -19,6 +19,9 @@ import static org.fortiss.af3.safetycases.utils.SafetyCasesModelElementFactory.c
import static org.fortiss.af3.safetycases.utils.SafetyCasesModelElementFactory.createStrategy;
import static org.fortiss.af3.safetycases.utils.SafetyCasesModelElementFactory.createWord;
import org.fortiss.af3.requirementspatterns.model.RequirementsPattern;
import org.fortiss.af3.requirementspatterns.model.Sentence;
import org.fortiss.af3.requirementspatterns.model.WordAndObjectType;
import org.fortiss.af3.safetycases.model.Assumption;
import org.fortiss.af3.safetycases.model.AwayContext;
import org.fortiss.af3.safetycases.model.AwayGoal;
......@@ -32,9 +35,6 @@ import org.fortiss.af3.safetycases.model.OptionEntity;
import org.fortiss.af3.safetycases.model.SafetyCase;
import org.fortiss.af3.safetycases.model.Solution;
import org.fortiss.af3.safetycases.model.Strategy;
import org.fortiss.af3.safetycases.model.requirementsPattern.RequirementsPattern;
import org.fortiss.af3.safetycases.model.requirementsPattern.Sentence;
import org.fortiss.af3.safetycases.model.requirementsPattern.WordAndObjectType;
import org.fortiss.tooling.kernel.extension.IPrototypeProvider;
import org.fortiss.tooling.kernel.extension.base.PrototypeProviderBase;
......
......@@ -43,6 +43,8 @@ import org.eclipse.swt.widgets.FileDialog;
import org.fortiss.af3.component.model.Component;
import org.fortiss.af3.component.model.ComponentArchitecture;
import org.fortiss.af3.mira.model.Analysis;
import org.fortiss.af3.requirementspatterns.model.Sentence;
import org.fortiss.af3.requirementspatterns.model.WordAndObjectType;
import org.fortiss.af3.safetycases.model.ArgumentElement;
import org.fortiss.af3.safetycases.model.Assumption;
import org.fortiss.af3.safetycases.model.AwayContext;
......@@ -57,8 +59,6 @@ import org.fortiss.af3.safetycases.model.OptionEntity;
import org.fortiss.af3.safetycases.model.SafetyCase;
import org.fortiss.af3.safetycases.model.Strategy;
import org.fortiss.af3.safetycases.model.SupportedBy;
import org.fortiss.af3.safetycases.model.requirementsPattern.Sentence;
import org.fortiss.af3.safetycases.model.requirementsPattern.WordAndObjectType;
import org.fortiss.af3.safetycases.ui.editpart.AssumptionEditPart;
import org.fortiss.af3.safetycases.ui.editpart.AwayContextEditPart;
import org.fortiss.af3.safetycases.ui.editpart.AwayGoalEditPart;
......
......@@ -25,8 +25,8 @@ import org.eclipse.emf.ecore.EObject;
import org.eclipse.jface.window.Window;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.PlatformUI;
import org.fortiss.af3.requirementspatterns.model.LibraryPatternsDatabasePackage;
import org.fortiss.af3.safetycases.model.LibraryModulePackage;
import org.fortiss.af3.safetycases.model.requirementsPattern.LibraryPatternsDatabasePackage;
import org.fortiss.tooling.base.ui.dialog.ElementTreeSingleSelectDialog;
import org.fortiss.tooling.base.ui.dialog.ModelElementTreeContentProvider;
import org.fortiss.tooling.kernel.model.ILibrary;
......
......@@ -44,6 +44,10 @@ import org.fortiss.af3.mira.model.RequirementsContainer;
import org.fortiss.af3.mira.model.RequirementsPackage;
import org.fortiss.af3.platform.model.IPlatformArchitectureElement;
import org.fortiss.af3.platform.model.PlatformArchitecture;
import org.fortiss.af3.requirementspatterns.model.LibraryPatternsDatabase;
import org.fortiss.af3.requirementspatterns.model.PatternsDatabase;
import org.fortiss.af3.requirementspatterns.model.RequirementsPattern;
import org.fortiss.af3.requirementspatterns.model.Sentence;
import org.fortiss.af3.safetycases.model.ArgumentElement;
import org.fortiss.af3.safetycases.model.ArgumentModule;
import org.fortiss.af3.safetycases.model.AwayGoal;
......@@ -53,10 +57,6 @@ import org.fortiss.af3.safetycases.model.Module;
import org.fortiss.af3.safetycases.model.SafetyCase;
import org.fortiss.af3.safetycases.model.Solution;
import org.fortiss.af3.safetycases.model.VISIBILITY;
import org.fortiss.af3.safetycases.model.requirementsPattern.LibraryPatternsDatabase;
import org.fortiss.af3.safetycases.model.requirementsPattern.PatternsDatabase;
import org.fortiss.af3.safetycases.model.requirementsPattern.RequirementsPattern;
import org.fortiss.af3.safetycases.model.requirementsPattern.Sentence;
import org.fortiss.af3.safetycases.utils.SafetyCasesModelElementFactory;
import org.fortiss.af3.scheduling.Schedule;
import org.fortiss.af3.sil.model.SafetyRequirement;
......
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="generated-src"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="build"/>
</classpath>
......@@ -20,6 +20,6 @@ Require-Bundle: org.fortiss.af3.project,
org.fortiss.af3.expression
Export-Package: org.fortiss.af3.safetycases,
org.fortiss.af3.safetycases.model,
org.fortiss.af3.safetycases.model.requirementsPattern,
org.fortiss.af3.requirementspatterns.model,
org.fortiss.af3.safetycases.utils
Import-Package: org.fortiss.af3.safetycases
......@@ -3,7 +3,7 @@
xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="model"
nsURI="http://www.fortiss.org/af3/requirements_patterns" nsPrefix="org-fortiss-af3-requirements-patterns">
<eClassifiers xsi:type="ecore:EClass" name="Sentence" eSuperTypes="../../org.fortiss.tooling.base/model/base.ecore#//element/IHierarchicElement">
<eClassifiers xsi:type="ecore:EClass" name="Sentence" eSuperTypes="platform:/resource/org.fortiss.tooling.base/model/base.ecore#//base/HierarchicElementBase">
<eOperations name="getWords" upperBound="-1" eType="#//WordAndObjectType">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
<details key="body" value="return org.fortiss.tooling.kernel.utils.EcoreUtils.pickInstanceOf(&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;WordAndObjectType.class, getContainedElements());"/>
......@@ -16,7 +16,7 @@
</eGenericType>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="RequirementsPattern" eSuperTypes="../../org.fortiss.tooling.base/model/base.ecore#//base/HierarchicElementBase">
<eClassifiers xsi:type="ecore:EClass" name="RequirementsPattern" eSuperTypes="platform:/resource/org.fortiss.tooling.base/model/base.ecore#//base/HierarchicElementBase">
<eOperations name="getSentences" upperBound="-1" eType="#//Sentence">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
<details key="body" value="return org.fortiss.tooling.kernel.utils.EcoreUtils.pickInstanceOf(&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;Sentence.class, getContainedElements());"/>
......@@ -35,18 +35,18 @@
eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="knownUses" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="WordAndObjectType" eSuperTypes="../../org.fortiss.tooling.base/model/base.ecore#//base/HierarchicElementBase">
<eClassifiers xsi:type="ecore:EClass" name="WordAndObjectType" eSuperTypes="platform:/resource/org.fortiss.tooling.base/model/base.ecore#//base/HierarchicElementBase">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="word" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="objectType" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="PatternsDatabase" eSuperTypes="../../org.fortiss.tooling.base/model/base.ecore#//base/HierarchicElementBase ../../org.fortiss.tooling.kernel/model/kernel.ecore#//IProjectRootElement">
<eClassifiers xsi:type="ecore:EClass" name="PatternsDatabase" eSuperTypes="platform:/resource/org.fortiss.tooling.base/model/base.ecore#//base/HierarchicElementBase platform:/resource/org.fortiss.tooling.kernel/model/kernel.ecore#//IProjectRootElement">
<eOperations name="getPatterns" upperBound="-1" eType="#//RequirementsPattern">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
<details key="body" value="return org.fortiss.tooling.kernel.utils.EcoreUtils.pickInstanceOf(&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;RequirementsPattern.class, getContainedElements());"/>
</eAnnotations>
</eOperations>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="LibraryPatternsDatabasePackage" eSuperTypes="../../org.fortiss.tooling.kernel/model/kernel.ecore#//ILibraryPackage ../../org.fortiss.tooling.kernel/model/kernel.ecore#//ILibraryRootElement">
<eClassifiers xsi:type="ecore:EClass" name="LibraryPatternsDatabasePackage" eSuperTypes="platform:/resource/org.fortiss.tooling.kernel/model/kernel.ecore#//ILibraryPackage platform:/resource/org.fortiss.tooling.kernel/model/kernel.ecore#//ILibraryRootElement">
<eOperations name="getURI" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
<details key="body" value="return LibraryPatternsDatabasePackageStaticImpl.getURI(this);&#xD;&#xA;"/>
......@@ -58,7 +58,7 @@
</eAnnotations>
</eOperations>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="LibraryPatternsDatabase" eSuperTypes="../../org.fortiss.tooling.kernel/model/kernel.ecore#//ILibraryElement">
<eClassifiers xsi:type="ecore:EClass" name="LibraryPatternsDatabase" eSuperTypes="platform:/resource/org.fortiss.tooling.kernel/model/kernel.ecore#//ILibraryElement">
<eOperations name="getPatternsDatabase" eType="#//PatternsDatabase">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
<details key="body" value="return (PatternsDatabase)wrappedElement;"/>
......@@ -75,7 +75,7 @@
</eAnnotations>
</eOperations>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="PatternsDatabaseRef" eSuperTypes="#//PatternsDatabase ../../org.fortiss.tooling.kernel/model/kernel.ecore#//ILibraryElementReference">
<eClassifiers xsi:type="ecore:EClass" name="PatternsDatabaseRef" eSuperTypes="#//PatternsDatabase platform:/resource/org.fortiss.tooling.kernel/model/kernel.ecore#//ILibraryElementReference">
<eOperations name="getLibraryPatternsDatabaseShadow" eType="#//PatternsDatabase">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
<details key="body" value="return (PatternsDatabase)getLibraryElementShadow();"/>
......
......@@ -2,11 +2,11 @@
<genmodel:GenModel xmi:version="2.0"
xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.fortiss.af3.safetycases/generated-src"
modelPluginID="org.fortiss.af3.safetycases" modelName="Requirementspattern" importerID="org.eclipse.emf.importer.ecore"
complianceLevel="6.0" copyrightFields="false" usedGenPackages="../../org.fortiss.tooling.base/model/base.genmodel#//model ../../org.fortiss.tooling.kernel/model/kernel.genmodel#//model">
modelPluginID="org.fortiss.af3.safetycases" modelName="Model" importerID="org.eclipse.emf.importer.ecore"
complianceLevel="6.0" copyrightFields="false" usedGenPackages="platform:/resource/org.fortiss.tooling.base/model/base.genmodel#//model platform:/resource/org.fortiss.tooling.kernel/model/kernel.genmodel#//model">
<foreignModel>requirementspatterns.ecore</foreignModel>
<genPackages prefix="Model" basePackage="org.fortiss.af3.requirementspatterns" disposableProviderFactory="true"
ecorePackage="requirementspatterns.ecore#/">
<genPackages prefix="RequirementsPatterns" basePackage="org.fortiss.af3.requirementspatterns"
disposableProviderFactory="true" ecorePackage="requirementspatterns.ecore#/">
<genClasses ecoreClass="requirementspatterns.ecore#//Sentence">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute requirementspatterns.ecore#//Sentence/sentence"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute requirementspatterns.ecore#//Sentence/typeOfGSNElement"/>
......
......@@ -93,7 +93,7 @@
<eStructuralFeatures xsi:type="ecore:EAttribute" name="toBeInstantiated" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
defaultValueLiteral="true"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="gsnID" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="sentence" eType="#//requirementsPattern/Sentence"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="sentence" eType="ecore:EClass requirementspatterns.ecore#//Sentence"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="InContextOfTargetElement"/>
<eClassifiers xsi:type="ecore:EClass" name="SupportedBy" eSuperTypes="platform:/resource/org.fortiss.tooling.base/model/base.ecore#//base/ConnectionSegmentBase">
......@@ -276,91 +276,4 @@
<eLiterals name="Indirect"/>
<eLiterals name="Direct"/>
</eClassifiers>
<eSubpackages name="requirementsPattern" nsURI="http://www.fortiss.org/af3/safetycases/model/requirementsPattern"
nsPrefix="org-fortiss-af3-safetycases-model-requirementsPattern">
<eClassifiers xsi:type="ecore:EClass" name="RequirementsPattern" eSuperTypes="platform:/resource/org.fortiss.tooling.base/model/base.ecore#//base/HierarchicElementBase">
<eOperations name="getSentences" upperBound="-1" eType="#//requirementsPattern/Sentence">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
<details key="body" value="return org.fortiss.tooling.kernel.utils.EcoreUtils.pickInstanceOf(&#xD;&#xA;&#x9;&#x9;&#x9;&#x9;Sentence.class, getContainedElements());"/>
</eAnnotations>
</eOperations>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="intent" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="motivation" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>