diff --git a/org.smeup.sys.dk.source.jdt/META-INF/MANIFEST.MF b/org.smeup.sys.dk.source.jdt/META-INF/MANIFEST.MF index 1317482a..64bf44e7 100644 --- a/org.smeup.sys.dk.source.jdt/META-INF/MANIFEST.MF +++ b/org.smeup.sys.dk.source.jdt/META-INF/MANIFEST.MF @@ -9,5 +9,6 @@ Bundle-ClassPath: . Require-Bundle: org.smeup.sys.dk.source;visibility:=reexport, org.eclipse.core.runtime, org.eclipse.core.resources, - org.eclipse.jdt.core + org.eclipse.jdt.core, + org.eclipse.emf.ecore.xmi Bundle-RequiredExecutionEnvironment: JavaSE-1.7 diff --git a/org.smeup.sys.dk.source.jdt/src/org/smeup/sys/dk/source/jdt/JDTObjectSerializer.java b/org.smeup.sys.dk.source.jdt/src/org/smeup/sys/dk/source/jdt/JDTObjectSerializer.java new file mode 100644 index 00000000..acdb6eff --- /dev/null +++ b/org.smeup.sys.dk.source.jdt/src/org/smeup/sys/dk/source/jdt/JDTObjectSerializer.java @@ -0,0 +1,91 @@ +/** + * Copyright (c) 2012, 2015 Sme.UP 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: + * Mattia Rocchi - Initial API and implementation + */ +package org.smeup.sys.dk.source.jdt; + +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.util.Collections; + +import org.eclipse.emf.common.util.URI; +import org.eclipse.emf.ecore.EObject; +import org.eclipse.emf.ecore.impl.BasicEObjectImpl; +import org.eclipse.emf.ecore.resource.ResourceSet; +import org.smeup.sys.dk.source.QProject; +import org.smeup.sys.il.core.QObjectNameable; + +public class JDTObjectSerializer { + + private ResourceSet resourceSet; + + public JDTObjectSerializer(ResourceSet resourceSet) { + this.resourceSet = resourceSet; + } + + public ByteArrayOutputStream serialize(QProject project, Class klass, String name, T object) throws IOException { + + URI uri = buildURI(project, klass, name); + + JDTResourceImpl resource = (JDTResourceImpl) resourceSet.getResource(uri, false); + if (resource == null) + resource = (JDTResourceImpl) resourceSet.createResource(uri, "asup"); + else + clearResource(resource); + + ((BasicEObjectImpl) object).eSetResource(null, null); + resource.getContents().add((EObject) object); + + ByteArrayOutputStream output = new ByteArrayOutputStream(); + resource.doSave(output, Collections.EMPTY_MAP); + + return output; + + } + + @SuppressWarnings("unchecked") + public T deserialize(QProject project, Class klass, String name, InputStream inputStream) throws IOException { + + URI uri = buildURI(project, klass, name); + + JDTResourceImpl resource = (JDTResourceImpl) resourceSet.getResource(uri, false); + if (resource == null) + resource = (JDTResourceImpl) resourceSet.createResource(uri, "asup"); + else + clearResource(resource); + + resource.doLoad(inputStream, resourceSet.getLoadOptions()); + if (resource.getContents().isEmpty()) + return null; + + EObject eObject = resource.getContents().get(0); + + return (T) eObject; + + } + + private void clearResource(JDTResourceImpl resource) { + BasicEObjectImpl oldObject = null; + if (resource.isLoaded() && !resource.getContents().isEmpty()) { + oldObject = (BasicEObjectImpl) resource.getContents().get(0); + resource.getContents().clear(); + oldObject.eSetResource(resource, null); + } + } + + private URI buildURI(QProject project, Class klass, String name) { + + String uri = "asup://" + "TODO" + "/" + project.getName() + "/" + klass.getSimpleName().toLowerCase().substring(1) + "#" + name; + URI eURI = URI.createURI(uri); + eURI.appendFragment(name); + return eURI; + } +} \ No newline at end of file diff --git a/org.smeup.sys.dk.source.jdt/src/org/smeup/sys/dk/source/jdt/JDTProjectAdapter.java b/org.smeup.sys.dk.source.jdt/src/org/smeup/sys/dk/source/jdt/JDTProjectAdapter.java index 64408398..a2706096 100644 --- a/org.smeup.sys.dk.source.jdt/src/org/smeup/sys/dk/source/jdt/JDTProjectAdapter.java +++ b/org.smeup.sys.dk.source.jdt/src/org/smeup/sys/dk/source/jdt/JDTProjectAdapter.java @@ -21,7 +21,6 @@ import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.CoreException; import org.smeup.sys.dk.source.QProject; -import org.smeup.sys.dk.source.QSourceNode; public class JDTProjectAdapter implements QProject { @@ -85,11 +84,6 @@ public QProject getProject() { return this; } - @Override - public QSourceNode getParent() { - return null; - } - @Override public boolean isRoot() { return true; diff --git a/org.smeup.sys.dk.source.jdt/src/org/smeup/sys/dk/source/jdt/JDTResourceFactory.java b/org.smeup.sys.dk.source.jdt/src/org/smeup/sys/dk/source/jdt/JDTResourceFactory.java new file mode 100644 index 00000000..3b2c72e7 --- /dev/null +++ b/org.smeup.sys.dk.source.jdt/src/org/smeup/sys/dk/source/jdt/JDTResourceFactory.java @@ -0,0 +1,25 @@ +/** + * Copyright (c) 2012, 2015 Sme.UP 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: + * Mattia Rocchi - Initial API and implementation + */ +package org.smeup.sys.dk.source.jdt; + +import org.eclipse.emf.common.util.URI; +import org.eclipse.emf.ecore.resource.Resource; +import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl; + +public class JDTResourceFactory extends ResourceFactoryImpl { + + @Override + public Resource createResource(URI uri) { + return new JDTResourceImpl(uri); + } + +} diff --git a/org.smeup.sys.dk.source.jdt/src/org/smeup/sys/dk/source/jdt/JDTResourceImpl.java b/org.smeup.sys.dk.source.jdt/src/org/smeup/sys/dk/source/jdt/JDTResourceImpl.java new file mode 100644 index 00000000..c567f8b6 --- /dev/null +++ b/org.smeup.sys.dk.source.jdt/src/org/smeup/sys/dk/source/jdt/JDTResourceImpl.java @@ -0,0 +1,33 @@ +/** + * Copyright (c) 2012, 2015 Sme.UP 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: + * Mattia Rocchi - Initial API and implementation + */ +package org.smeup.sys.dk.source.jdt; + +import org.eclipse.emf.common.util.URI; +import org.eclipse.emf.ecore.xmi.impl.XMIResourceImpl; +import org.smeup.sys.il.core.QNameable; + + +public class JDTResourceImpl extends XMIResourceImpl implements QNameable { + + public JDTResourceImpl(URI uri) { + super(uri); + } + + @Override + public String getName() { + URI uri = getURI(); + if (uri.segmentCount() == 0) + return null; + + return uri.segment(0); + } +} diff --git a/org.smeup.sys.dk.source.jdt/src/org/smeup/sys/dk/source/jdt/JDTSourceEntryFileAdapter.java b/org.smeup.sys.dk.source.jdt/src/org/smeup/sys/dk/source/jdt/JDTSourceEntryFileAdapter.java index a8f9e0aa..7e859aa5 100644 --- a/org.smeup.sys.dk.source.jdt/src/org/smeup/sys/dk/source/jdt/JDTSourceEntryFileAdapter.java +++ b/org.smeup.sys.dk.source.jdt/src/org/smeup/sys/dk/source/jdt/JDTSourceEntryFileAdapter.java @@ -23,15 +23,18 @@ import org.eclipse.core.runtime.CoreException; import org.smeup.sys.dk.source.QProject; import org.smeup.sys.dk.source.QSourceEntry; +import org.smeup.sys.il.core.QObjectNameable; public class JDTSourceEntryFileAdapter implements QSourceEntry { private static final long serialVersionUID = 1L; + private transient JDTObjectSerializer serializer; private QProject project; private transient IFile file; - public JDTSourceEntryFileAdapter(QProject project, IFile file) { + public JDTSourceEntryFileAdapter(JDTObjectSerializer serializer, QProject project, IFile file) { + this.serializer = serializer; this.project = project; this.file = file; } @@ -41,12 +44,6 @@ public URI getLocation() { return file.getRawLocationURI(); } - @Override - public QSourceEntry getParent() { - // TODO Auto-generated method stub - return null; - } - @Override public QProject getProject() { return project; @@ -64,7 +61,6 @@ public InputStream getInputStream() throws IOException { } catch (CoreException e) { throw new IOException(e); } -// return new FileInputStream(getLocation().getRawPath()); } @Override @@ -100,4 +96,8 @@ public String getText() { } } + @Override + public T load(Class type) throws IOException { + return serializer.deserialize(getProject(), type, getName(), getInputStream()); + } } diff --git a/org.smeup.sys.dk.source.jdt/src/org/smeup/sys/dk/source/jdt/JDTSourceManagerImpl.java b/org.smeup.sys.dk.source.jdt/src/org/smeup/sys/dk/source/jdt/JDTSourceManagerImpl.java index 96ce6973..9c63348a 100644 --- a/org.smeup.sys.dk.source.jdt/src/org/smeup/sys/dk/source/jdt/JDTSourceManagerImpl.java +++ b/org.smeup.sys.dk.source.jdt/src/org/smeup/sys/dk/source/jdt/JDTSourceManagerImpl.java @@ -29,12 +29,10 @@ import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.URIUtil; -import org.eclipse.emf.common.util.URI; -import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.emf.ecore.resource.ResourceSet; import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl; -import org.eclipse.emf.ecore.util.EcoreUtil; +import org.eclipse.emf.ecore.xmi.XMLResource; import org.smeup.sys.dk.source.QProject; import org.smeup.sys.dk.source.QProjectDef; import org.smeup.sys.dk.source.QSourceEntry; @@ -49,17 +47,16 @@ public class JDTSourceManagerImpl implements QSourceManager { public static int EVENT_BUILD_ENTRY = 40; public static int EVENT_INSTALL_ENTRY = 60; - private String bundlePath; - private ResourceSet resourceSet; + private String bundlePath; public JDTSourceManagerImpl() { this("asup-src"); } public JDTSourceManagerImpl(String bundlePath) { - ResourcesPlugin.getWorkspace().getDescription().setAutoBuilding(false); this.bundlePath = bundlePath; - this.resourceSet = new ResourceSetImpl(); + + ResourcesPlugin.getWorkspace().getDescription().setAutoBuilding(false); } @Override @@ -102,34 +99,43 @@ public void deleteProject(QContext context, QProject project) throws IOException } @Override - public QSourceEntry createObjectEntry(QContext context, String project, Class type, String name, boolean replace, T content) throws IOException { + public QSourceEntry createObjectEntry(QContext context, String projectName, Class type, String name, boolean replace, T content) throws IOException { + + QProject project = getProject(context, projectName); + if (project == null) + throw new IOException("Invalid project: " + projectName); - URI uri = EcoreUtil.getURI((EObject) content); + return createObjectEntry(context, project, type, name, replace, content); + } - Resource resource = resourceSet.createResource(uri); - resource.getContents().add((EObject)content); + @Override + public QSourceEntry createObjectEntry(QContext context, QProject project, Class klass, String name, boolean replace, T content) throws IOException { - ByteArrayOutputStream output = new ByteArrayOutputStream(); - resource.save(output, Collections.EMPTY_MAP); - - QSourceEntry sourceEntry = createObjectEntry(context, project, type, name, replace, new ByteArrayInputStream(output.toByteArray())); + ByteArrayOutputStream output = getObjectSerializer(context).serialize(project, klass, name, content); + QSourceEntry sourceEntry = createObjectEntry(context, project, klass, name, replace, new ByteArrayInputStream(output.toByteArray())); return sourceEntry; + } @Override public QSourceEntry createObjectEntry(QContext context, String projectName, Class type, String name, boolean replace, InputStream content) throws IOException { QProject project = getProject(context, projectName); - if(project == null) - throw new IOException("Invalid project: "+projectName); - - return createEntry(project, type, name + ".XMI", replace, content); + if (project == null) + throw new IOException("Invalid project: " + projectName); + + return createObjectEntry(context, project, type, name, replace, content); + } + + @Override + public QSourceEntry createObjectEntry(QContext context, QProject project, Class type, String name, boolean replace, InputStream content) throws IOException { + return createEntry(context, project, type, name + ".XMI", replace, content); } @Override public QSourceEntry createChildEntry(QContext context, QSourceNode parent, String name, boolean replace, InputStream content) throws IOException { - return createEntry(parent, null, name, replace, content); + return createEntry(context, parent, null, name, replace, content); } @Override @@ -141,14 +147,13 @@ public QProject getProject(QContext context, String projectName) { return null; IProject project = (IProject) resource; - -/* try { - project.refreshLocal(IContainer.DEPTH_INFINITE, null); - } catch (CoreException e1) { - // TODO Auto-generated catch block - e1.printStackTrace(); - }*/ - + + /* + * try { project.refreshLocal(IContainer.DEPTH_INFINITE, null); } catch + * (CoreException e1) { // TODO Auto-generated catch block + * e1.printStackTrace(); } + */ + return new JDTProjectAdapter(project); } @@ -158,8 +163,13 @@ public QSourceEntry getObjectEntry(QContext context, QProject projectEntry = getProject(context, project); if (projectEntry == null) return null; - - return getChildEntry(context, projectEntry, type, name + ".XMI"); + + return getObjectEntry(context, projectEntry, type, name); + } + + @Override + public QSourceEntry getObjectEntry(QContext context, QProject project, Class type, String name) { + return getChildEntry(context, project, type, name + ".XMI"); } @Override @@ -181,10 +191,16 @@ public List listProjects(QContext context) { @SuppressWarnings("unchecked") @Override public List listObjectEntries(QContext context, String projectName, Class type, String nameFilter) { + QProject project = getProject(context, projectName); if (project == null) return (List) Collections.EMPTY_LIST; + return listObjectEntries(context, project, type, nameFilter); + } + + @Override + public List listObjectEntries(QContext context, QProject project, Class type, String nameFilter) { return listChildEntries(context, project, type, nameFilter); } @@ -227,7 +243,7 @@ public void removeEntry(QContext context, QSourceEntry entry) throws IOException } } - private QSourceEntry createEntry(QSourceNode parent, Class type, String name, boolean replace, InputStream content) throws IOException { + private QSourceEntry createEntry(QContext context, QSourceNode parent, Class type, String name, boolean replace, InputStream content) throws IOException { IFolder folder = getFolder(parent, type, true); IFile file = folder.getFile(name); @@ -251,7 +267,7 @@ private QSourceEntry createEntry(QSourceNode parent, } } - return new JDTSourceEntryFileAdapter(parent.getProject(), file); + return new JDTSourceEntryFileAdapter(getObjectSerializer(context), parent.getProject(), file); } private QSourceEntry getChildEntry(QContext context, QSourceNode parent, Class type, String name) { @@ -263,7 +279,7 @@ private QSourceEntry getChildEntry(QContext context, if (!file.exists()) return null; - return new JDTSourceEntryFileAdapter(parent.getProject(), file); + return new JDTSourceEntryFileAdapter(getObjectSerializer(context), parent.getProject(), file); } private List listChildEntries(QContext context, QSourceNode parent, Class type, String nameFilter) { @@ -305,7 +321,7 @@ else if (!resourceName.equals(nameFilter)) } - entries.add(new JDTSourceEntryFileAdapter(parent.getProject(), (IFile) resource)); + entries.add(new JDTSourceEntryFileAdapter(getObjectSerializer(context), parent.getProject(), (IFile) resource)); } } catch (Exception e) { // TODO Auto-generated catch block @@ -318,8 +334,13 @@ else if (!resourceName.equals(nameFilter)) private IFolder getFolder(QSourceNode parent, Class type, boolean create) { IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot(); - IProject project = root.getProject(parent.getProject().getName()); + if(parent == null) + "".toCharArray(); + if(parent.getProject() == null) + "".toCharArray(); + IProject project = root.getProject(parent.getProject().getName()); + // TODO da eliminare if (parent.isRoot() && type == null) return project.getFolder("src"); @@ -368,4 +389,25 @@ private void mkDirs(IFile file) throws CoreException { } } } + + private JDTObjectSerializer getObjectSerializer(QContext context) { + + JDTObjectSerializer objectSerializer = context.get(JDTObjectSerializer.class); + if(objectSerializer == null) { + synchronized (context) { + objectSerializer = context.get(JDTObjectSerializer.class); + if(objectSerializer == null) { + + ResourceSet resourceSet = new ResourceSetImpl(); + resourceSet.getLoadOptions().put(XMLResource.OPTION_RECORD_UNKNOWN_FEATURE, true); + Resource.Factory resourceFatory = new JDTResourceFactory(); + resourceSet.getResourceFactoryRegistry().getContentTypeToFactoryMap().put("asup", resourceFatory); + + objectSerializer = new JDTObjectSerializer(resourceSet); + context.set(JDTObjectSerializer.class, objectSerializer); + } + } + } + return objectSerializer; + } } \ No newline at end of file diff --git a/org.smeup.sys.dk.source/model/dk-source.ecore b/org.smeup.sys.dk.source/model/dk-source.ecore index 64a0be56..77243e2e 100644 --- a/org.smeup.sys.dk.source/model/dk-source.ecore +++ b/org.smeup.sys.dk.source/model/dk-source.ecore @@ -13,6 +13,17 @@ eSuperTypes="#//SourceNode"> + + + + + + + + + + + @@ -47,7 +58,7 @@ - + @@ -55,8 +66,40 @@ + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + @@ -81,6 +124,19 @@ + + + + + + + + + + + + + @@ -102,6 +158,19 @@ + + + + + + + + + + + + + @@ -115,12 +184,10 @@ + eSuperTypes="../../org.smeup.sys.il.core/model/il-core.ecore#//ObjectNameable"> - - diff --git a/org.smeup.sys.dk.source/src/org/smeup/sys/dk/source/QDevelopmentKitSourcePackage.java b/org.smeup.sys.dk.source/src/org/smeup/sys/dk/source/QDevelopmentKitSourcePackage.java index 9f098b5b..8c9d17f8 100644 --- a/org.smeup.sys.dk.source/src/org/smeup/sys/dk/source/QDevelopmentKitSourcePackage.java +++ b/org.smeup.sys.dk.source/src/org/smeup/sys/dk/source/QDevelopmentKitSourcePackage.java @@ -129,7 +129,7 @@ public interface QDevelopmentKitSourcePackage extends EPackage { * @generated * @ordered */ - int SOURCE_NODE_FEATURE_COUNT = QIntegratedLanguageCorePackage.OBJECT_FEATURE_COUNT + 0; + int SOURCE_NODE_FEATURE_COUNT = QIntegratedLanguageCorePackage.OBJECT_NAMEABLE_FEATURE_COUNT + 0; /** * The meta object id for the '{@link org.smeup.sys.dk.source.QSourceEntry Source Entry}' class. diff --git a/org.smeup.sys.dk.source/src/org/smeup/sys/dk/source/QSourceEntry.java b/org.smeup.sys.dk.source/src/org/smeup/sys/dk/source/QSourceEntry.java index edb97d94..ab4add08 100644 --- a/org.smeup.sys.dk.source/src/org/smeup/sys/dk/source/QSourceEntry.java +++ b/org.smeup.sys.dk.source/src/org/smeup/sys/dk/source/QSourceEntry.java @@ -4,6 +4,7 @@ import java.io.IOException; import java.io.InputStream; +import org.smeup.sys.il.core.QObjectNameable; /** * A representation of the model object ' @@ -22,4 +23,12 @@ public interface QSourceEntry extends QSourceNode { */ InputStream getInputStream() throws IOException; + /** + * + * + * @model exceptions="org.smeup.sys.mi.core.JavaIOException" typeRequired="true" + * @generated + */ + T load(Class type) throws IOException; + } // QSourceEntry diff --git a/org.smeup.sys.dk.source/src/org/smeup/sys/dk/source/QSourceManager.java b/org.smeup.sys.dk.source/src/org/smeup/sys/dk/source/QSourceManager.java index bfd43e0a..3d402bd1 100644 --- a/org.smeup.sys.dk.source/src/org/smeup/sys/dk/source/QSourceManager.java +++ b/org.smeup.sys.dk.source/src/org/smeup/sys/dk/source/QSourceManager.java @@ -43,6 +43,14 @@ public interface QSourceManager { */ QSourceEntry createObjectEntry(QContext context, String project, Class type, String name, boolean replace, InputStream content) throws IOException; + /** + * + * + * @model required="true" exceptions="org.smeup.sys.mi.core.JavaIOException" contextRequired="true" projectRequired="true" typeRequired="true" nameRequired="true" replaceRequired="true" contentDataType="org.smeup.sys.mi.core.JavaInputStream" contentRequired="true" + * @generated + */ + QSourceEntry createObjectEntry(QContext context, QProject project, Class type, String name, boolean replace, InputStream content) throws IOException; + /** * * @@ -51,6 +59,14 @@ public interface QSourceManager { */ QSourceEntry createObjectEntry(QContext context, String project, Class type, String name, boolean replace, T content) throws IOException; + /** + * + * + * @model required="true" exceptions="org.smeup.sys.mi.core.JavaIOException" contextRequired="true" projectRequired="true" typeRequired="true" nameRequired="true" replaceRequired="true" contentRequired="true" + * @generated + */ + QSourceEntry createObjectEntry(QContext context, QProject project, Class type, String name, boolean replace, T content) throws IOException; + /** * * @@ -75,6 +91,14 @@ public interface QSourceManager { */ QSourceEntry getObjectEntry(QContext context, String project, Class type, String name); + /** + * + * + * @model required="true" contextRequired="true" projectRequired="true" typeRequired="true" nameRequired="true" + * @generated + */ + QSourceEntry getObjectEntry(QContext context, QProject project, Class type, String name); + /** * * @@ -99,6 +123,14 @@ public interface QSourceManager { */ List listObjectEntries(QContext context, String project, Class type, String nameFilter); + /** + * + * + * @model contextRequired="true" projectRequired="true" typeRequired="true" + * @generated + */ + List listObjectEntries(QContext context, QProject project, Class type, String nameFilter); + /** * * diff --git a/org.smeup.sys.dk.source/src/org/smeup/sys/dk/source/QSourceNode.java b/org.smeup.sys.dk.source/src/org/smeup/sys/dk/source/QSourceNode.java index 76eaf271..f3bb2636 100644 --- a/org.smeup.sys.dk.source/src/org/smeup/sys/dk/source/QSourceNode.java +++ b/org.smeup.sys.dk.source/src/org/smeup/sys/dk/source/QSourceNode.java @@ -8,7 +8,8 @@ package org.smeup.sys.dk.source; import java.net.URI; -import org.smeup.sys.il.core.QObject; + +import org.smeup.sys.il.core.QObjectNameable; /** * @@ -20,7 +21,7 @@ * @model interface="true" abstract="true" * @generated */ -public interface QSourceNode extends QObject { +public interface QSourceNode extends QObjectNameable { /** * @@ -30,14 +31,6 @@ public interface QSourceNode extends QObject { */ URI getLocation(); - /** - * - * - * @model kind="operation" - * @generated - */ - QSourceNode getParent(); - /** * * @@ -54,14 +47,6 @@ public interface QSourceNode extends QObject { */ boolean isRoot(); - /** - * - * - * @model kind="operation" - * @generated - */ - String getName(); - /** * * diff --git a/org.smeup.sys.dk.source/src/org/smeup/sys/dk/source/impl/DevelopmentKitSourcePackageImpl.java b/org.smeup.sys.dk.source/src/org/smeup/sys/dk/source/impl/DevelopmentKitSourcePackageImpl.java index 517f21cd..5c37dbaa 100644 --- a/org.smeup.sys.dk.source/src/org/smeup/sys/dk/source/impl/DevelopmentKitSourcePackageImpl.java +++ b/org.smeup.sys.dk.source/src/org/smeup/sys/dk/source/impl/DevelopmentKitSourcePackageImpl.java @@ -23,6 +23,9 @@ import org.smeup.sys.dk.source.QSourceNode; import org.smeup.sys.il.core.QIntegratedLanguageCorePackage; import org.smeup.sys.il.core.ctx.QIntegratedLanguageCoreCtxPackage; +import org.smeup.sys.il.data.QIntegratedLanguageDataPackage; +import org.smeup.sys.il.data.def.QIntegratedLanguageDataDefPackage; +import org.smeup.sys.il.data.term.QIntegratedLanguageDataTermPackage; import org.smeup.sys.mi.core.QMachineInterfaceCorePackage; /** @@ -111,6 +114,9 @@ public static QDevelopmentKitSourcePackage init() { // Initialize simple dependencies QIntegratedLanguageCorePackage.eINSTANCE.eClass(); + QIntegratedLanguageDataDefPackage.eINSTANCE.eClass(); + QIntegratedLanguageDataPackage.eINSTANCE.eClass(); + QIntegratedLanguageDataTermPackage.eINSTANCE.eClass(); // Create package meta-data objects theDevelopmentKitSourcePackage.createPackageContents(); @@ -269,7 +275,7 @@ public void initializePackageContents() { projectEClass.getESuperTypes().add(this.getSourceNode()); projectDefEClass.getESuperTypes().add(theIntegratedLanguageCorePackage.getObject()); sourceEntryEClass.getESuperTypes().add(this.getSourceNode()); - sourceNodeEClass.getESuperTypes().add(theIntegratedLanguageCorePackage.getObject()); + sourceNodeEClass.getESuperTypes().add(theIntegratedLanguageCorePackage.getObjectNameable()); // Initialize classes and features; add operations and parameters initEClass(projectEClass, QProject.class, "Project", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); @@ -285,6 +291,18 @@ public void initializePackageContents() { EOperation op = addEOperation(sourceEntryEClass, theMachineInterfaceCorePackage.getJavaInputStream(), "getInputStream", 0, 1, IS_UNIQUE, IS_ORDERED); addEException(op, theMachineInterfaceCorePackage.getJavaIOException()); + op = addEOperation(sourceEntryEClass, null, "load", 0, 1, IS_UNIQUE, IS_ORDERED); + ETypeParameter t1 = addETypeParameter(op, "T"); + EGenericType g1 = createEGenericType(theIntegratedLanguageCorePackage.getObjectNameable()); + t1.getEBounds().add(g1); + g1 = createEGenericType(ecorePackage.getEJavaClass()); + EGenericType g2 = createEGenericType(t1); + g1.getETypeArguments().add(g2); + addEParameter(op, g1, "type", 1, 1, IS_UNIQUE, IS_ORDERED); + addEException(op, theMachineInterfaceCorePackage.getJavaIOException()); + g1 = createEGenericType(t1); + initEOperation(op, g1); + initEClass(sourceManagerEClass, QSourceManager.class, "SourceManager", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); op = addEOperation(sourceManagerEClass, this.getProject(), "createProject", 1, 1, IS_UNIQUE, IS_ORDERED); @@ -302,13 +320,28 @@ public void initializePackageContents() { addEException(op, theMachineInterfaceCorePackage.getJavaIOException()); op = addEOperation(sourceManagerEClass, this.getSourceEntry(), "createObjectEntry", 1, 1, IS_UNIQUE, IS_ORDERED); - ETypeParameter t1 = addETypeParameter(op, "T"); - EGenericType g1 = createEGenericType(theIntegratedLanguageCorePackage.getObjectNameable()); + t1 = addETypeParameter(op, "T"); + g1 = createEGenericType(theIntegratedLanguageCorePackage.getObjectNameable()); t1.getEBounds().add(g1); addEParameter(op, theIntegratedLanguageCoreCtxPackage.getContext(), "context", 1, 1, IS_UNIQUE, IS_ORDERED); addEParameter(op, ecorePackage.getEString(), "project", 1, 1, IS_UNIQUE, IS_ORDERED); g1 = createEGenericType(ecorePackage.getEJavaClass()); - EGenericType g2 = createEGenericType(t1); + g2 = createEGenericType(t1); + g1.getETypeArguments().add(g2); + addEParameter(op, g1, "type", 1, 1, IS_UNIQUE, IS_ORDERED); + addEParameter(op, ecorePackage.getEString(), "name", 1, 1, IS_UNIQUE, IS_ORDERED); + addEParameter(op, ecorePackage.getEBoolean(), "replace", 1, 1, IS_UNIQUE, IS_ORDERED); + addEParameter(op, theMachineInterfaceCorePackage.getJavaInputStream(), "content", 1, 1, IS_UNIQUE, IS_ORDERED); + addEException(op, theMachineInterfaceCorePackage.getJavaIOException()); + + op = addEOperation(sourceManagerEClass, this.getSourceEntry(), "createObjectEntry", 1, 1, IS_UNIQUE, IS_ORDERED); + t1 = addETypeParameter(op, "T"); + g1 = createEGenericType(theIntegratedLanguageCorePackage.getObjectNameable()); + t1.getEBounds().add(g1); + addEParameter(op, theIntegratedLanguageCoreCtxPackage.getContext(), "context", 1, 1, IS_UNIQUE, IS_ORDERED); + addEParameter(op, this.getProject(), "project", 1, 1, IS_UNIQUE, IS_ORDERED); + g1 = createEGenericType(ecorePackage.getEJavaClass()); + g2 = createEGenericType(t1); g1.getETypeArguments().add(g2); addEParameter(op, g1, "type", 1, 1, IS_UNIQUE, IS_ORDERED); addEParameter(op, ecorePackage.getEString(), "name", 1, 1, IS_UNIQUE, IS_ORDERED); @@ -332,6 +365,22 @@ public void initializePackageContents() { addEParameter(op, g1, "content", 1, 1, IS_UNIQUE, IS_ORDERED); addEException(op, theMachineInterfaceCorePackage.getJavaIOException()); + op = addEOperation(sourceManagerEClass, this.getSourceEntry(), "createObjectEntry", 1, 1, IS_UNIQUE, IS_ORDERED); + t1 = addETypeParameter(op, "T"); + g1 = createEGenericType(theIntegratedLanguageCorePackage.getObjectNameable()); + t1.getEBounds().add(g1); + addEParameter(op, theIntegratedLanguageCoreCtxPackage.getContext(), "context", 1, 1, IS_UNIQUE, IS_ORDERED); + addEParameter(op, this.getProject(), "project", 1, 1, IS_UNIQUE, IS_ORDERED); + g1 = createEGenericType(ecorePackage.getEJavaClass()); + g2 = createEGenericType(t1); + g1.getETypeArguments().add(g2); + addEParameter(op, g1, "type", 1, 1, IS_UNIQUE, IS_ORDERED); + addEParameter(op, ecorePackage.getEString(), "name", 1, 1, IS_UNIQUE, IS_ORDERED); + addEParameter(op, ecorePackage.getEBoolean(), "replace", 1, 1, IS_UNIQUE, IS_ORDERED); + g1 = createEGenericType(t1); + addEParameter(op, g1, "content", 1, 1, IS_UNIQUE, IS_ORDERED); + addEException(op, theMachineInterfaceCorePackage.getJavaIOException()); + op = addEOperation(sourceManagerEClass, null, "deleteProject", 0, 1, IS_UNIQUE, IS_ORDERED); addEParameter(op, theIntegratedLanguageCoreCtxPackage.getContext(), "context", 1, 1, IS_UNIQUE, IS_ORDERED); addEParameter(op, this.getProject(), "project", 1, 1, IS_UNIQUE, IS_ORDERED); @@ -354,6 +403,18 @@ public void initializePackageContents() { addEParameter(op, g1, "type", 1, 1, IS_UNIQUE, IS_ORDERED); addEParameter(op, ecorePackage.getEString(), "name", 1, 1, IS_UNIQUE, IS_ORDERED); + op = addEOperation(sourceManagerEClass, this.getSourceEntry(), "getObjectEntry", 1, 1, IS_UNIQUE, IS_ORDERED); + t1 = addETypeParameter(op, "T"); + g1 = createEGenericType(theIntegratedLanguageCorePackage.getObjectNameable()); + t1.getEBounds().add(g1); + addEParameter(op, theIntegratedLanguageCoreCtxPackage.getContext(), "context", 1, 1, IS_UNIQUE, IS_ORDERED); + addEParameter(op, this.getProject(), "project", 1, 1, IS_UNIQUE, IS_ORDERED); + g1 = createEGenericType(ecorePackage.getEJavaClass()); + g2 = createEGenericType(t1); + g1.getETypeArguments().add(g2); + addEParameter(op, g1, "type", 1, 1, IS_UNIQUE, IS_ORDERED); + addEParameter(op, ecorePackage.getEString(), "name", 1, 1, IS_UNIQUE, IS_ORDERED); + op = addEOperation(sourceManagerEClass, this.getProject(), "getProject", 1, 1, IS_UNIQUE, IS_ORDERED); addEParameter(op, theIntegratedLanguageCoreCtxPackage.getContext(), "context", 1, 1, IS_UNIQUE, IS_ORDERED); addEParameter(op, ecorePackage.getEString(), "project", 1, 1, IS_UNIQUE, IS_ORDERED); @@ -374,6 +435,18 @@ public void initializePackageContents() { addEParameter(op, g1, "type", 1, 1, IS_UNIQUE, IS_ORDERED); addEParameter(op, ecorePackage.getEString(), "nameFilter", 0, 1, IS_UNIQUE, IS_ORDERED); + op = addEOperation(sourceManagerEClass, this.getSourceEntry(), "listObjectEntries", 0, -1, IS_UNIQUE, IS_ORDERED); + t1 = addETypeParameter(op, "T"); + g1 = createEGenericType(theIntegratedLanguageCorePackage.getObjectNameable()); + t1.getEBounds().add(g1); + addEParameter(op, theIntegratedLanguageCoreCtxPackage.getContext(), "context", 1, 1, IS_UNIQUE, IS_ORDERED); + addEParameter(op, this.getProject(), "project", 1, 1, IS_UNIQUE, IS_ORDERED); + g1 = createEGenericType(ecorePackage.getEJavaClass()); + g2 = createEGenericType(t1); + g1.getETypeArguments().add(g2); + addEParameter(op, g1, "type", 1, 1, IS_UNIQUE, IS_ORDERED); + addEParameter(op, ecorePackage.getEString(), "nameFilter", 0, 1, IS_UNIQUE, IS_ORDERED); + op = addEOperation(sourceManagerEClass, this.getProject(), "listProjects", 0, -1, IS_UNIQUE, IS_ORDERED); addEParameter(op, theIntegratedLanguageCoreCtxPackage.getContext(), "context", 1, 1, IS_UNIQUE, IS_ORDERED); @@ -390,14 +463,10 @@ public void initializePackageContents() { addEOperation(sourceNodeEClass, theMachineInterfaceCorePackage.getJavaURI(), "getLocation", 0, 1, IS_UNIQUE, IS_ORDERED); - addEOperation(sourceNodeEClass, this.getSourceNode(), "getParent", 0, 1, IS_UNIQUE, IS_ORDERED); - addEOperation(sourceNodeEClass, this.getProject(), "getProject", 0, 1, IS_UNIQUE, IS_ORDERED); addEOperation(sourceNodeEClass, ecorePackage.getEBoolean(), "isRoot", 0, 1, IS_UNIQUE, IS_ORDERED); - addEOperation(sourceNodeEClass, ecorePackage.getEString(), "getName", 0, 1, IS_UNIQUE, IS_ORDERED); - addEOperation(sourceNodeEClass, ecorePackage.getEString(), "getText", 1, 1, IS_UNIQUE, IS_ORDERED); // Create resource diff --git a/org.smeup.sys.il.core.e4/src/org/smeup/sys/il/core/e4/E4ContextImpl.java b/org.smeup.sys.il.core.e4/src/org/smeup/sys/il/core/e4/E4ContextImpl.java index e6e447e5..d2ed50bc 100644 --- a/org.smeup.sys.il.core.e4/src/org/smeup/sys/il/core/e4/E4ContextImpl.java +++ b/org.smeup.sys.il.core.e4/src/org/smeup/sys/il/core/e4/E4ContextImpl.java @@ -401,4 +401,15 @@ public String resolveAlias(String value) { else return value; } + + @Override + public List resolveAliases(List values) { + + List newValues = new ArrayList(); + + for(String value:values) + newValues.add(resolveAlias(value)); + + return newValues; + } } \ No newline at end of file diff --git a/org.smeup.sys.il.core/model/il-core.ecore b/org.smeup.sys.il.core/model/il-core.ecore index 61d62841..d29e8db4 100644 --- a/org.smeup.sys.il.core/model/il-core.ecore +++ b/org.smeup.sys.il.core/model/il-core.ecore @@ -298,6 +298,9 @@ + + + diff --git a/org.smeup.sys.il.core/src/org/smeup/sys/il/core/ctx/QContext.java b/org.smeup.sys.il.core/src/org/smeup/sys/il/core/ctx/QContext.java index f617d9b5..19d63163 100644 --- a/org.smeup.sys.il.core/src/org/smeup/sys/il/core/ctx/QContext.java +++ b/org.smeup.sys.il.core/src/org/smeup/sys/il/core/ctx/QContext.java @@ -9,6 +9,7 @@ import java.lang.annotation.Annotation; +import java.util.List; import org.smeup.sys.il.core.IntegratedLanguageCoreRuntimeException; /** @@ -140,6 +141,14 @@ public interface QContext { */ String resolveAlias(String value); + /** + * + * + * @model valuesMany="true" + * @generated + */ + List resolveAliases(List values); + /** * * @model klassRequired="true" objectRequired="true" diff --git a/org.smeup.sys.il.core/src/org/smeup/sys/il/core/ctx/impl/ContextImpl.java b/org.smeup.sys.il.core/src/org/smeup/sys/il/core/ctx/impl/ContextImpl.java index 5e0bbbed..a6f5272a 100644 --- a/org.smeup.sys.il.core/src/org/smeup/sys/il/core/ctx/impl/ContextImpl.java +++ b/org.smeup.sys.il.core/src/org/smeup/sys/il/core/ctx/impl/ContextImpl.java @@ -8,6 +8,7 @@ package org.smeup.sys.il.core.ctx.impl; import java.lang.annotation.Annotation; +import java.util.List; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; @@ -223,6 +224,17 @@ public String resolveAlias(String value) { throw new UnsupportedOperationException(); } + /** + * + * + * @generated + */ + public List resolveAliases(List values) { + // TODO: implement this method + // Ensure that you remove @generated or mark it @generated NOT + throw new UnsupportedOperationException(); + } + /** * * diff --git a/org.smeup.sys.il.core/src/org/smeup/sys/il/core/ctx/impl/IntegratedLanguageCoreCtxPackageImpl.java b/org.smeup.sys.il.core/src/org/smeup/sys/il/core/ctx/impl/IntegratedLanguageCoreCtxPackageImpl.java index add7a51f..bf63b4d7 100644 --- a/org.smeup.sys.il.core/src/org/smeup/sys/il/core/ctx/impl/IntegratedLanguageCoreCtxPackageImpl.java +++ b/org.smeup.sys.il.core/src/org/smeup/sys/il/core/ctx/impl/IntegratedLanguageCoreCtxPackageImpl.java @@ -460,6 +460,9 @@ public void initializePackageContents() { op = addEOperation(contextEClass, ecorePackage.getEString(), "resolveAlias", 0, 1, IS_UNIQUE, IS_ORDERED); addEParameter(op, ecorePackage.getEString(), "value", 0, 1, IS_UNIQUE, IS_ORDERED); + op = addEOperation(contextEClass, ecorePackage.getEString(), "resolveAliases", 0, -1, IS_UNIQUE, IS_ORDERED); + addEParameter(op, ecorePackage.getEString(), "values", 0, -1, IS_UNIQUE, IS_ORDERED); + op = addEOperation(contextEClass, null, "set", 1, 1, IS_UNIQUE, IS_ORDERED); t1 = addETypeParameter(op, "T"); g1 = createEGenericType(ecorePackage.getEJavaClass()); diff --git a/org.smeup.sys.il.memo.cdo/src/org/smeup/sys/il/memo/cdo/CDOResourceReaderImpl.java b/org.smeup.sys.il.memo.cdo/src/org/smeup/sys/il/memo/cdo/CDOResourceReaderImpl.java index 83429178..d229ccd3 100644 --- a/org.smeup.sys.il.memo.cdo/src/org/smeup/sys/il/memo/cdo/CDOResourceReaderImpl.java +++ b/org.smeup.sys.il.memo.cdo/src/org/smeup/sys/il/memo/cdo/CDOResourceReaderImpl.java @@ -34,13 +34,11 @@ public class CDOResourceReaderImpl extends ResourceRe private Class klass; private String klassName; private EClass eClass; - private String resource; public CDOResourceReaderImpl(QContextProvider contextProvider, CDONet4jSession session, Class klass, String resource) { setContextProvider(contextProvider); this.session = session; - this.resource = resource; this.klass = klass; this.klassName = CDOResourceHelper.getModelName(klass); @@ -48,10 +46,6 @@ public CDOResourceReaderImpl(QContextProvider contextProvider, CDONet4jSession s this.eClass = CDOResourceHelper.getEClass(ePackage, klass); } - public String getResourceName() { - return this.resource; - } - protected Class getResourceClass() { return this.klass; } @@ -75,7 +69,7 @@ public T lookup(String name) { CDOQuery query = getView(getContextProvider().getContext()).createQuery("ocl", queryString.toString(), eClass); query.setMaxResults(1); // library - query.setParameter("library", getResourceName()); +// query.setParameter("library", getResourceName()); // name query.setParameter("name", name); @@ -111,7 +105,7 @@ public QObjectIterator find(String nameFilter) { CDOQuery query = getView(getContextProvider().getContext()).createQuery("ocl", queryString.toString(), eClass); // parameters - query.setParameter("library", getResourceName()); +// query.setParameter("library", getResourceName()); if (nameFilter != null) if (nameFilter.endsWith("*")) query.setParameter("nameFilter", nameFilter.substring(0, nameFilter.length() - 1)); @@ -126,18 +120,21 @@ public QObjectIterator find(String nameFilter) { protected CDOView getView(QContext context) { if (view == null) { - - @SuppressWarnings("unchecked") - JobToViewMap typedViews = context.get(JobToViewMap.class); - if (typedViews == null) { - typedViews = new JobToViewMap(); - context.set(JobToViewMap.class, typedViews); - } else - view = typedViews.get(klass.getName()); - - if (view == null) { - view = getSession().openView(); - typedViews.put(klass.getName(), view); + synchronized (context) { + if (view == null) { + @SuppressWarnings("unchecked") + JobToViewMap typedViews = context.get(JobToViewMap.class); + if (typedViews == null) { + typedViews = new JobToViewMap(); + context.set(JobToViewMap.class, typedViews); + } else + view = typedViews.get(klass.getName()); + + if (view == null) { + view = getSession().openView(); + typedViews.put(klass.getName(), view); + } + } } } return view; diff --git a/org.smeup.sys.il.memo.cdo/src/org/smeup/sys/il/memo/cdo/CDOResourceWriterImpl.java b/org.smeup.sys.il.memo.cdo/src/org/smeup/sys/il/memo/cdo/CDOResourceWriterImpl.java index 40cef0ed..45a26d79 100644 --- a/org.smeup.sys.il.memo.cdo/src/org/smeup/sys/il/memo/cdo/CDOResourceWriterImpl.java +++ b/org.smeup.sys.il.memo.cdo/src/org/smeup/sys/il/memo/cdo/CDOResourceWriterImpl.java @@ -24,6 +24,7 @@ import org.smeup.sys.il.core.ctx.QContext; import org.smeup.sys.il.core.ctx.QContextProvider; import org.smeup.sys.il.memo.IntegratedLanguageMemoryRuntimeException; +import org.smeup.sys.il.memo.QResource; import org.smeup.sys.il.memo.QResourceHelper; import org.smeup.sys.il.memo.QResourceWriter; @@ -102,7 +103,7 @@ protected CDOTransaction getTransaction() { private CDOResource getResource(CDOTransaction transaction) { if (resource == null) - resource = transaction.getOrCreateResource(CDO_OMAC + "/" + getResourceName() + "/" + getResourceClass().getName()); + resource = transaction.getOrCreateResource(CDO_OMAC + "/" + getResource().getName() + "/" + getResourceClass().getName()); return resource; } @@ -181,4 +182,10 @@ private void doSave(T object, boolean replace) { throw new IntegratedLanguageMemoryRuntimeException(e); } } + + @Override + public QResource getResource() { + // TODO Auto-generated method stub + return null; + } } \ No newline at end of file diff --git a/org.smeup.sys.il.memo.jdt/META-INF/MANIFEST.MF b/org.smeup.sys.il.memo.jdt/META-INF/MANIFEST.MF index 6f631e52..66dfd107 100644 --- a/org.smeup.sys.il.memo.jdt/META-INF/MANIFEST.MF +++ b/org.smeup.sys.il.memo.jdt/META-INF/MANIFEST.MF @@ -8,5 +8,6 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Import-Package: javax.inject Require-Bundle: org.smeup.sys.il.memo, org.smeup.sys.dk.source, - org.smeup.sys.dk.source.jdt + org.smeup.sys.dk.source.jdt, + org.eclipse.emf.ecore.xmi Export-Package: org.smeup.sys.il.memo.jdt diff --git a/org.smeup.sys.il.memo.jdt/src/org/smeup/sys/il/memo/jdt/EMFConverter.java b/org.smeup.sys.il.memo.jdt/src/org/smeup/sys/il/memo/jdt/EMFConverter.java deleted file mode 100644 index 9fdfa07d..00000000 --- a/org.smeup.sys.il.memo.jdt/src/org/smeup/sys/il/memo/jdt/EMFConverter.java +++ /dev/null @@ -1,51 +0,0 @@ -/** - * Copyright (c) 2012, 2015 Sme.UP 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: - * Mattia Rocchi - Initial API and implementation - * - */ -package org.smeup.sys.il.memo.jdt; - -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.util.Collections; - -import org.eclipse.emf.common.util.URI; -import org.eclipse.emf.ecore.EObject; -import org.eclipse.emf.ecore.resource.Resource; -import org.eclipse.emf.ecore.resource.ResourceSet; - -public class EMFConverter { - - private ResourceSet resourceSet; - private URI uri; - - public EMFConverter(ResourceSet resourceSet, String uri) { - this.resourceSet = resourceSet; - this.uri = URI.createURI(uri); - } - - public EObject convertToEObject(InputStream stream) throws IOException { - - Resource resource = resourceSet.createResource(this.uri); - resource.load(stream, Collections.EMPTY_MAP); - - EObject eObject = resource.getContents().get(0); - - return eObject; - } - - public void writeToStream(EObject object, OutputStream stream) throws IOException { - - Resource resource = resourceSet.createResource(this.uri); - resource.getContents().add(object); - - resource.save(stream, Collections.EMPTY_MAP); - } -} \ No newline at end of file diff --git a/org.smeup.sys.il.memo.jdt/src/org/smeup/sys/il/memo/jdt/JDTResourceProviderImpl.java b/org.smeup.sys.il.memo.jdt/src/org/smeup/sys/il/memo/jdt/JDTResourceProviderImpl.java index 336a7dee..871d6756 100644 --- a/org.smeup.sys.il.memo.jdt/src/org/smeup/sys/il/memo/jdt/JDTResourceProviderImpl.java +++ b/org.smeup.sys.il.memo.jdt/src/org/smeup/sys/il/memo/jdt/JDTResourceProviderImpl.java @@ -16,9 +16,11 @@ import javax.inject.Inject; +import org.smeup.sys.dk.source.QProject; import org.smeup.sys.dk.source.jdt.JDTSourceManagerImpl; import org.smeup.sys.il.core.QObjectNameable; import org.smeup.sys.il.core.ctx.QContextProvider; +import org.smeup.sys.il.memo.QResource; import org.smeup.sys.il.memo.QResourceHelper; import org.smeup.sys.il.memo.QResourceManager; import org.smeup.sys.il.memo.QResourceProvider; @@ -28,9 +30,10 @@ public class JDTResourceProviderImpl implements QResourceProvider { private JDTSourceManagerImpl sourceManager; - + @Inject public JDTResourceProviderImpl(QResourceManager resourceManager) { + this.sourceManager = new JDTSourceManagerImpl("asup-obj"); resourceManager.registerProvider(QObjectNameable.class, this); @@ -39,7 +42,11 @@ public JDTResourceProviderImpl(QResourceManager resourceManager) { @Override public QResourceReader getResourceReader(QContextProvider contextProvider, Class klass, String resource) { - QResourceReader resourceReader = new JDTResourceReaderImpl(contextProvider, sourceManager, klass, resource); + QProject project = sourceManager.getProject(contextProvider.getContext(), resource); + if(project == null) + return null; + + QResourceReader resourceReader = new JDTResourceReaderImpl(contextProvider, sourceManager, klass, project); return resourceReader; } @@ -49,7 +56,11 @@ public QResourceReader getResourceReader(QContext List> readers = new ArrayList>(); for (String resource: resources) { - JDTResourceReaderImpl resourceReader = new JDTResourceReaderImpl(contextProvider, sourceManager, klass, resource); + QProject project = sourceManager.getProject(contextProvider.getContext(), resource); + if(project == null) + continue; + + JDTResourceReaderImpl resourceReader = new JDTResourceReaderImpl(contextProvider, sourceManager, klass, project); readers.add(resourceReader); } @@ -57,9 +68,21 @@ public QResourceReader getResourceReader(QContext } @Override - public QResourceWriter getResourceWriter(QContextProvider contextProvider, Class klass, String resource) { + public QResourceWriter getResourceWriter(QContextProvider contextProvider, Class klass, final String resource) { - QResourceWriter resourceWriter = new JDTResourceWriterImpl(contextProvider, sourceManager, resource, klass); + QProject project = sourceManager.getProject(contextProvider.getContext(), resource); + if(project == null) + return null; + + QResource qResource = new QResource() { + + @Override + public String getName() { + return resource; + } + }; + + QResourceWriter resourceWriter = new JDTResourceWriterImpl(contextProvider, sourceManager, qResource, klass, project); return resourceWriter; } diff --git a/org.smeup.sys.il.memo.jdt/src/org/smeup/sys/il/memo/jdt/JDTResourceReaderImpl.java b/org.smeup.sys.il.memo.jdt/src/org/smeup/sys/il/memo/jdt/JDTResourceReaderImpl.java index 77af1f71..2079a3e6 100644 --- a/org.smeup.sys.il.memo.jdt/src/org/smeup/sys/il/memo/jdt/JDTResourceReaderImpl.java +++ b/org.smeup.sys.il.memo.jdt/src/org/smeup/sys/il/memo/jdt/JDTResourceReaderImpl.java @@ -12,11 +12,10 @@ package org.smeup.sys.il.memo.jdt; import java.io.IOException; -import java.io.InputStream; import java.util.ArrayList; import java.util.List; -import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl; +import org.smeup.sys.dk.source.QProject; import org.smeup.sys.dk.source.QSourceEntry; import org.smeup.sys.dk.source.QSourceManager; import org.smeup.sys.il.core.QObjectIterator; @@ -31,50 +30,51 @@ public class JDTResourceReaderImpl extends ResourceRe protected QSourceManager sourceManager; protected Class klass; - protected EMFConverter emfConverter; - private String resource; - public JDTResourceReaderImpl(QContextProvider contextProvider, QSourceManager sourceManager, Class klass, String resource) { + private QProject project; + + public JDTResourceReaderImpl(QContextProvider contextProvider, QSourceManager sourceManager, Class klass, QProject project) { setContextProvider(contextProvider); - this.resource = resource; - + + this.project = project; + if(project == null) + "".toCharArray(); this.sourceManager = sourceManager; this.klass = klass; - String uri = "asup://" + contextProvider.getContext().getContextDescription().getName() + "/" + getResourceName() + "/" + klass.getSimpleName().toLowerCase().substring(1); - this.emfConverter = new EMFConverter(new ResourceSetImpl(), uri); } - - public String getResourceName() { - return this.resource; + + protected QProject getProject() { + return project; } @Override public boolean exists(String name) { - return sourceManager.getObjectEntry(getContextProvider().getContext(), getResourceName(), klass, name) != null; + return sourceManager.getObjectEntry(getContextProvider().getContext(), getProject(), klass, name) != null; } @Override public QObjectIterator find(String nameFilter) { - List entries = sourceManager.listObjectEntries(getContextProvider().getContext(), getResourceName(), klass, nameFilter); + List entries = sourceManager.listObjectEntries(getContextProvider().getContext(), getProject(), klass, nameFilter); if (entries == null) entries = new ArrayList<>(); - return new JDTObjectIteratorImpl(klass, new JDTSourceIterator(emfConverter, entries.iterator())); + return new JDTObjectIteratorImpl(klass, new JDTSourceIterator(klass, entries.iterator())); } @Override public T lookup(String name) { - QSourceEntry entry = sourceManager.getObjectEntry(getContextProvider().getContext(), getResourceName(), klass, name); + QSourceEntry entry = sourceManager.getObjectEntry(getContextProvider().getContext(), getProject(), klass, name); if (entry == null) return null; T object = null; try { - InputStream inputStream = entry.getInputStream(); - object = (T) emfConverter.convertToEObject(inputStream); - inputStream.close(); + object = entry.load(klass); +// InputStream inputStream = entry.getInputStream(); +// object = (T) emfConverter.convertToEObject(inputStream); +// inputStream.close(); } catch (IOException e) { // TODO Auto-generated catch block e.printStackTrace(); diff --git a/org.smeup.sys.il.memo.jdt/src/org/smeup/sys/il/memo/jdt/JDTResourceWriterImpl.java b/org.smeup.sys.il.memo.jdt/src/org/smeup/sys/il/memo/jdt/JDTResourceWriterImpl.java index d7e5c381..da61792e 100644 --- a/org.smeup.sys.il.memo.jdt/src/org/smeup/sys/il/memo/jdt/JDTResourceWriterImpl.java +++ b/org.smeup.sys.il.memo.jdt/src/org/smeup/sys/il/memo/jdt/JDTResourceWriterImpl.java @@ -12,17 +12,17 @@ */ package org.smeup.sys.il.memo.jdt; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; import java.io.IOException; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.util.EcoreUtil; +import org.smeup.sys.dk.source.QProject; import org.smeup.sys.dk.source.QSourceEntry; import org.smeup.sys.dk.source.QSourceManager; import org.smeup.sys.il.core.QObjectNameable; import org.smeup.sys.il.core.ctx.QContextProvider; import org.smeup.sys.il.memo.IntegratedLanguageMemoryRuntimeException; +import org.smeup.sys.il.memo.QResource; import org.smeup.sys.il.memo.QResourceHelper; import org.smeup.sys.il.memo.QResourceWriter; @@ -30,8 +30,16 @@ public class JDTResourceWriterImpl extends JDTResourc private static final long serialVersionUID = 1L; - public JDTResourceWriterImpl(QContextProvider contextProvider, QSourceManager sourceManager, String resource, Class klass) { - super(contextProvider, sourceManager, klass, resource); + private QResource resource; + + public JDTResourceWriterImpl(QContextProvider contextProvider, QSourceManager sourceManager, QResource resource, Class klass, QProject project) { + super(contextProvider, sourceManager, klass, project); + this.resource = resource; + } + + @Override + public QResource getResource() { + return resource; } @Override @@ -48,7 +56,7 @@ public synchronized void delete(T object) { } private void doDelete(T object) throws IOException { - QSourceEntry entry = sourceManager.getObjectEntry(getContextProvider().getContext(), getResourceName(), klass, object.getName()); + QSourceEntry entry = sourceManager.getObjectEntry(getContextProvider().getContext(), getProject(), klass, object.getName()); if (entry == null) throw new IntegratedLanguageMemoryRuntimeException("Object " + object.getName() + " not found"); @@ -63,7 +71,7 @@ public synchronized void save(T object) { @Override public synchronized void save(T object, boolean replace) { try { - QResourceHelper.firePreSaveEvent(this, object);; + QResourceHelper.firePreSaveEvent(this, object); doSave(object, replace); @@ -74,10 +82,7 @@ public synchronized void save(T object, boolean replace) { } private void doSave(T object, boolean replace) throws IOException { - ByteArrayOutputStream outpuStream = new ByteArrayOutputStream(); - emfConverter.writeToStream((EObject) object, outpuStream); - - sourceManager.createObjectEntry(getContextProvider().getContext(), getResourceName(), klass, object.getName(), replace, new ByteArrayInputStream(outpuStream.toByteArray())); + sourceManager.createObjectEntry(getContextProvider().getContext(), getProject(), klass, object.getName(), replace, object); } @SuppressWarnings("unchecked") @@ -98,7 +103,7 @@ public void rename(T object, String newName) { doSave(newObject, true); doDelete(object); - QResourceHelper.firePreRenameEvent(this, newObject, oldName); + QResourceHelper.firePostRenameEvent(this, newObject, oldName); } catch (Exception e) { throw new IntegratedLanguageMemoryRuntimeException(e); } diff --git a/org.smeup.sys.il.memo.jdt/src/org/smeup/sys/il/memo/jdt/JDTSourceIterator.java b/org.smeup.sys.il.memo.jdt/src/org/smeup/sys/il/memo/jdt/JDTSourceIterator.java index b1d48026..142a1aa2 100644 --- a/org.smeup.sys.il.memo.jdt/src/org/smeup/sys/il/memo/jdt/JDTSourceIterator.java +++ b/org.smeup.sys.il.memo.jdt/src/org/smeup/sys/il/memo/jdt/JDTSourceIterator.java @@ -12,7 +12,6 @@ package org.smeup.sys.il.memo.jdt; import java.io.IOException; -import java.io.InputStream; import java.util.Iterator; import org.smeup.sys.dk.source.QSourceEntry; @@ -20,12 +19,12 @@ public class JDTSourceIterator implements Iterator { + private Class klass; private Iterator entries; - private EMFConverter emfConverter; - - public JDTSourceIterator(EMFConverter emfConverter, Iterator entries) { + + public JDTSourceIterator(Class klass, Iterator entries) { + this.klass = klass; this.entries = entries; - this.emfConverter = emfConverter; } @Override @@ -33,16 +32,16 @@ public boolean hasNext() { return entries.hasNext(); } - @SuppressWarnings("unchecked") @Override public T next() { T typedObject = null; QSourceEntry entry = entries.next(); try { - InputStream inputStream = entry.getInputStream(); - typedObject = (T) emfConverter.convertToEObject(inputStream); - inputStream.close(); +// InputStream inputStream = entry.getInputStream(); +// typedObject = (T) jdtResource.convertToEObject(inputStream); +// inputStream.close(); + typedObject = entry.load(klass); } catch (IOException e) { System.err.println(e.getMessage() + " location: " + entry); typedObject = next(); @@ -55,5 +54,4 @@ public T next() { public void remove() { entries.remove(); } - } diff --git a/org.smeup.sys.il.memo/model/il-memo.ecore b/org.smeup.sys.il.memo/model/il-memo.ecore index 074d7340..12ba19b5 100644 --- a/org.smeup.sys.il.memo/model/il-memo.ecore +++ b/org.smeup.sys.il.memo/model/il-memo.ecore @@ -1,35 +1,20 @@ - - - - - - - - - - - + + - - - - - - + + + - - @@ -39,6 +24,14 @@ + + + + + + @@ -236,7 +229,12 @@ - + + + + + + @@ -256,6 +254,7 @@ + @@ -273,7 +272,6 @@ - diff --git a/org.smeup.sys.il.memo/src/org/smeup/sys/il/memo/QIntegratedLanguageMemoryPackage.java b/org.smeup.sys.il.memo/src/org/smeup/sys/il/memo/QIntegratedLanguageMemoryPackage.java index 7351368b..960645a6 100644 --- a/org.smeup.sys.il.memo/src/org/smeup/sys/il/memo/QIntegratedLanguageMemoryPackage.java +++ b/org.smeup.sys.il.memo/src/org/smeup/sys/il/memo/QIntegratedLanguageMemoryPackage.java @@ -62,60 +62,70 @@ public interface QIntegratedLanguageMemoryPackage extends EPackage { QIntegratedLanguageMemoryPackage eINSTANCE = org.smeup.sys.il.memo.impl.IntegratedLanguageMemoryPackageImpl.init(); /** - * The meta object id for the '{@link org.smeup.sys.il.memo.impl.ResourceImpl Resource}' class. + * The meta object id for the '{@link org.smeup.sys.il.memo.QResource Resource}' class. * * - * @see org.smeup.sys.il.memo.impl.ResourceImpl + * @see org.smeup.sys.il.memo.QResource * @see org.smeup.sys.il.memo.impl.IntegratedLanguageMemoryPackageImpl#getResource() * @generated */ int RESOURCE = 0; /** - * The feature id for the 'Context Provider' reference. + * The number of structural features of the 'Resource' class. * * * @generated * @ordered */ - int RESOURCE__CONTEXT_PROVIDER = QIntegratedLanguageCorePackage.OBJECT_FEATURE_COUNT + 0; + int RESOURCE_FEATURE_COUNT = QIntegratedLanguageCorePackage.NAMEABLE_FEATURE_COUNT + 0; /** - * The feature id for the 'Notifier' reference. + * The meta object id for the '{@link org.smeup.sys.il.memo.QResourceEvent Resource Event}' class. * * + * @see org.smeup.sys.il.memo.QResourceEvent + * @see org.smeup.sys.il.memo.impl.IntegratedLanguageMemoryPackageImpl#getResourceEvent() * @generated - * @ordered */ - int RESOURCE__NOTIFIER = QIntegratedLanguageCorePackage.OBJECT_FEATURE_COUNT + 1; + int RESOURCE_EVENT = 1; /** - * The number of structural features of the 'Resource' class. + * The number of structural features of the 'Resource Event' class. * * * @generated * @ordered */ - int RESOURCE_FEATURE_COUNT = QIntegratedLanguageCorePackage.OBJECT_FEATURE_COUNT + 2; + int RESOURCE_EVENT_FEATURE_COUNT = 0; /** - * The meta object id for the '{@link org.smeup.sys.il.memo.QResourceEvent Resource Event}' class. + * The meta object id for the '{@link org.smeup.sys.il.memo.impl.ResourceHandlerImpl Resource Handler}' class. * * - * @see org.smeup.sys.il.memo.QResourceEvent - * @see org.smeup.sys.il.memo.impl.IntegratedLanguageMemoryPackageImpl#getResourceEvent() + * @see org.smeup.sys.il.memo.impl.ResourceHandlerImpl + * @see org.smeup.sys.il.memo.impl.IntegratedLanguageMemoryPackageImpl#getResourceHandler() * @generated */ - int RESOURCE_EVENT = 1; + int RESOURCE_HANDLER = 2; /** - * The number of structural features of the 'Resource Event' class. + * The feature id for the 'Context Provider' reference. * * * @generated * @ordered */ - int RESOURCE_EVENT_FEATURE_COUNT = 0; + int RESOURCE_HANDLER__CONTEXT_PROVIDER = QIntegratedLanguageCorePackage.OBJECT_FEATURE_COUNT + 0; + + /** + * The number of structural features of the 'Resource Handler' class. + * + * + * @generated + * @ordered + */ + int RESOURCE_HANDLER_FEATURE_COUNT = QIntegratedLanguageCorePackage.OBJECT_FEATURE_COUNT + 1; /** * The meta object id for the '{@link org.smeup.sys.il.memo.QResourceListener Resource Listener}' class. @@ -125,7 +135,7 @@ public interface QIntegratedLanguageMemoryPackage extends EPackage { * @see org.smeup.sys.il.memo.impl.IntegratedLanguageMemoryPackageImpl#getResourceListener() * @generated */ - int RESOURCE_LISTENER = 2; + int RESOURCE_LISTENER = 3; /** * The number of structural features of the 'Resource Listener' class. @@ -144,7 +154,7 @@ public interface QIntegratedLanguageMemoryPackage extends EPackage { * @see org.smeup.sys.il.memo.impl.IntegratedLanguageMemoryPackageImpl#getResourceProvider() * @generated */ - int RESOURCE_PROVIDER = 5; + int RESOURCE_PROVIDER = 6; /** * The number of structural features of the 'Resource Provider' class. @@ -163,7 +173,7 @@ public interface QIntegratedLanguageMemoryPackage extends EPackage { * @see org.smeup.sys.il.memo.impl.IntegratedLanguageMemoryPackageImpl#getResourceManager() * @generated */ - int RESOURCE_MANAGER = 3; + int RESOURCE_MANAGER = 4; /** * The number of structural features of the 'Resource Manager' class. @@ -182,7 +192,7 @@ public interface QIntegratedLanguageMemoryPackage extends EPackage { * @see org.smeup.sys.il.memo.impl.IntegratedLanguageMemoryPackageImpl#getResourceNotifier() * @generated */ - int RESOURCE_NOTIFIER = 4; + int RESOURCE_NOTIFIER = 5; /** * The number of structural features of the 'Resource Notifier' class. @@ -201,7 +211,7 @@ public interface QIntegratedLanguageMemoryPackage extends EPackage { * @see org.smeup.sys.il.memo.impl.IntegratedLanguageMemoryPackageImpl#getResourceReader() * @generated */ - int RESOURCE_READER = 6; + int RESOURCE_READER = 7; /** * The feature id for the 'Context Provider' reference. @@ -210,7 +220,7 @@ public interface QIntegratedLanguageMemoryPackage extends EPackage { * @generated * @ordered */ - int RESOURCE_READER__CONTEXT_PROVIDER = RESOURCE__CONTEXT_PROVIDER; + int RESOURCE_READER__CONTEXT_PROVIDER = RESOURCE_HANDLER__CONTEXT_PROVIDER; /** * The feature id for the 'Notifier' reference. @@ -219,7 +229,7 @@ public interface QIntegratedLanguageMemoryPackage extends EPackage { * @generated * @ordered */ - int RESOURCE_READER__NOTIFIER = RESOURCE__NOTIFIER; + int RESOURCE_READER__NOTIFIER = RESOURCE_HANDLER_FEATURE_COUNT + 0; /** * The number of structural features of the 'Resource Reader' class. @@ -228,7 +238,7 @@ public interface QIntegratedLanguageMemoryPackage extends EPackage { * @generated * @ordered */ - int RESOURCE_READER_FEATURE_COUNT = RESOURCE_FEATURE_COUNT + 0; + int RESOURCE_READER_FEATURE_COUNT = RESOURCE_HANDLER_FEATURE_COUNT + 1; /** * The meta object id for the '{@link org.smeup.sys.il.memo.QResourceWriter Resource Writer}' class. @@ -238,7 +248,7 @@ public interface QIntegratedLanguageMemoryPackage extends EPackage { * @see org.smeup.sys.il.memo.impl.IntegratedLanguageMemoryPackageImpl#getResourceWriter() * @generated */ - int RESOURCE_WRITER = 7; + int RESOURCE_WRITER = 8; /** * The feature id for the 'Context Provider' reference. @@ -275,7 +285,7 @@ public interface QIntegratedLanguageMemoryPackage extends EPackage { * @see org.smeup.sys.il.memo.impl.IntegratedLanguageMemoryPackageImpl#getResourceEventType() * @generated */ - int RESOURCE_EVENT_TYPE = 8; + int RESOURCE_EVENT_TYPE = 9; /** * The meta object id for the '{@link org.smeup.sys.il.memo.Scope Scope}' enum. @@ -285,7 +295,7 @@ public interface QIntegratedLanguageMemoryPackage extends EPackage { * @see org.smeup.sys.il.memo.impl.IntegratedLanguageMemoryPackageImpl#getScope() * @generated */ - int SCOPE = 9; + int SCOPE = 10; /** * Returns the meta object for class '{@link org.smeup.sys.il.memo.QResource Resource}'. @@ -298,36 +308,35 @@ public interface QIntegratedLanguageMemoryPackage extends EPackage { EClass getResource(); /** - * Returns the meta object for the reference '{@link org.smeup.sys.il.memo.QResource#getContextProvider Context Provider}'. + * Returns the meta object for class '{@link org.smeup.sys.il.memo.QResourceEvent Resource Event}'. * * - * @return the meta object for the reference 'Context Provider'. - * @see org.smeup.sys.il.memo.QResource#getContextProvider() - * @see #getResource() + * @return the meta object for class 'Resource Event'. + * @see org.smeup.sys.il.memo.QResourceEvent * @generated */ - EReference getResource_ContextProvider(); + EClass getResourceEvent(); /** - * Returns the meta object for the reference '{@link org.smeup.sys.il.memo.QResource#getNotifier Notifier}'. + * Returns the meta object for class '{@link org.smeup.sys.il.memo.QResourceHandler Resource Handler}'. * * - * @return the meta object for the reference 'Notifier'. - * @see org.smeup.sys.il.memo.QResource#getNotifier() - * @see #getResource() + * @return the meta object for class 'Resource Handler'. + * @see org.smeup.sys.il.memo.QResourceHandler * @generated */ - EReference getResource_Notifier(); + EClass getResourceHandler(); /** - * Returns the meta object for class '{@link org.smeup.sys.il.memo.QResourceEvent Resource Event}'. + * Returns the meta object for the reference '{@link org.smeup.sys.il.memo.QResourceHandler#getContextProvider Context Provider}'. * * - * @return the meta object for class 'Resource Event'. - * @see org.smeup.sys.il.memo.QResourceEvent + * @return the meta object for the reference 'Context Provider'. + * @see org.smeup.sys.il.memo.QResourceHandler#getContextProvider() + * @see #getResourceHandler() * @generated */ - EClass getResourceEvent(); + EReference getResourceHandler_ContextProvider(); /** * Returns the meta object for class '{@link org.smeup.sys.il.memo.QResourceListener Resource Listener}'. @@ -379,6 +388,17 @@ public interface QIntegratedLanguageMemoryPackage extends EPackage { */ EClass getResourceReader(); + /** + * Returns the meta object for the reference '{@link org.smeup.sys.il.memo.QResourceReader#getNotifier Notifier}'. + * + * + * @return the meta object for the reference 'Notifier'. + * @see org.smeup.sys.il.memo.QResourceReader#getNotifier() + * @see #getResourceReader() + * @generated + */ + EReference getResourceReader_Notifier(); + /** * Returns the meta object for class '{@link org.smeup.sys.il.memo.QResourceWriter Resource Writer}'. * @@ -432,37 +452,39 @@ public interface QIntegratedLanguageMemoryPackage extends EPackage { */ interface Literals { /** - * The meta object literal for the '{@link org.smeup.sys.il.memo.impl.ResourceImpl Resource}' class. + * The meta object literal for the '{@link org.smeup.sys.il.memo.QResource Resource}' class. * * - * @see org.smeup.sys.il.memo.impl.ResourceImpl + * @see org.smeup.sys.il.memo.QResource * @see org.smeup.sys.il.memo.impl.IntegratedLanguageMemoryPackageImpl#getResource() * @generated */ EClass RESOURCE = eINSTANCE.getResource(); /** - * The meta object literal for the 'Context Provider' reference feature. + * The meta object literal for the '{@link org.smeup.sys.il.memo.QResourceEvent Resource Event}' class. * * + * @see org.smeup.sys.il.memo.QResourceEvent + * @see org.smeup.sys.il.memo.impl.IntegratedLanguageMemoryPackageImpl#getResourceEvent() * @generated */ - EReference RESOURCE__CONTEXT_PROVIDER = eINSTANCE.getResource_ContextProvider(); + EClass RESOURCE_EVENT = eINSTANCE.getResourceEvent(); /** - * The meta object literal for the 'Notifier' reference feature. + * The meta object literal for the '{@link org.smeup.sys.il.memo.impl.ResourceHandlerImpl Resource Handler}' class. * * + * @see org.smeup.sys.il.memo.impl.ResourceHandlerImpl + * @see org.smeup.sys.il.memo.impl.IntegratedLanguageMemoryPackageImpl#getResourceHandler() * @generated */ - EReference RESOURCE__NOTIFIER = eINSTANCE.getResource_Notifier(); + EClass RESOURCE_HANDLER = eINSTANCE.getResourceHandler(); /** - * The meta object literal for the '{@link org.smeup.sys.il.memo.QResourceEvent Resource Event}' class. + * The meta object literal for the 'Context Provider' reference feature. * * - * @see org.smeup.sys.il.memo.QResourceEvent - * @see org.smeup.sys.il.memo.impl.IntegratedLanguageMemoryPackageImpl#getResourceEvent() * @generated */ - EClass RESOURCE_EVENT = eINSTANCE.getResourceEvent(); + EReference RESOURCE_HANDLER__CONTEXT_PROVIDER = eINSTANCE.getResourceHandler_ContextProvider(); /** * The meta object literal for the '{@link org.smeup.sys.il.memo.QResourceListener Resource Listener}' class. * @@ -508,6 +530,13 @@ interface Literals { * @generated */ EClass RESOURCE_READER = eINSTANCE.getResourceReader(); + /** + * The meta object literal for the 'Notifier' reference feature. + * + * + * @generated + */ + EReference RESOURCE_READER__NOTIFIER = eINSTANCE.getResourceReader_Notifier(); /** * The meta object literal for the '{@link org.smeup.sys.il.memo.QResourceWriter Resource Writer}' class. * diff --git a/org.smeup.sys.il.memo/src/org/smeup/sys/il/memo/QResource.java b/org.smeup.sys.il.memo/src/org/smeup/sys/il/memo/QResource.java index f58dcf4c..25e4e7cb 100644 --- a/org.smeup.sys.il.memo/src/org/smeup/sys/il/memo/QResource.java +++ b/org.smeup.sys.il.memo/src/org/smeup/sys/il/memo/QResource.java @@ -7,77 +7,17 @@ */ package org.smeup.sys.il.memo; -import org.smeup.sys.il.core.QObject; -import org.smeup.sys.il.core.QObjectNameable; -import org.smeup.sys.il.core.ctx.QContextProvider; +import org.smeup.sys.il.core.QNameable; /** * A representation of the model object ' * QResource'. * - *

- * The following features are supported: - *

    - *
  • {@link org.smeup.sys.il.memo.QResource#getContextProvider Context Provider}
    • - *
  • {@link org.smeup.sys.il.memo.QResource#getNotifier Notifier}
    • - *
- *

* * @see org.smeup.sys.il.memo.QIntegratedLanguageMemoryPackage#getResource() - * @model abstract="true" + * @model interface="true" abstract="true" * @generated */ -public interface QResource extends QObject { - /** - * Returns the value of the 'Context Provider' reference. - * - *

- * If the meaning of the 'Context Provider' reference isn't clear, - * there really should be more of a description here... - *

- * - * @return the value of the 'Context Provider' reference. - * @see #setContextProvider(QContextProvider) - * @see org.smeup.sys.il.memo.QIntegratedLanguageMemoryPackage#getResource_ContextProvider() - * @model resolveProxies="false" required="true" transient="true" - * @generated - */ - QContextProvider getContextProvider(); - - /** - * Sets the value of the '{@link org.smeup.sys.il.memo.QResource#getContextProvider Context Provider}' reference. - * - * - * @param value the new value of the 'Context Provider' reference. - * @see #getContextProvider() - * @generated - */ - void setContextProvider(QContextProvider value); - - /** - * Returns the value of the 'Notifier' reference. - * - *

- * If the meaning of the 'Notifier' reference isn't clear, - * there really should be more of a description here... - *

- * - * @return the value of the 'Notifier' reference. - * @see #setNotifier(QResourceNotifier) - * @see org.smeup.sys.il.memo.QIntegratedLanguageMemoryPackage#getResource_Notifier() - * @model - * @generated - */ - QResourceNotifier getNotifier(); - - /** - * Sets the value of the '{@link org.smeup.sys.il.memo.QResource#getNotifier Notifier}' reference. - * - * - * @param value the new value of the 'Notifier' reference. - * @see #getNotifier() - * @generated - */ - void setNotifier(QResourceNotifier value); +public interface QResource extends QNameable { } // QResource diff --git a/org.smeup.sys.il.memo/src/org/smeup/sys/il/memo/QResourceEvent.java b/org.smeup.sys.il.memo/src/org/smeup/sys/il/memo/QResourceEvent.java index c03a02ba..03e85b78 100644 --- a/org.smeup.sys.il.memo/src/org/smeup/sys/il/memo/QResourceEvent.java +++ b/org.smeup.sys.il.memo/src/org/smeup/sys/il/memo/QResourceEvent.java @@ -8,6 +8,7 @@ package org.smeup.sys.il.memo; import org.smeup.sys.il.core.QObjectNameable; +import org.smeup.sys.il.core.ctx.QContextProvider; /** * A representation of the model object ' @@ -26,7 +27,7 @@ public interface QResourceEvent { * @model kind="operation" required="true" * @generated */ - ResourceEventType getEventType(); + QContextProvider getContextProvider(); /** * @@ -34,7 +35,7 @@ public interface QResourceEvent { * @model kind="operation" required="true" * @generated */ - QResource getResource(); + ResourceEventType getEventType(); /** * @@ -42,7 +43,7 @@ public interface QResourceEvent { * @model kind="operation" required="true" * @generated */ - String getResourceName(); + QResource getResource(); /** * diff --git a/org.smeup.sys.il.memo/src/org/smeup/sys/il/memo/QResourceHandler.java b/org.smeup.sys.il.memo/src/org/smeup/sys/il/memo/QResourceHandler.java new file mode 100644 index 00000000..a59339b2 --- /dev/null +++ b/org.smeup.sys.il.memo/src/org/smeup/sys/il/memo/QResourceHandler.java @@ -0,0 +1,57 @@ +/** + * Copyright (c) 2012, 2015 Sme.UP 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 + */ +package org.smeup.sys.il.memo; + +import org.smeup.sys.il.core.QObject; +import org.smeup.sys.il.core.QObjectNameable; +import org.smeup.sys.il.core.ctx.QContextProvider; + +/** + * + * A representation of the model object 'Resource Handler'. + * + * + *

+ * The following features are supported: + *

    + *
  • {@link org.smeup.sys.il.memo.QResourceHandler#getContextProvider Context Provider}
    • + *
+ *

+ * + * @see org.smeup.sys.il.memo.QIntegratedLanguageMemoryPackage#getResourceHandler() + * @model abstract="true" + * @generated + */ +public interface QResourceHandler extends QObject { + + /** + * Returns the value of the 'Context Provider' reference. + * + *

+ * If the meaning of the 'Context Provider' reference isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Context Provider' reference. + * @see #setContextProvider(QContextProvider) + * @see org.smeup.sys.il.memo.QIntegratedLanguageMemoryPackage#getResourceHandler_ContextProvider() + * @model resolveProxies="false" required="true" transient="true" + * @generated + */ + QContextProvider getContextProvider(); + + /** + * Sets the value of the '{@link org.smeup.sys.il.memo.QResourceHandler#getContextProvider Context Provider}' reference. + * + * + * @param value the new value of the 'Context Provider' reference. + * @see #getContextProvider() + * @generated + */ + void setContextProvider(QContextProvider value); +} // QResourceHandler diff --git a/org.smeup.sys.il.memo/src/org/smeup/sys/il/memo/QResourceHelper.java b/org.smeup.sys.il.memo/src/org/smeup/sys/il/memo/QResourceHelper.java index 571dbdda..66a8278d 100644 --- a/org.smeup.sys.il.memo/src/org/smeup/sys/il/memo/QResourceHelper.java +++ b/org.smeup.sys.il.memo/src/org/smeup/sys/il/memo/QResourceHelper.java @@ -18,6 +18,7 @@ import org.smeup.sys.il.core.QObjectIterator; import org.smeup.sys.il.core.QObjectNameable; +import org.smeup.sys.il.core.ctx.QContextProvider; import org.smeup.sys.il.memo.impl.ResourceReaderImpl; public class QResourceHelper { @@ -47,11 +48,6 @@ public ResourceEventType getEventType() { return ResourceEventType.PRE_DELETE; } - @Override - public String getResourceName() { - return resourceWriter.getResourceName(); - } - @Override public T getSource() { return source; @@ -68,8 +64,13 @@ public String getOldName() { } @Override - public QResource getResource() { - return resourceWriter; + public QResource getResource() { + return resourceWriter.getResource(); + } + + @Override + public QContextProvider getContextProvider() { + return resourceWriter.getContextProvider(); } }; @@ -86,11 +87,6 @@ public ResourceEventType getEventType() { return ResourceEventType.POST_DELETE; } - @Override - public String getResourceName() { - return resourceWriter.getResourceName(); - } - @Override public T getSource() { return source; @@ -107,8 +103,13 @@ public String getOldName() { } @Override - public QResource getResource() { - return resourceWriter; + public QResource getResource() { + return resourceWriter.getResource(); + } + + @Override + public QContextProvider getContextProvider() { + return resourceWriter.getContextProvider(); } }; @@ -125,11 +126,6 @@ public ResourceEventType getEventType() { return ResourceEventType.PRE_RENAME; } - @Override - public String getResourceName() { - return resourceWriter.getResourceName(); - } - @Override public T getSource() { return source; @@ -146,8 +142,13 @@ public String getOldName() { } @Override - public QResource getResource() { - return resourceWriter; + public QResource getResource() { + return resourceWriter.getResource(); + } + + @Override + public QContextProvider getContextProvider() { + return resourceWriter.getContextProvider(); } }; @@ -164,11 +165,6 @@ public ResourceEventType getEventType() { return ResourceEventType.POST_RENAME; } - @Override - public String getResourceName() { - return resourceWriter.getResourceName(); - } - @Override public T getSource() { return source; @@ -185,8 +181,13 @@ public String getOldName() { } @Override - public QResource getResource() { - return resourceWriter; + public QResource getResource() { + return resourceWriter.getResource(); + } + + @Override + public QContextProvider getContextProvider() { + return resourceWriter.getContextProvider(); } }; @@ -204,11 +205,6 @@ public ResourceEventType getEventType() { return ResourceEventType.PRE_SAVE; } - @Override - public String getResourceName() { - return resourceWriter.getResourceName(); - } - @Override public T getSource() { return source; @@ -225,8 +221,13 @@ public String getOldName() { } @Override - public QResource getResource() { - return resourceWriter; + public QResource getResource() { + return resourceWriter.getResource(); + } + + @Override + public QContextProvider getContextProvider() { + return resourceWriter.getContextProvider(); } }; @@ -244,11 +245,6 @@ public ResourceEventType getEventType() { return ResourceEventType.POST_SAVE; } - @Override - public String getResourceName() { - return resourceWriter.getResourceName(); - } - @Override public T getSource() { return source; @@ -265,8 +261,13 @@ public String getOldName() { } @Override - public QResource getResource() { - return resourceWriter; + public QResource getResource() { + return resourceWriter.getResource(); + } + + @Override + public QContextProvider getContextProvider() { + return resourceWriter.getContextProvider(); } }; diff --git a/org.smeup.sys.il.memo/src/org/smeup/sys/il/memo/QResourceReader.java b/org.smeup.sys.il.memo/src/org/smeup/sys/il/memo/QResourceReader.java index 53c2183f..3a67b838 100644 --- a/org.smeup.sys.il.memo/src/org/smeup/sys/il/memo/QResourceReader.java +++ b/org.smeup.sys.il.memo/src/org/smeup/sys/il/memo/QResourceReader.java @@ -15,12 +15,44 @@ * A representation of the model object ' * QResource'. * + *

+ * The following features are supported: + *

    + *
  • {@link org.smeup.sys.il.memo.QResourceReader#getNotifier Notifier}
    • + *
+ *

* * @see org.smeup.sys.il.memo.QIntegratedLanguageMemoryPackage#getResourceReader() * @model abstract="true" * @generated */ -public interface QResourceReader extends QResource { +public interface QResourceReader extends QResourceHandler { + /** + * Returns the value of the 'Notifier' reference. + * + *

+ * If the meaning of the 'Notifier' reference isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Notifier' reference. + * @see #setNotifier(QResourceNotifier) + * @see org.smeup.sys.il.memo.QIntegratedLanguageMemoryPackage#getResourceReader_Notifier() + * @model + * @generated + */ + QResourceNotifier getNotifier(); + + /** + * Sets the value of the '{@link org.smeup.sys.il.memo.QResourceReader#getNotifier Notifier}' reference. + * + * + * @param value the new value of the 'Notifier' reference. + * @see #getNotifier() + * @generated + */ + void setNotifier(QResourceNotifier value); + /** * * @model required="true" nameRequired="true" diff --git a/org.smeup.sys.il.memo/src/org/smeup/sys/il/memo/QResourceWriter.java b/org.smeup.sys.il.memo/src/org/smeup/sys/il/memo/QResourceWriter.java index 925e7abf..29a0ff5b 100644 --- a/org.smeup.sys.il.memo/src/org/smeup/sys/il/memo/QResourceWriter.java +++ b/org.smeup.sys.il.memo/src/org/smeup/sys/il/memo/QResourceWriter.java @@ -34,6 +34,14 @@ public interface QResourceWriter extends QResourceRea */ void delete(T object); + /** + * + * + * @model kind="operation" required="true" + * @generated + */ + QResource getResource(); + /** * * @model objectRequired="true" @@ -56,12 +64,4 @@ public interface QResourceWriter extends QResourceRea */ void rename(T object, String newName); - /** - * - * - * @model kind="operation" required="true" - * @generated - */ - String getResourceName(); - } // QResourceWriter diff --git a/org.smeup.sys.il.memo/src/org/smeup/sys/il/memo/impl/IntegratedLanguageMemoryPackageImpl.java b/org.smeup.sys.il.memo/src/org/smeup/sys/il/memo/impl/IntegratedLanguageMemoryPackageImpl.java index f3c4992c..7fcede23 100644 --- a/org.smeup.sys.il.memo/src/org/smeup/sys/il/memo/impl/IntegratedLanguageMemoryPackageImpl.java +++ b/org.smeup.sys.il.memo/src/org/smeup/sys/il/memo/impl/IntegratedLanguageMemoryPackageImpl.java @@ -25,6 +25,7 @@ import org.smeup.sys.il.memo.QIntegratedLanguageMemoryPackage; import org.smeup.sys.il.memo.QResource; import org.smeup.sys.il.memo.QResourceEvent; +import org.smeup.sys.il.memo.QResourceHandler; import org.smeup.sys.il.memo.QResourceListener; import org.smeup.sys.il.memo.QResourceManager; import org.smeup.sys.il.memo.QResourceNotifier; @@ -53,6 +54,12 @@ public class IntegratedLanguageMemoryPackageImpl extends EPackageImpl implements * @generated */ private EClass resourceEventEClass = null; + /** + * + * + * @generated + */ + private EClass resourceHandlerEClass = null; /** * * @@ -182,8 +189,8 @@ public EClass getResource() { * * @generated */ - public EReference getResource_ContextProvider() { - return (EReference)resourceEClass.getEStructuralFeatures().get(0); + public EClass getResourceEvent() { + return resourceEventEClass; } /** @@ -191,8 +198,8 @@ public EReference getResource_ContextProvider() { * * @generated */ - public EReference getResource_Notifier() { - return (EReference)resourceEClass.getEStructuralFeatures().get(1); + public EClass getResourceHandler() { + return resourceHandlerEClass; } /** @@ -200,8 +207,8 @@ public EReference getResource_Notifier() { * * @generated */ - public EClass getResourceEvent() { - return resourceEventEClass; + public EReference getResourceHandler_ContextProvider() { + return (EReference)resourceHandlerEClass.getEStructuralFeatures().get(0); } /** @@ -249,6 +256,15 @@ public EClass getResourceReader() { return resourceReaderEClass; } + /** + * + * + * @generated + */ + public EReference getResourceReader_Notifier() { + return (EReference)resourceReaderEClass.getEStructuralFeatures().get(0); + } + /** * * @@ -305,11 +321,12 @@ public void createPackageContents() { // Create classes and their features resourceEClass = createEClass(RESOURCE); - createEReference(resourceEClass, RESOURCE__CONTEXT_PROVIDER); - createEReference(resourceEClass, RESOURCE__NOTIFIER); resourceEventEClass = createEClass(RESOURCE_EVENT); + resourceHandlerEClass = createEClass(RESOURCE_HANDLER); + createEReference(resourceHandlerEClass, RESOURCE_HANDLER__CONTEXT_PROVIDER); + resourceListenerEClass = createEClass(RESOURCE_LISTENER); resourceManagerEClass = createEClass(RESOURCE_MANAGER); @@ -319,6 +336,7 @@ public void createPackageContents() { resourceProviderEClass = createEClass(RESOURCE_PROVIDER); resourceReaderEClass = createEClass(RESOURCE_READER); + createEReference(resourceReaderEClass, RESOURCE_READER__NOTIFIER); resourceWriterEClass = createEClass(RESOURCE_WRITER); @@ -356,8 +374,8 @@ public void initializePackageContents() { QIntegratedLanguageExpressionPackage theIntegratedLanguageExpressionPackage = (QIntegratedLanguageExpressionPackage)EPackage.Registry.INSTANCE.getEPackage(QIntegratedLanguageExpressionPackage.eNS_URI); // Create type parameters - ETypeParameter resourceEClass_T = addETypeParameter(resourceEClass, "T"); ETypeParameter resourceEventEClass_T = addETypeParameter(resourceEventEClass, "T"); + ETypeParameter resourceHandlerEClass_T = addETypeParameter(resourceHandlerEClass, "T"); ETypeParameter resourceListenerEClass_T = addETypeParameter(resourceListenerEClass, "T"); ETypeParameter resourceNotifierEClass_T = addETypeParameter(resourceNotifierEClass, "T"); ETypeParameter resourceReaderEClass_T = addETypeParameter(resourceReaderEClass, "T"); @@ -365,10 +383,10 @@ public void initializePackageContents() { // Set bounds for type parameters EGenericType g1 = createEGenericType(theIntegratedLanguageCorePackage.getObjectNameable()); - resourceEClass_T.getEBounds().add(g1); - g1 = createEGenericType(theIntegratedLanguageCorePackage.getObjectNameable()); resourceEventEClass_T.getEBounds().add(g1); g1 = createEGenericType(theIntegratedLanguageCorePackage.getObjectNameable()); + resourceHandlerEClass_T.getEBounds().add(g1); + g1 = createEGenericType(theIntegratedLanguageCorePackage.getObjectNameable()); resourceListenerEClass_T.getEBounds().add(g1); g1 = createEGenericType(theIntegratedLanguageCorePackage.getObjectNameable()); resourceNotifierEClass_T.getEBounds().add(g1); @@ -378,9 +396,10 @@ public void initializePackageContents() { resourceWriterEClass_T.getEBounds().add(g1); // Add supertypes to classes - resourceEClass.getESuperTypes().add(theIntegratedLanguageCorePackage.getObject()); + resourceEClass.getESuperTypes().add(theIntegratedLanguageCorePackage.getNameable()); + resourceHandlerEClass.getESuperTypes().add(theIntegratedLanguageCorePackage.getObject()); resourceManagerEClass.getESuperTypes().add(this.getResourceProvider()); - g1 = createEGenericType(this.getResource()); + g1 = createEGenericType(this.getResourceHandler()); EGenericType g2 = createEGenericType(resourceReaderEClass_T); g1.getETypeArguments().add(g2); resourceReaderEClass.getEGenericSuperTypes().add(g1); @@ -390,32 +409,26 @@ public void initializePackageContents() { resourceWriterEClass.getEGenericSuperTypes().add(g1); // Initialize classes and features; add operations and parameters - initEClass(resourceEClass, QResource.class, "Resource", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getResource_ContextProvider(), theIntegratedLanguageCoreCtxPackage.getContextProvider(), null, "contextProvider", null, 1, 1, QResource.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - g1 = createEGenericType(this.getResourceNotifier()); - g2 = createEGenericType(resourceEClass_T); - g1.getETypeArguments().add(g2); - initEReference(getResource_Notifier(), g1, null, "notifier", null, 0, 1, QResource.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEClass(resourceEClass, QResource.class, "Resource", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEClass(resourceEventEClass, QResourceEvent.class, "ResourceEvent", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + addEOperation(resourceEventEClass, theIntegratedLanguageCoreCtxPackage.getContextProvider(), "getContextProvider", 1, 1, IS_UNIQUE, IS_ORDERED); + addEOperation(resourceEventEClass, this.getResourceEventType(), "getEventType", 1, 1, IS_UNIQUE, IS_ORDERED); - EOperation op = addEOperation(resourceEventEClass, null, "getResource", 1, 1, IS_UNIQUE, IS_ORDERED); - g1 = createEGenericType(this.getResource()); - g2 = createEGenericType(resourceEventEClass_T); - g1.getETypeArguments().add(g2); - initEOperation(op, g1); + addEOperation(resourceEventEClass, ecorePackage.getEString(), "getNewName", 1, 1, IS_UNIQUE, IS_ORDERED); + + addEOperation(resourceEventEClass, ecorePackage.getEString(), "getOldName", 1, 1, IS_UNIQUE, IS_ORDERED); - addEOperation(resourceEventEClass, ecorePackage.getEString(), "getResourceName", 1, 1, IS_UNIQUE, IS_ORDERED); + addEOperation(resourceEventEClass, this.getResource(), "getResource", 1, 1, IS_UNIQUE, IS_ORDERED); - op = addEOperation(resourceEventEClass, null, "getSource", 1, 1, IS_UNIQUE, IS_ORDERED); + EOperation op = addEOperation(resourceEventEClass, null, "getSource", 1, 1, IS_UNIQUE, IS_ORDERED); g1 = createEGenericType(resourceEventEClass_T); initEOperation(op, g1); - addEOperation(resourceEventEClass, ecorePackage.getEString(), "getNewName", 1, 1, IS_UNIQUE, IS_ORDERED); - - addEOperation(resourceEventEClass, ecorePackage.getEString(), "getOldName", 1, 1, IS_UNIQUE, IS_ORDERED); + initEClass(resourceHandlerEClass, QResourceHandler.class, "ResourceHandler", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEReference(getResourceHandler_ContextProvider(), theIntegratedLanguageCoreCtxPackage.getContextProvider(), null, "contextProvider", null, 1, 1, QResourceHandler.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(resourceListenerEClass, QResourceListener.class, "ResourceListener", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); @@ -580,6 +593,10 @@ public void initializePackageContents() { initEOperation(op, g1); initEClass(resourceReaderEClass, QResourceReader.class, "ResourceReader", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + g1 = createEGenericType(this.getResourceNotifier()); + g2 = createEGenericType(resourceReaderEClass_T); + g1.getETypeArguments().add(g2); + initEReference(getResourceReader_Notifier(), g1, null, "notifier", null, 0, 1, QResourceReader.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); op = addEOperation(resourceReaderEClass, ecorePackage.getEBoolean(), "exists", 1, 1, IS_UNIQUE, IS_ORDERED); addEParameter(op, ecorePackage.getEString(), "name", 1, 1, IS_UNIQUE, IS_ORDERED); @@ -616,6 +633,8 @@ public void initializePackageContents() { g1 = createEGenericType(resourceWriterEClass_T); addEParameter(op, g1, "object", 1, 1, IS_UNIQUE, IS_ORDERED); + addEOperation(resourceWriterEClass, this.getResource(), "getResource", 1, 1, IS_UNIQUE, IS_ORDERED); + op = addEOperation(resourceWriterEClass, null, "save", 0, 1, IS_UNIQUE, IS_ORDERED); g1 = createEGenericType(resourceWriterEClass_T); addEParameter(op, g1, "object", 1, 1, IS_UNIQUE, IS_ORDERED); @@ -630,8 +649,6 @@ public void initializePackageContents() { addEParameter(op, g1, "object", 1, 1, IS_UNIQUE, IS_ORDERED); addEParameter(op, ecorePackage.getEString(), "newName", 1, 1, IS_UNIQUE, IS_ORDERED); - addEOperation(resourceWriterEClass, ecorePackage.getEString(), "getResourceName", 1, 1, IS_UNIQUE, IS_ORDERED); - // Initialize enums and add enum literals initEEnum(resourceEventTypeEEnum, ResourceEventType.class, "ResourceEventType"); addEEnumLiteral(resourceEventTypeEEnum, ResourceEventType.PRE_SAVE); diff --git a/org.smeup.sys.il.memo/src/org/smeup/sys/il/memo/impl/ResourceHandlerImpl.java b/org.smeup.sys.il.memo/src/org/smeup/sys/il/memo/impl/ResourceHandlerImpl.java new file mode 100644 index 00000000..be9ddf6d --- /dev/null +++ b/org.smeup.sys.il.memo/src/org/smeup/sys/il/memo/impl/ResourceHandlerImpl.java @@ -0,0 +1,148 @@ +/** + * Copyright (c) 2012, 2015 Sme.UP 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 + */ +package org.smeup.sys.il.memo.impl; + +import org.eclipse.emf.common.notify.Notification; +import org.eclipse.emf.ecore.EClass; + +import org.eclipse.emf.ecore.impl.ENotificationImpl; +import org.smeup.sys.il.core.QObjectNameable; + +import org.smeup.sys.il.core.ctx.QContextProvider; +import org.smeup.sys.il.core.impl.ObjectImpl; + +import org.smeup.sys.il.memo.QIntegratedLanguageMemoryPackage; +import org.smeup.sys.il.memo.QResourceHandler; + +/** + * + * An implementation of the model object 'Resource Handler'. + * + *

+ * The following features are implemented: + *

    + *
  • {@link org.smeup.sys.il.memo.impl.ResourceHandlerImpl#getContextProvider Context Provider}
    • + *
+ *

+ * + * @generated + */ +public abstract class ResourceHandlerImpl extends ObjectImpl implements QResourceHandler { + /** + * The cached value of the '{@link #getContextProvider() Context Provider}' reference. + * + * + * @see #getContextProvider() + * @generated + * @ordered + */ + protected QContextProvider contextProvider; + /** + * + */ + private static final long serialVersionUID = 1L; + + /** + * + * + * @generated + */ + protected ResourceHandlerImpl() { + super(); + } + + /** + * + * + * @generated + */ + @Override + protected EClass eStaticClass() { + return QIntegratedLanguageMemoryPackage.Literals.RESOURCE_HANDLER; + } + + /** + * + * + * @generated + */ + public QContextProvider getContextProvider() { + return contextProvider; + } + + /** + * + * + * @generated + */ + public void setContextProvider(QContextProvider newContextProvider) { + QContextProvider oldContextProvider = contextProvider; + contextProvider = newContextProvider; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, QIntegratedLanguageMemoryPackage.RESOURCE_HANDLER__CONTEXT_PROVIDER, oldContextProvider, contextProvider)); + } + + /** + * + * + * @generated + */ + @Override + public Object eGet(int featureID, boolean resolve, boolean coreType) { + switch (featureID) { + case QIntegratedLanguageMemoryPackage.RESOURCE_HANDLER__CONTEXT_PROVIDER: + return getContextProvider(); + } + return super.eGet(featureID, resolve, coreType); + } + + /** + * + * + * @generated + */ + @Override + public void eSet(int featureID, Object newValue) { + switch (featureID) { + case QIntegratedLanguageMemoryPackage.RESOURCE_HANDLER__CONTEXT_PROVIDER: + setContextProvider((QContextProvider)newValue); + return; + } + super.eSet(featureID, newValue); + } + + /** + * + * + * @generated + */ + @Override + public void eUnset(int featureID) { + switch (featureID) { + case QIntegratedLanguageMemoryPackage.RESOURCE_HANDLER__CONTEXT_PROVIDER: + setContextProvider((QContextProvider)null); + return; + } + super.eUnset(featureID); + } + + /** + * + * + * @generated + */ + @Override + public boolean eIsSet(int featureID) { + switch (featureID) { + case QIntegratedLanguageMemoryPackage.RESOURCE_HANDLER__CONTEXT_PROVIDER: + return contextProvider != null; + } + return super.eIsSet(featureID); + } + +} //ResourceHandlerImpl diff --git a/org.smeup.sys.il.memo/src/org/smeup/sys/il/memo/impl/ResourceImpl.java b/org.smeup.sys.il.memo/src/org/smeup/sys/il/memo/impl/ResourceImpl.java deleted file mode 100644 index 82504c2a..00000000 --- a/org.smeup.sys.il.memo/src/org/smeup/sys/il/memo/impl/ResourceImpl.java +++ /dev/null @@ -1,205 +0,0 @@ -/** - * Copyright (c) 2012, 2015 Sme.UP 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 - */ -package org.smeup.sys.il.memo.impl; - -import org.eclipse.emf.common.notify.Notification; -import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.EObject; -import org.eclipse.emf.ecore.InternalEObject; -import org.eclipse.emf.ecore.impl.ENotificationImpl; -import org.smeup.sys.il.core.QObjectNameable; -import org.smeup.sys.il.core.ctx.QContextProvider; -import org.smeup.sys.il.core.impl.ObjectImpl; -import org.smeup.sys.il.memo.QIntegratedLanguageMemoryPackage; -import org.smeup.sys.il.memo.QResource; -import org.smeup.sys.il.memo.QResourceNotifier; - -/** - * An implementation of the model object ' - * QResource'. - *

- * The following features are implemented: - *

    - *
  • {@link org.smeup.sys.il.memo.impl.ResourceImpl#getContextProvider Context Provider}
    • - *
  • {@link org.smeup.sys.il.memo.impl.ResourceImpl#getNotifier Notifier}
    • - *
- *

- * - * @generated - */ -public abstract class ResourceImpl extends ObjectImpl implements QResource { - - /** - * - */ - private static final long serialVersionUID = 1L; - - /** - * The cached value of the '{@link #getContextProvider() Context Provider}' reference. - * - * - * @see #getContextProvider() - * @generated - * @ordered - */ - protected QContextProvider contextProvider; - - /** - * The cached value of the '{@link #getNotifier() Notifier}' reference. - * - * - * @see #getNotifier() - * @generated - * @ordered - */ - protected QResourceNotifier notifier; - - /** - * - * @generated - */ - protected ResourceImpl() { - super(); - } - - /** - * - * @generated - */ - @Override - protected EClass eStaticClass() { - return QIntegratedLanguageMemoryPackage.Literals.RESOURCE; - } - - /** - * - * - * @generated - */ - public QContextProvider getContextProvider() { - return contextProvider; - } - - /** - * - * - * @generated - */ - public void setContextProvider(QContextProvider newContextProvider) { - QContextProvider oldContextProvider = contextProvider; - contextProvider = newContextProvider; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, QIntegratedLanguageMemoryPackage.RESOURCE__CONTEXT_PROVIDER, oldContextProvider, contextProvider)); - } - - /** - * - * - * @generated - */ - @SuppressWarnings("unchecked") - public QResourceNotifier getNotifier() { - if (notifier != null && ((EObject)notifier).eIsProxy()) { - InternalEObject oldNotifier = (InternalEObject)notifier; - notifier = (QResourceNotifier)eResolveProxy(oldNotifier); - if (notifier != oldNotifier) { - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.RESOLVE, QIntegratedLanguageMemoryPackage.RESOURCE__NOTIFIER, oldNotifier, notifier)); - } - } - return notifier; - } - - /** - * - * - * @generated - */ - public QResourceNotifier basicGetNotifier() { - return notifier; - } - - /** - * - * - * @generated - */ - public void setNotifier(QResourceNotifier newNotifier) { - QResourceNotifier oldNotifier = notifier; - notifier = newNotifier; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, QIntegratedLanguageMemoryPackage.RESOURCE__NOTIFIER, oldNotifier, notifier)); - } - - /** - * - * @generated - */ - @Override - public Object eGet(int featureID, boolean resolve, boolean coreType) { - switch (featureID) { - case QIntegratedLanguageMemoryPackage.RESOURCE__CONTEXT_PROVIDER: - return getContextProvider(); - case QIntegratedLanguageMemoryPackage.RESOURCE__NOTIFIER: - if (resolve) return getNotifier(); - return basicGetNotifier(); - } - return super.eGet(featureID, resolve, coreType); - } - - /** - * - * @generated - */ - @SuppressWarnings("unchecked") - @Override - public void eSet(int featureID, Object newValue) { - switch (featureID) { - case QIntegratedLanguageMemoryPackage.RESOURCE__CONTEXT_PROVIDER: - setContextProvider((QContextProvider)newValue); - return; - case QIntegratedLanguageMemoryPackage.RESOURCE__NOTIFIER: - setNotifier((QResourceNotifier)newValue); - return; - } - super.eSet(featureID, newValue); - } - - /** - * - * @generated - */ - @Override - public void eUnset(int featureID) { - switch (featureID) { - case QIntegratedLanguageMemoryPackage.RESOURCE__CONTEXT_PROVIDER: - setContextProvider((QContextProvider)null); - return; - case QIntegratedLanguageMemoryPackage.RESOURCE__NOTIFIER: - setNotifier((QResourceNotifier)null); - return; - } - super.eUnset(featureID); - } - - /** - * - * @generated - */ - @Override - public boolean eIsSet(int featureID) { - switch (featureID) { - case QIntegratedLanguageMemoryPackage.RESOURCE__CONTEXT_PROVIDER: - return contextProvider != null; - case QIntegratedLanguageMemoryPackage.RESOURCE__NOTIFIER: - return notifier != null; - } - return super.eIsSet(featureID); - } - -} // QResourceImpl diff --git a/org.smeup.sys.il.memo/src/org/smeup/sys/il/memo/impl/ResourceReaderImpl.java b/org.smeup.sys.il.memo/src/org/smeup/sys/il/memo/impl/ResourceReaderImpl.java index d020d957..2f25783c 100644 --- a/org.smeup.sys.il.memo/src/org/smeup/sys/il/memo/impl/ResourceReaderImpl.java +++ b/org.smeup.sys.il.memo/src/org/smeup/sys/il/memo/impl/ResourceReaderImpl.java @@ -7,9 +7,12 @@ */ package org.smeup.sys.il.memo.impl; +import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EStructuralFeature; +import org.eclipse.emf.ecore.InternalEObject; +import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.smeup.sys.il.core.QObjectIterator; import org.smeup.sys.il.core.QObjectNameable; import org.smeup.sys.il.expr.LogicalOperator; @@ -19,17 +22,31 @@ import org.smeup.sys.il.expr.QTermExpression; import org.smeup.sys.il.expr.impl.ExpressionVisitorImpl; import org.smeup.sys.il.memo.QIntegratedLanguageMemoryPackage; +import org.smeup.sys.il.memo.QResourceNotifier; import org.smeup.sys.il.memo.QResourceReader; /** * An implementation of the model object ' * QResource'. *

+ * The following features are implemented: + *

    + *
  • {@link org.smeup.sys.il.memo.impl.ResourceReaderImpl#getNotifier Notifier}
    • + *
*

* * @generated */ -public abstract class ResourceReaderImpl extends ResourceImpl implements QResourceReader { +public abstract class ResourceReaderImpl extends ResourceHandlerImpl implements QResourceReader { + /** + * The cached value of the '{@link #getNotifier() Notifier}' reference. + * + * + * @see #getNotifier() + * @generated + * @ordered + */ + protected QResourceNotifier notifier; /** * */ @@ -52,6 +69,45 @@ protected EClass eStaticClass() { return QIntegratedLanguageMemoryPackage.Literals.RESOURCE_READER; } + /** + * + * + * @generated + */ + @SuppressWarnings("unchecked") + public QResourceNotifier getNotifier() { + if (notifier != null && ((EObject)notifier).eIsProxy()) { + InternalEObject oldNotifier = (InternalEObject)notifier; + notifier = (QResourceNotifier)eResolveProxy(oldNotifier); + if (notifier != oldNotifier) { + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.RESOLVE, QIntegratedLanguageMemoryPackage.RESOURCE_READER__NOTIFIER, oldNotifier, notifier)); + } + } + return notifier; + } + + /** + * + * + * @generated + */ + public QResourceNotifier basicGetNotifier() { + return notifier; + } + + /** + * + * + * @generated + */ + public void setNotifier(QResourceNotifier newNotifier) { + QResourceNotifier oldNotifier = notifier; + notifier = newNotifier; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, QIntegratedLanguageMemoryPackage.RESOURCE_READER__NOTIFIER, oldNotifier, notifier)); + } + /** * * @generated @@ -95,6 +151,66 @@ public T lookup(String name) { throw new UnsupportedOperationException(); } + /** + * + * + * @generated + */ + @Override + public Object eGet(int featureID, boolean resolve, boolean coreType) { + switch (featureID) { + case QIntegratedLanguageMemoryPackage.RESOURCE_READER__NOTIFIER: + if (resolve) return getNotifier(); + return basicGetNotifier(); + } + return super.eGet(featureID, resolve, coreType); + } + + /** + * + * + * @generated + */ + @SuppressWarnings("unchecked") + @Override + public void eSet(int featureID, Object newValue) { + switch (featureID) { + case QIntegratedLanguageMemoryPackage.RESOURCE_READER__NOTIFIER: + setNotifier((QResourceNotifier)newValue); + return; + } + super.eSet(featureID, newValue); + } + + /** + * + * + * @generated + */ + @Override + public void eUnset(int featureID) { + switch (featureID) { + case QIntegratedLanguageMemoryPackage.RESOURCE_READER__NOTIFIER: + setNotifier((QResourceNotifier)null); + return; + } + super.eUnset(featureID); + } + + /** + * + * + * @generated + */ + @Override + public boolean eIsSet(int featureID) { + switch (featureID) { + case QIntegratedLanguageMemoryPackage.RESOURCE_READER__NOTIFIER: + return notifier != null; + } + return super.eIsSet(featureID); + } + /** * * diff --git a/org.smeup.sys.os.cmd/src/org/smeup/sys/os/cmd/CommandOrder.java b/org.smeup.sys.os.cmd/src/org/smeup/sys/os/cmd/CommandOrder.java index 1a71bcc4..acd75018 100644 --- a/org.smeup.sys.os.cmd/src/org/smeup/sys/os/cmd/CommandOrder.java +++ b/org.smeup.sys.os.cmd/src/org/smeup/sys/os/cmd/CommandOrder.java @@ -67,8 +67,6 @@ public enum CommandOrder implements Enumerator { /** * Returns the 'Command Order' literal with the specified literal value. * - * @param literal the literal. - * @return the matching enumerator or null. * @generated */ public static CommandOrder get(String literal) { @@ -84,8 +82,6 @@ public static CommandOrder get(String literal) { /** * Returns the 'Command Order' literal with the specified name. * - * @param name the name. - * @return the matching enumerator or null. * @generated */ public static CommandOrder getByName(String name) { @@ -101,8 +97,6 @@ public static CommandOrder getByName(String name) { /** * Returns the 'Command Order' literal with the specified integer value. * - * @param value the integer value. - * @return the matching enumerator or null. * @generated */ public static CommandOrder get(int value) { diff --git a/org.smeup.sys.os.cmd/src/org/smeup/sys/os/cmd/CommandParameterOrder.java b/org.smeup.sys.os.cmd/src/org/smeup/sys/os/cmd/CommandParameterOrder.java index 22ffd512..aa4909ae 100644 --- a/org.smeup.sys.os.cmd/src/org/smeup/sys/os/cmd/CommandParameterOrder.java +++ b/org.smeup.sys.os.cmd/src/org/smeup/sys/os/cmd/CommandParameterOrder.java @@ -93,8 +93,6 @@ public enum CommandParameterOrder implements Enumerator { /** * Returns the 'Command Parameter Order' literal with the specified literal value. * - * @param literal the literal. - * @return the matching enumerator or null. * @generated */ public static CommandParameterOrder get(String literal) { @@ -110,8 +108,6 @@ public static CommandParameterOrder get(String literal) { /** * Returns the 'Command Parameter Order' literal with the specified name. * - * @param name the name. - * @return the matching enumerator or null. * @generated */ public static CommandParameterOrder getByName(String name) { @@ -127,8 +123,6 @@ public static CommandParameterOrder getByName(String name) { /** * Returns the 'Command Parameter Order' literal with the specified integer value. * - * @param value the integer value. - * @return the matching enumerator or null. * @generated */ public static CommandParameterOrder get(int value) { diff --git a/org.smeup.sys.os.cmd/src/org/smeup/sys/os/cmd/CommandStatus.java b/org.smeup.sys.os.cmd/src/org/smeup/sys/os/cmd/CommandStatus.java index 1373b2fc..f73a7f3e 100644 --- a/org.smeup.sys.os.cmd/src/org/smeup/sys/os/cmd/CommandStatus.java +++ b/org.smeup.sys.os.cmd/src/org/smeup/sys/os/cmd/CommandStatus.java @@ -145,8 +145,6 @@ public enum CommandStatus implements Enumerator { /** * Returns the 'Command Status' literal with the specified literal value. * - * @param literal the literal. - * @return the matching enumerator or null. * @generated */ public static CommandStatus get(String literal) { @@ -162,8 +160,6 @@ public static CommandStatus get(String literal) { /** * Returns the 'Command Status' literal with the specified name. * - * @param name the name. - * @return the matching enumerator or null. * @generated */ public static CommandStatus getByName(String name) { @@ -179,8 +175,6 @@ public static CommandStatus getByName(String name) { /** * Returns the 'Command Status' literal with the specified integer value. * - * @param value the integer value. - * @return the matching enumerator or null. * @generated */ public static CommandStatus get(int value) { diff --git a/org.smeup.sys.os.cmd/src/org/smeup/sys/os/cmd/QCallableCommand.java b/org.smeup.sys.os.cmd/src/org/smeup/sys/os/cmd/QCallableCommand.java index f2d16c6d..b896cbd4 100644 --- a/org.smeup.sys.os.cmd/src/org/smeup/sys/os/cmd/QCallableCommand.java +++ b/org.smeup.sys.os.cmd/src/org/smeup/sys/os/cmd/QCallableCommand.java @@ -19,13 +19,13 @@ * *

* The following features are supported: - *

*
    *
  • {@link org.smeup.sys.os.cmd.QCallableCommand#getCommand Command}
    • *
  • {@link org.smeup.sys.os.cmd.QCallableCommand#getCommandString Command String}
    • *
  • {@link org.smeup.sys.os.cmd.QCallableCommand#getVariables Variables}
    • *
  • {@link org.smeup.sys.os.cmd.QCallableCommand#getDataContainer Data Container}
    • *
+ *

* * @see org.smeup.sys.os.cmd.QOperatingSystemCommandPackage#getCallableCommand() * @model superTypes="org.smeup.sys.il.core.Object org.smeup.sys.mi.core.JavaCloseable" diff --git a/org.smeup.sys.os.cmd/src/org/smeup/sys/os/cmd/QCommand.java b/org.smeup.sys.os.cmd/src/org/smeup/sys/os/cmd/QCommand.java index cb49f1c2..b00dd72c 100644 --- a/org.smeup.sys.os.cmd/src/org/smeup/sys/os/cmd/QCommand.java +++ b/org.smeup.sys.os.cmd/src/org/smeup/sys/os/cmd/QCommand.java @@ -16,7 +16,6 @@ * *

* The following features are supported: - *

*
    *
  • {@link org.smeup.sys.os.cmd.QCommand#getAddress Address}
    • *
  • {@link org.smeup.sys.os.cmd.QCommand#isAllowBatch Allow Batch}
    • @@ -27,6 +26,7 @@ *
  • {@link org.smeup.sys.os.cmd.QCommand#getStatus Status}
    • *
  • {@link org.smeup.sys.os.cmd.QCommand#getTypeName Type Name}
    • *
+ *

* * @see org.smeup.sys.os.cmd.QOperatingSystemCommandPackage#getCommand() * @model diff --git a/org.smeup.sys.os.cmd/src/org/smeup/sys/os/cmd/QCommandContainer.java b/org.smeup.sys.os.cmd/src/org/smeup/sys/os/cmd/QCommandContainer.java index 009259e1..a4a03545 100644 --- a/org.smeup.sys.os.cmd/src/org/smeup/sys/os/cmd/QCommandContainer.java +++ b/org.smeup.sys.os.cmd/src/org/smeup/sys/os/cmd/QCommandContainer.java @@ -16,10 +16,10 @@ * *

* The following features are supported: - *

*
    *
  • {@link org.smeup.sys.os.cmd.QCommandContainer#getTypeName Type Name}
    • *
+ *

* * @see org.smeup.sys.os.cmd.QOperatingSystemCommandPackage#getCommandContainer() * @model diff --git a/org.smeup.sys.os.cmd/src/org/smeup/sys/os/cmd/QCommandParameter.java b/org.smeup.sys.os.cmd/src/org/smeup/sys/os/cmd/QCommandParameter.java index 6f6d9679..948fcb13 100644 --- a/org.smeup.sys.os.cmd/src/org/smeup/sys/os/cmd/QCommandParameter.java +++ b/org.smeup.sys.os.cmd/src/org/smeup/sys/os/cmd/QCommandParameter.java @@ -15,7 +15,6 @@ * *

* The following features are supported: - *

*
    *
  • {@link org.smeup.sys.os.cmd.QCommandParameter#isAllowVariable Allow Variable}
    • *
  • {@link org.smeup.sys.os.cmd.QCommandParameter#getDataTerm Data Term}
    • @@ -24,6 +23,7 @@ *
  • {@link org.smeup.sys.os.cmd.QCommandParameter#getStatus Status}
    • *
  • {@link org.smeup.sys.os.cmd.QCommandParameter#isHidden Hidden}
    • *
+ *

* * @see org.smeup.sys.os.cmd.QOperatingSystemCommandPackage#getCommandParameter() * @model diff --git a/org.smeup.sys.os.cmd/src/org/smeup/sys/os/cmd/QCommandSource.java b/org.smeup.sys.os.cmd/src/org/smeup/sys/os/cmd/QCommandSource.java index 7a33a341..baf38848 100644 --- a/org.smeup.sys.os.cmd/src/org/smeup/sys/os/cmd/QCommandSource.java +++ b/org.smeup.sys.os.cmd/src/org/smeup/sys/os/cmd/QCommandSource.java @@ -15,11 +15,11 @@ * *

* The following features are supported: - *

*
    *
  • {@link org.smeup.sys.os.cmd.QCommandSource#getType Type}
    • *
  • {@link org.smeup.sys.os.cmd.QCommandSource#getContent Content}
    • *
+ *

* * @see org.smeup.sys.os.cmd.QOperatingSystemCommandPackage#getCommandSource() * @model diff --git a/org.smeup.sys.os.cmd/src/org/smeup/sys/os/cmd/QOperatingSystemCommandPackage.java b/org.smeup.sys.os.cmd/src/org/smeup/sys/os/cmd/QOperatingSystemCommandPackage.java index fa1c42d7..a2e11b95 100644 --- a/org.smeup.sys.os.cmd/src/org/smeup/sys/os/cmd/QOperatingSystemCommandPackage.java +++ b/org.smeup.sys.os.cmd/src/org/smeup/sys/os/cmd/QOperatingSystemCommandPackage.java @@ -141,15 +141,6 @@ public interface QOperatingSystemCommandPackage extends EPackage { */ int COMMAND__FACETS = QOperatingSystemTypePackage.TYPED_OBJECT__FACETS; - /** - * The feature id for the 'Library' attribute. - * - * @generated - * @ordered - */ - int COMMAND__LIBRARY = QOperatingSystemTypePackage.TYPED_OBJECT__LIBRARY; - /** * The feature id for the 'Name' attribute. diff --git a/org.smeup.sys.os.cmd/src/org/smeup/sys/os/cmd/impl/CallableCommandImpl.java b/org.smeup.sys.os.cmd/src/org/smeup/sys/os/cmd/impl/CallableCommandImpl.java index fab76679..94d2cc0a 100644 --- a/org.smeup.sys.os.cmd/src/org/smeup/sys/os/cmd/impl/CallableCommandImpl.java +++ b/org.smeup.sys.os.cmd/src/org/smeup/sys/os/cmd/impl/CallableCommandImpl.java @@ -29,13 +29,13 @@ * QCallable Command'. *

* The following features are implemented: - *

*
    *
  • {@link org.smeup.sys.os.cmd.impl.CallableCommandImpl#getCommand Command}
    • *
  • {@link org.smeup.sys.os.cmd.impl.CallableCommandImpl#getCommandString Command String}
    • *
  • {@link org.smeup.sys.os.cmd.impl.CallableCommandImpl#getVariables Variables}
    • *
  • {@link org.smeup.sys.os.cmd.impl.CallableCommandImpl#getDataContainer Data Container}
    • *
+ *

* * @generated */ diff --git a/org.smeup.sys.os.cmd/src/org/smeup/sys/os/cmd/impl/CommandContainerImpl.java b/org.smeup.sys.os.cmd/src/org/smeup/sys/os/cmd/impl/CommandContainerImpl.java index 45d31c10..205517f5 100644 --- a/org.smeup.sys.os.cmd/src/org/smeup/sys/os/cmd/impl/CommandContainerImpl.java +++ b/org.smeup.sys.os.cmd/src/org/smeup/sys/os/cmd/impl/CommandContainerImpl.java @@ -26,10 +26,10 @@ * Command Container'. *

* The following features are implemented: - *

*
    *
  • {@link org.smeup.sys.os.cmd.impl.CommandContainerImpl#getTypeName Type Name}
    • *
+ *

* * @generated */ diff --git a/org.smeup.sys.os.cmd/src/org/smeup/sys/os/cmd/impl/CommandDataImpl.java b/org.smeup.sys.os.cmd/src/org/smeup/sys/os/cmd/impl/CommandDataImpl.java index ebdab6df..7e6e11ea 100644 --- a/org.smeup.sys.os.cmd/src/org/smeup/sys/os/cmd/impl/CommandDataImpl.java +++ b/org.smeup.sys.os.cmd/src/org/smeup/sys/os/cmd/impl/CommandDataImpl.java @@ -19,6 +19,8 @@ * * An implementation of the model object 'Command Data'. * + *

+ *

* * @generated */ diff --git a/org.smeup.sys.os.cmd/src/org/smeup/sys/os/cmd/impl/CommandImpl.java b/org.smeup.sys.os.cmd/src/org/smeup/sys/os/cmd/impl/CommandImpl.java index 455edb16..df1c41fd 100644 --- a/org.smeup.sys.os.cmd/src/org/smeup/sys/os/cmd/impl/CommandImpl.java +++ b/org.smeup.sys.os.cmd/src/org/smeup/sys/os/cmd/impl/CommandImpl.java @@ -37,7 +37,6 @@ * QCommand'. *

* The following features are implemented: - *

*
    *
  • {@link org.smeup.sys.os.cmd.impl.CommandImpl#getAddress Address}
    • *
  • {@link org.smeup.sys.os.cmd.impl.CommandImpl#isAllowBatch Allow Batch}
    • @@ -48,6 +47,7 @@ *
  • {@link org.smeup.sys.os.cmd.impl.CommandImpl#getStatus Status}
    • *
  • {@link org.smeup.sys.os.cmd.impl.CommandImpl#getTypeName Type Name}
    • *
+ *

* * @generated */ diff --git a/org.smeup.sys.os.cmd/src/org/smeup/sys/os/cmd/impl/CommandParameterImpl.java b/org.smeup.sys.os.cmd/src/org/smeup/sys/os/cmd/impl/CommandParameterImpl.java index e39d472f..0d886b4c 100644 --- a/org.smeup.sys.os.cmd/src/org/smeup/sys/os/cmd/impl/CommandParameterImpl.java +++ b/org.smeup.sys.os.cmd/src/org/smeup/sys/os/cmd/impl/CommandParameterImpl.java @@ -27,7 +27,6 @@ * QCommand Parameter'. *

* The following features are implemented: - *

*
    *
  • {@link org.smeup.sys.os.cmd.impl.CommandParameterImpl#isAllowVariable Allow Variable}
    • *
  • {@link org.smeup.sys.os.cmd.impl.CommandParameterImpl#getDataTerm Data Term}
    • @@ -36,6 +35,7 @@ *
  • {@link org.smeup.sys.os.cmd.impl.CommandParameterImpl#getStatus Status}
    • *
  • {@link org.smeup.sys.os.cmd.impl.CommandParameterImpl#isHidden Hidden}
    • *
+ *

* * @generated */ diff --git a/org.smeup.sys.os.cmd/src/org/smeup/sys/os/cmd/impl/CommandSourceImpl.java b/org.smeup.sys.os.cmd/src/org/smeup/sys/os/cmd/impl/CommandSourceImpl.java index 1fdb3658..349df4f0 100644 --- a/org.smeup.sys.os.cmd/src/org/smeup/sys/os/cmd/impl/CommandSourceImpl.java +++ b/org.smeup.sys.os.cmd/src/org/smeup/sys/os/cmd/impl/CommandSourceImpl.java @@ -22,11 +22,11 @@ * QCommand Source'. *

* The following features are implemented: - *

*
    *
  • {@link org.smeup.sys.os.cmd.impl.CommandSourceImpl#getType Type}
    • *
  • {@link org.smeup.sys.os.cmd.impl.CommandSourceImpl#getContent Content}
    • *
+ *

* * @generated */ diff --git a/org.smeup.sys.os.core.base/src/org/smeup/sys/os/core/base/BaseResourceManagerImpl.java b/org.smeup.sys.os.core.base/src/org/smeup/sys/os/core/base/BaseResourceManagerImpl.java index ae1b0815..13755ac4 100644 --- a/org.smeup.sys.os.core.base/src/org/smeup/sys/os/core/base/BaseResourceManagerImpl.java +++ b/org.smeup.sys.os.core.base/src/org/smeup/sys/os/core/base/BaseResourceManagerImpl.java @@ -23,7 +23,6 @@ import org.smeup.sys.il.core.ctx.QContextProvider; import org.smeup.sys.il.memo.IntegratedLanguageMemoryRuntimeException; import org.smeup.sys.il.memo.QIntegratedLanguageMemoryFactory; -import org.smeup.sys.il.memo.QResource; import org.smeup.sys.il.memo.QResourceListener; import org.smeup.sys.il.memo.QResourceManager; import org.smeup.sys.il.memo.QResourceNotifier; @@ -110,9 +109,12 @@ public QResourceWriter getResourceWriter(QContext @Override public QResourceReader getResourceReader(QContextProvider contextProvider, Class klass, String resource) { + resource = contextProvider.getContext().resolveAlias(resource); + QResourceProvider resourceProvider = getResourceProvider(klass); QResourceReader resourceReader = resourceProvider.getResourceReader(contextProvider, klass, resource); - prepareListener(resourceReader, klass); + if(resourceReader != null) + prepareListener(resourceReader, klass); return resourceReader; } @@ -125,9 +127,12 @@ public QResourceReader getResourceReader(QContext @Override public QResourceReader getResourceReader(QContextProvider contextProvider, Class klass, List resources) { + resources = contextProvider.getContext().resolveAliases(resources); + QResourceProvider resourceProvider = getResourceProvider(klass); QResourceReader resourceReader = resourceProvider.getResourceReader(contextProvider, klass, resources); - prepareListener(resourceReader, klass); + if(resourceReader != null) + prepareListener(resourceReader, klass); return resourceReader; } @@ -152,11 +157,14 @@ public QResourceWriter getResourceWriter(QContext } @Override - public QResourceWriter getResourceWriter(QContextProvider contextProvider, Class klass, String name) { + public QResourceWriter getResourceWriter(QContextProvider contextProvider, Class klass, String resource) { + resource = contextProvider.getContext().resolveAlias(resource); + QResourceProvider resourceProvider = getResourceProvider(klass); - QResourceWriter resourceWriter = resourceProvider.getResourceWriter(contextProvider, klass, name); - prepareListener(resourceWriter, klass); + QResourceWriter resourceWriter = resourceProvider.getResourceWriter(contextProvider, klass, resource); + if(resourceWriter != null) + prepareListener(resourceWriter, klass); return resourceWriter; } @@ -172,7 +180,7 @@ private QResourceProvider getResourceProvider(Class< } @SuppressWarnings("unchecked") - private void prepareListener(QResource resource, Class klass) { + private void prepareListener(QResourceReader resource, Class klass) { QResourceNotifier notifier = (QResourceNotifier) notifiers.get(klass); if (notifier == null) { @@ -190,6 +198,12 @@ private List resources(QContextProvider contextProvider, Scope scope) { List resources = new ArrayList<>(); + if(contextProvider == null) + "".toCharArray(); + if(contextProvider.getContext() == null) + "".toCharArray(); + if(contextProvider.getContext().getContextDescription() == null) + "".toCharArray(); QContextDescription contextDescription = contextProvider.getContext().getContextDescription(); // set scope libraries diff --git a/org.smeup.sys.os.core.base/src/org/smeup/sys/os/core/base/BaseTypedListenerImpl.java b/org.smeup.sys.os.core.base/src/org/smeup/sys/os/core/base/BaseTypedListenerImpl.java index a6c7fe51..3081f2bd 100644 --- a/org.smeup.sys.os.core.base/src/org/smeup/sys/os/core/base/BaseTypedListenerImpl.java +++ b/org.smeup.sys.os.core.base/src/org/smeup/sys/os/core/base/BaseTypedListenerImpl.java @@ -14,14 +14,11 @@ import javax.annotation.PostConstruct; import javax.inject.Inject; -import org.eclipse.emf.ecore.EObject; -import org.smeup.sys.il.memo.QResource; import org.smeup.sys.il.memo.QResourceEvent; import org.smeup.sys.il.memo.QResourceListener; import org.smeup.sys.il.memo.QResourceManager; import org.smeup.sys.os.core.QOperatingSystemCoreHelper; import org.smeup.sys.os.core.jobs.QJob; -import org.smeup.sys.os.type.QOperatingSystemTypePackage; import org.smeup.sys.os.type.QTypedObject; public class BaseTypedListenerImpl implements QResourceListener { @@ -40,14 +37,9 @@ public void handleEvent(QResourceEvent event) { case PRE_SAVE: QTypedObject typedObject = event.getSource(); - // library - EObject eObject = (EObject) typedObject; - eObject.eSet(QOperatingSystemTypePackage.eINSTANCE.getTypedObject_Library(), event.getResourceName()); - // creation info if (typedObject.getCreationInfo() == null) { - QResource resource = event.getResource(); - QJob job = resource.getContextProvider().getContext().get(QJob.class); + QJob job = event.getContextProvider().getContext().get(QJob.class); typedObject.setCreationInfo(QOperatingSystemCoreHelper.buildCreationInfo(job)); } break; diff --git a/org.smeup.sys.os.core.e4/src/org/smeup/sys/os/core/e4/E4JobManagerImpl.java b/org.smeup.sys.os.core.e4/src/org/smeup/sys/os/core/e4/E4JobManagerImpl.java index 0a592940..9924317d 100644 --- a/org.smeup.sys.os.core.e4/src/org/smeup/sys/os/core/e4/E4JobManagerImpl.java +++ b/org.smeup.sys.os.core.e4/src/org/smeup/sys/os/core/e4/E4JobManagerImpl.java @@ -132,11 +132,6 @@ public QJob create(String user, String password, String jobName) { job.getLibraries().add(library); } - String library = userProfile.getLibrary(); - if (library != null && !library.trim().equals("")) { - job.setCurrentLibrary(library); - } - QJobEvent jobEvent = QOperatingSystemJobsFactory.eINSTANCE.createJobEvent(); jobEvent.setSource(job); jobEvent.setType(JobEventType.STARTING); diff --git a/org.smeup.sys.os.dtaara/src/org/smeup/sys/os/dtaara/DataAreaType.java b/org.smeup.sys.os.dtaara/src/org/smeup/sys/os/dtaara/DataAreaType.java index 3da209d3..25b17d52 100644 --- a/org.smeup.sys.os.dtaara/src/org/smeup/sys/os/dtaara/DataAreaType.java +++ b/org.smeup.sys.os.dtaara/src/org/smeup/sys/os/dtaara/DataAreaType.java @@ -145,8 +145,6 @@ public enum DataAreaType implements Enumerator { /** * Returns the 'Data Area Type' literal with the specified literal value. * - * @param literal the literal. - * @return the matching enumerator or null. * @generated */ public static DataAreaType get(String literal) { @@ -162,8 +160,6 @@ public static DataAreaType get(String literal) { /** * Returns the 'Data Area Type' literal with the specified name. * - * @param name the name. - * @return the matching enumerator or null. * @generated */ public static DataAreaType getByName(String name) { @@ -179,8 +175,6 @@ public static DataAreaType getByName(String name) { /** * Returns the 'Data Area Type' literal with the specified integer value. * - * @param value the integer value. - * @return the matching enumerator or null. * @generated */ public static DataAreaType get(int value) { diff --git a/org.smeup.sys.os.dtaara/src/org/smeup/sys/os/dtaara/QDataArea.java b/org.smeup.sys.os.dtaara/src/org/smeup/sys/os/dtaara/QDataArea.java index 8c3ce7d6..5c0dc3df 100644 --- a/org.smeup.sys.os.dtaara/src/org/smeup/sys/os/dtaara/QDataArea.java +++ b/org.smeup.sys.os.dtaara/src/org/smeup/sys/os/dtaara/QDataArea.java @@ -15,13 +15,13 @@ * *

* The following features are supported: - *

*
    *
  • {@link org.smeup.sys.os.dtaara.QDataArea#getDataAreaType Data Area Type}
    • *
  • {@link org.smeup.sys.os.dtaara.QDataArea#getContentLength Content Length}
    • *
  • {@link org.smeup.sys.os.dtaara.QDataArea#getContentDecimal Content Decimal}
    • *
  • {@link org.smeup.sys.os.dtaara.QDataArea#getContent Content}
    • *
+ *

* * @see org.smeup.sys.os.dtaara.QOperatingSystemDataAreaPackage#getDataArea() * @model diff --git a/org.smeup.sys.os.dtaara/src/org/smeup/sys/os/dtaara/QOperatingSystemDataAreaPackage.java b/org.smeup.sys.os.dtaara/src/org/smeup/sys/os/dtaara/QOperatingSystemDataAreaPackage.java index 9e1ddba9..f84d257a 100644 --- a/org.smeup.sys.os.dtaara/src/org/smeup/sys/os/dtaara/QOperatingSystemDataAreaPackage.java +++ b/org.smeup.sys.os.dtaara/src/org/smeup/sys/os/dtaara/QOperatingSystemDataAreaPackage.java @@ -85,15 +85,6 @@ public interface QOperatingSystemDataAreaPackage extends EPackage { */ int DATA_AREA__FACETS = QOperatingSystemTypePackage.TYPED_OBJECT__FACETS; - /** - * The feature id for the 'Library' attribute. - * - * @generated - * @ordered - */ - int DATA_AREA__LIBRARY = QOperatingSystemTypePackage.TYPED_OBJECT__LIBRARY; - /** * The feature id for the 'Name' attribute. diff --git a/org.smeup.sys.os.dtaara/src/org/smeup/sys/os/dtaara/impl/DataAreaImpl.java b/org.smeup.sys.os.dtaara/src/org/smeup/sys/os/dtaara/impl/DataAreaImpl.java index 01e66426..7ccbb226 100644 --- a/org.smeup.sys.os.dtaara/src/org/smeup/sys/os/dtaara/impl/DataAreaImpl.java +++ b/org.smeup.sys.os.dtaara/src/org/smeup/sys/os/dtaara/impl/DataAreaImpl.java @@ -20,13 +20,13 @@ * QData Area'. *

* The following features are implemented: - *

*
    *
  • {@link org.smeup.sys.os.dtaara.impl.DataAreaImpl#getDataAreaType Data Area Type}
    • *
  • {@link org.smeup.sys.os.dtaara.impl.DataAreaImpl#getContentLength Content Length}
    • *
  • {@link org.smeup.sys.os.dtaara.impl.DataAreaImpl#getContentDecimal Content Decimal}
    • *
  • {@link org.smeup.sys.os.dtaara.impl.DataAreaImpl#getContent Content}
    • *
+ *

* * @generated */ diff --git a/org.smeup.sys.os.dtaq/src/org/smeup/sys/os/dtaq/DataQueueSearchType.java b/org.smeup.sys.os.dtaq/src/org/smeup/sys/os/dtaq/DataQueueSearchType.java index e24aebdf..7901df26 100644 --- a/org.smeup.sys.os.dtaq/src/org/smeup/sys/os/dtaq/DataQueueSearchType.java +++ b/org.smeup.sys.os.dtaq/src/org/smeup/sys/os/dtaq/DataQueueSearchType.java @@ -198,8 +198,6 @@ public enum DataQueueSearchType implements Enumerator { /** * Returns the 'Data Queue Search Type' literal with the specified literal value. * - * @param literal the literal. - * @return the matching enumerator or null. * @generated */ public static DataQueueSearchType get(String literal) { @@ -215,8 +213,6 @@ public static DataQueueSearchType get(String literal) { /** * Returns the 'Data Queue Search Type' literal with the specified name. * - * @param name the name. - * @return the matching enumerator or null. * @generated */ public static DataQueueSearchType getByName(String name) { @@ -232,8 +228,6 @@ public static DataQueueSearchType getByName(String name) { /** * Returns the 'Data Queue Search Type' literal with the specified integer value. * - * @param value the integer value. - * @return the matching enumerator or null. * @generated */ public static DataQueueSearchType get(int value) { diff --git a/org.smeup.sys.os.dtaq/src/org/smeup/sys/os/dtaq/DataQueueType.java b/org.smeup.sys.os.dtaq/src/org/smeup/sys/os/dtaq/DataQueueType.java index a35efe5d..c2cc0457 100644 --- a/org.smeup.sys.os.dtaq/src/org/smeup/sys/os/dtaq/DataQueueType.java +++ b/org.smeup.sys.os.dtaq/src/org/smeup/sys/os/dtaq/DataQueueType.java @@ -118,8 +118,6 @@ public enum DataQueueType implements Enumerator { /** * Returns the 'Data Queue Type' literal with the specified literal value. * - * @param literal the literal. - * @return the matching enumerator or null. * @generated */ public static DataQueueType get(String literal) { @@ -135,8 +133,6 @@ public static DataQueueType get(String literal) { /** * Returns the 'Data Queue Type' literal with the specified name. * - * @param name the name. - * @return the matching enumerator or null. * @generated */ public static DataQueueType getByName(String name) { @@ -152,8 +148,6 @@ public static DataQueueType getByName(String name) { /** * Returns the 'Data Queue Type' literal with the specified integer value. * - * @param value the integer value. - * @return the matching enumerator or null. * @generated */ public static DataQueueType get(int value) { diff --git a/org.smeup.sys.os.dtaq/src/org/smeup/sys/os/dtaq/QDataQueue.java b/org.smeup.sys.os.dtaq/src/org/smeup/sys/os/dtaq/QDataQueue.java index a5edf35c..484308c5 100644 --- a/org.smeup.sys.os.dtaq/src/org/smeup/sys/os/dtaq/QDataQueue.java +++ b/org.smeup.sys.os.dtaq/src/org/smeup/sys/os/dtaq/QDataQueue.java @@ -18,7 +18,6 @@ * *

* The following features are supported: - *

*
    *
  • {@link org.smeup.sys.os.dtaq.QDataQueue#getDataQueueType Data Queue Type}
    • *
  • {@link org.smeup.sys.os.dtaq.QDataQueue#getKeyLength Key Length}
    • @@ -26,6 +25,7 @@ *
  • {@link org.smeup.sys.os.dtaq.QDataQueue#isSenderInfo Sender Info}
    • *
  • {@link org.smeup.sys.os.dtaq.QDataQueue#getContent Content}
    • *
+ *

* * @see org.smeup.sys.os.dtaq.QOperatingSystemDataQueuePackage#getDataQueue() * @model diff --git a/org.smeup.sys.os.dtaq/src/org/smeup/sys/os/dtaq/QDataQueueContent.java b/org.smeup.sys.os.dtaq/src/org/smeup/sys/os/dtaq/QDataQueueContent.java index e20cf313..f2d42508 100644 --- a/org.smeup.sys.os.dtaq/src/org/smeup/sys/os/dtaq/QDataQueueContent.java +++ b/org.smeup.sys.os.dtaq/src/org/smeup/sys/os/dtaq/QDataQueueContent.java @@ -16,10 +16,10 @@ * *

* The following features are supported: - *

*
    *
  • {@link org.smeup.sys.os.dtaq.QDataQueueContent#getEntries Entries}
    • *
+ *

* * @see org.smeup.sys.os.dtaq.QOperatingSystemDataQueuePackage#getDataQueueContent() * @model diff --git a/org.smeup.sys.os.dtaq/src/org/smeup/sys/os/dtaq/QDataQueueEntry.java b/org.smeup.sys.os.dtaq/src/org/smeup/sys/os/dtaq/QDataQueueEntry.java index d29f0e5f..4f48ebb5 100644 --- a/org.smeup.sys.os.dtaq/src/org/smeup/sys/os/dtaq/QDataQueueEntry.java +++ b/org.smeup.sys.os.dtaq/src/org/smeup/sys/os/dtaq/QDataQueueEntry.java @@ -15,11 +15,11 @@ * *

* The following features are supported: - *

*
    *
  • {@link org.smeup.sys.os.dtaq.QDataQueueEntry#getKey Key}
    • *
  • {@link org.smeup.sys.os.dtaq.QDataQueueEntry#getValue Value}
    • *
+ *

* * @see org.smeup.sys.os.dtaq.QOperatingSystemDataQueuePackage#getDataQueueEntry() * @model diff --git a/org.smeup.sys.os.dtaq/src/org/smeup/sys/os/dtaq/QOperatingSystemDataQueuePackage.java b/org.smeup.sys.os.dtaq/src/org/smeup/sys/os/dtaq/QOperatingSystemDataQueuePackage.java index b947c765..a9674d4f 100644 --- a/org.smeup.sys.os.dtaq/src/org/smeup/sys/os/dtaq/QOperatingSystemDataQueuePackage.java +++ b/org.smeup.sys.os.dtaq/src/org/smeup/sys/os/dtaq/QOperatingSystemDataQueuePackage.java @@ -87,15 +87,6 @@ public interface QOperatingSystemDataQueuePackage extends EPackage { */ int DATA_QUEUE__FACETS = QOperatingSystemTypePackage.TYPED_OBJECT__FACETS; - /** - * The feature id for the 'Library' attribute. - * - * @generated - * @ordered - */ - int DATA_QUEUE__LIBRARY = QOperatingSystemTypePackage.TYPED_OBJECT__LIBRARY; - /** * The feature id for the 'Name' attribute. diff --git a/org.smeup.sys.os.dtaq/src/org/smeup/sys/os/dtaq/impl/DataQueueContentImpl.java b/org.smeup.sys.os.dtaq/src/org/smeup/sys/os/dtaq/impl/DataQueueContentImpl.java index dcc29f69..ffae5d39 100644 --- a/org.smeup.sys.os.dtaq/src/org/smeup/sys/os/dtaq/impl/DataQueueContentImpl.java +++ b/org.smeup.sys.os.dtaq/src/org/smeup/sys/os/dtaq/impl/DataQueueContentImpl.java @@ -32,10 +32,10 @@ * *

* The following features are implemented: - *

*
    *
  • {@link org.smeup.sys.os.dtaq.impl.DataQueueContentImpl#getEntries Entries}
    • *
+ *

* * @generated */ diff --git a/org.smeup.sys.os.dtaq/src/org/smeup/sys/os/dtaq/impl/DataQueueEntryImpl.java b/org.smeup.sys.os.dtaq/src/org/smeup/sys/os/dtaq/impl/DataQueueEntryImpl.java index c930d89b..8c790314 100644 --- a/org.smeup.sys.os.dtaq/src/org/smeup/sys/os/dtaq/impl/DataQueueEntryImpl.java +++ b/org.smeup.sys.os.dtaq/src/org/smeup/sys/os/dtaq/impl/DataQueueEntryImpl.java @@ -24,11 +24,11 @@ * *

* The following features are implemented: - *

*
    *
  • {@link org.smeup.sys.os.dtaq.impl.DataQueueEntryImpl#getKey Key}
    • *
  • {@link org.smeup.sys.os.dtaq.impl.DataQueueEntryImpl#getValue Value}
    • *
+ *

* * @generated */ diff --git a/org.smeup.sys.os.dtaq/src/org/smeup/sys/os/dtaq/impl/DataQueueImpl.java b/org.smeup.sys.os.dtaq/src/org/smeup/sys/os/dtaq/impl/DataQueueImpl.java index 5a92fe7b..290a0c8b 100644 --- a/org.smeup.sys.os.dtaq/src/org/smeup/sys/os/dtaq/impl/DataQueueImpl.java +++ b/org.smeup.sys.os.dtaq/src/org/smeup/sys/os/dtaq/impl/DataQueueImpl.java @@ -33,7 +33,6 @@ * *

* The following features are implemented: - *

*
    *
  • {@link org.smeup.sys.os.dtaq.impl.DataQueueImpl#getLockRead Lock Read}
    • *
  • {@link org.smeup.sys.os.dtaq.impl.DataQueueImpl#getLockWrite Lock Write}
    • @@ -43,6 +42,7 @@ *
  • {@link org.smeup.sys.os.dtaq.impl.DataQueueImpl#isSenderInfo Sender Info}
    • *
  • {@link org.smeup.sys.os.dtaq.impl.DataQueueImpl#getContent Content}
    • *
+ *

* * @generated */ diff --git a/org.smeup.sys.os.file.base/src/org/smeup/sys/os/file/base/BaseFileListenerImpl.java b/org.smeup.sys.os.file.base/src/org/smeup/sys/os/file/base/BaseFileListenerImpl.java index 70e25a75..18a5b97b 100644 --- a/org.smeup.sys.os.file.base/src/org/smeup/sys/os/file/base/BaseFileListenerImpl.java +++ b/org.smeup.sys.os.file.base/src/org/smeup/sys/os/file/base/BaseFileListenerImpl.java @@ -63,7 +63,7 @@ public void handleEvent(QResourceEvent event) { return; } - QContextProvider contextProvider = event.getResource().getContextProvider(); + QContextProvider contextProvider = event.getContextProvider(); // file.setLibrary(((QResourceReader) // event.getResource()).getContainer()); @@ -71,7 +71,7 @@ public void handleEvent(QResourceEvent event) { QContext jobContext = contextProvider.getContext(); QConnection connection = jobContext.getAdapter(contextProvider, QConnection.class); - Schema schema = connection.getCatalogMetaData().getSchema(file.getLibrary()); + Schema schema = connection.getCatalogMetaData().getSchema(event.getResource().getName()); if (schema == null) throw new OperatingSystemRuntimeException("Schema not found: " + file.getLibrary()); diff --git a/org.smeup.sys.os.file.base/src/org/smeup/sys/os/file/base/BaseLibraryListenerImpl.java b/org.smeup.sys.os.file.base/src/org/smeup/sys/os/file/base/BaseLibraryListenerImpl.java index 8eba3c00..4045f416 100644 --- a/org.smeup.sys.os.file.base/src/org/smeup/sys/os/file/base/BaseLibraryListenerImpl.java +++ b/org.smeup.sys.os.file.base/src/org/smeup/sys/os/file/base/BaseLibraryListenerImpl.java @@ -49,7 +49,7 @@ public void handleEvent(QResourceEvent event) { return; QLibrary library = event.getSource(); - QContextProvider contextProvider = event.getResource().getContextProvider(); + QContextProvider contextProvider = event.getContextProvider(); QContext jobContext = contextProvider.getContext(); diff --git a/org.smeup.sys.os.file.jdt/src/org/smeup/sys/os/file/jdt/JDTFileMemberManagerImpl.java b/org.smeup.sys.os.file.jdt/src/org/smeup/sys/os/file/jdt/JDTFileMemberManagerImpl.java index a125c1a7..7ee16fc2 100644 --- a/org.smeup.sys.os.file.jdt/src/org/smeup/sys/os/file/jdt/JDTFileMemberManagerImpl.java +++ b/org.smeup.sys.os.file.jdt/src/org/smeup/sys/os/file/jdt/JDTFileMemberManagerImpl.java @@ -93,7 +93,9 @@ public QFileMember lookup(QContextProvider contextProvider, QFileMembered file, public QFileMember lookup(QContextProvider contextProvider, Scope scope, String library, String file, String name) { QResourceReader fileReader = resourceManager.getResourceReader(contextProvider, QFile.class, scope, library); - + if(fileReader == null) + return null; + QFileMember fileMember = null; try (QObjectIterator fileList = fileReader.find(file);) { while (fileList.hasNext()) { diff --git a/org.smeup.sys.os.file/model/os-file.ecore b/org.smeup.sys.os.file/model/os-file.ecore index 4c345be9..c25f6a52 100644 --- a/org.smeup.sys.os.file/model/os-file.ecore +++ b/org.smeup.sys.os.file/model/os-file.ecore @@ -94,7 +94,7 @@ - + * The following features are supported: - *

*
    *
  • {@link org.smeup.sys.os.file.QDatabaseFile#getDatabaseFormat Database Format}
    • *
+ *

* * @see org.smeup.sys.os.file.QOperatingSystemFilePackage#getDatabaseFile() * @model abstract="true" diff --git a/org.smeup.sys.os.file/src/org/smeup/sys/os/file/QDatabaseFileFormat.java b/org.smeup.sys.os.file/src/org/smeup/sys/os/file/QDatabaseFileFormat.java index 71d3ec10..2a70a220 100644 --- a/org.smeup.sys.os.file/src/org/smeup/sys/os/file/QDatabaseFileFormat.java +++ b/org.smeup.sys.os.file/src/org/smeup/sys/os/file/QDatabaseFileFormat.java @@ -13,10 +13,10 @@ * *

* The following features are supported: - *

*
    *
  • {@link org.smeup.sys.os.file.QDatabaseFileFormat#getFormatKey Format Key}
    • *
+ *

* * @see org.smeup.sys.os.file.QOperatingSystemFilePackage#getDatabaseFileFormat() * @model diff --git a/org.smeup.sys.os.file/src/org/smeup/sys/os/file/QDisplayFile.java b/org.smeup.sys.os.file/src/org/smeup/sys/os/file/QDisplayFile.java index ce0df0ee..5764689c 100644 --- a/org.smeup.sys.os.file/src/org/smeup/sys/os/file/QDisplayFile.java +++ b/org.smeup.sys.os.file/src/org/smeup/sys/os/file/QDisplayFile.java @@ -15,10 +15,10 @@ * *

* The following features are supported: - *

*
    *
  • {@link org.smeup.sys.os.file.QDisplayFile#getDisplayFormats Display Formats}
    • *
+ *

* * @see org.smeup.sys.os.file.QOperatingSystemFilePackage#getDisplayFile() * @model diff --git a/org.smeup.sys.os.file/src/org/smeup/sys/os/file/QExternalFile.java b/org.smeup.sys.os.file/src/org/smeup/sys/os/file/QExternalFile.java index 177c662e..4fcaf850 100644 --- a/org.smeup.sys.os.file/src/org/smeup/sys/os/file/QExternalFile.java +++ b/org.smeup.sys.os.file/src/org/smeup/sys/os/file/QExternalFile.java @@ -15,12 +15,12 @@ * *

* The following features are supported: - *

*
    *
  • {@link org.smeup.sys.os.file.QExternalFile#getName Name}
    • *
  • {@link org.smeup.sys.os.file.QExternalFile#getFormat Format}
    • *
  • {@link org.smeup.sys.os.file.QExternalFile#getRule Rule}
    • *
+ *

* * @see org.smeup.sys.os.file.QOperatingSystemFilePackage#getExternalFile() * @model diff --git a/org.smeup.sys.os.file/src/org/smeup/sys/os/file/QFileFormatKey.java b/org.smeup.sys.os.file/src/org/smeup/sys/os/file/QFileFormatKey.java index 8acf14ed..0318d5c5 100644 --- a/org.smeup.sys.os.file/src/org/smeup/sys/os/file/QFileFormatKey.java +++ b/org.smeup.sys.os.file/src/org/smeup/sys/os/file/QFileFormatKey.java @@ -17,11 +17,11 @@ * *

* The following features are supported: - *

*
    *
  • {@link org.smeup.sys.os.file.QFileFormatKey#isUnique Unique}
    • *
  • {@link org.smeup.sys.os.file.QFileFormatKey#getKeyFields Key Fields}
    • *
+ *

* * @see org.smeup.sys.os.file.QOperatingSystemFilePackage#getFileFormatKey() * @model diff --git a/org.smeup.sys.os.file/src/org/smeup/sys/os/file/QFileFormatKeyField.java b/org.smeup.sys.os.file/src/org/smeup/sys/os/file/QFileFormatKeyField.java index a781b796..2f2f2900 100644 --- a/org.smeup.sys.os.file/src/org/smeup/sys/os/file/QFileFormatKeyField.java +++ b/org.smeup.sys.os.file/src/org/smeup/sys/os/file/QFileFormatKeyField.java @@ -13,11 +13,11 @@ * *

* The following features are supported: - *

*
    *
  • {@link org.smeup.sys.os.file.QFileFormatKeyField#getName Name}
    • *
  • {@link org.smeup.sys.os.file.QFileFormatKeyField#isDescend Descend}
    • *
+ *

* * @see org.smeup.sys.os.file.QOperatingSystemFilePackage#getFileFormatKeyField() * @model diff --git a/org.smeup.sys.os.file/src/org/smeup/sys/os/file/QFileMember.java b/org.smeup.sys.os.file/src/org/smeup/sys/os/file/QFileMember.java index 65605b71..ab71b14a 100644 --- a/org.smeup.sys.os.file/src/org/smeup/sys/os/file/QFileMember.java +++ b/org.smeup.sys.os.file/src/org/smeup/sys/os/file/QFileMember.java @@ -9,7 +9,7 @@ import java.util.List; -import org.smeup.sys.il.core.QObject; +import org.smeup.sys.il.core.QObjectNameable; /** * A representation of the model object ' @@ -17,7 +17,6 @@ * *

* The following features are supported: - *

*
    *
  • {@link org.smeup.sys.os.file.QFileMember#getFile File}
    • *
  • {@link org.smeup.sys.os.file.QFileMember#getName Name}
    • @@ -25,12 +24,13 @@ *
  • {@link org.smeup.sys.os.file.QFileMember#getText Text}
    • *
  • {@link org.smeup.sys.os.file.QFileMember#getType Type}
    • *
+ *

* * @see org.smeup.sys.os.file.QOperatingSystemFilePackage#getFileMember() * @model * @generated */ -public interface QFileMember extends QObject { +public interface QFileMember extends QObjectNameable { /** * Returns the value of the 'Type' attribute. diff --git a/org.smeup.sys.os.file/src/org/smeup/sys/os/file/QFileMemberRow.java b/org.smeup.sys.os.file/src/org/smeup/sys/os/file/QFileMemberRow.java index 7c759f30..610109b2 100644 --- a/org.smeup.sys.os.file/src/org/smeup/sys/os/file/QFileMemberRow.java +++ b/org.smeup.sys.os.file/src/org/smeup/sys/os/file/QFileMemberRow.java @@ -15,13 +15,13 @@ * *

* The following features are supported: - *

*
    *
  • {@link org.smeup.sys.os.file.QFileMemberRow#getSequence Sequence}
    • *
  • {@link org.smeup.sys.os.file.QFileMemberRow#getDate Date}
    • *
  • {@link org.smeup.sys.os.file.QFileMemberRow#getContent Content}
    • *
  • {@link org.smeup.sys.os.file.QFileMemberRow#getFileMember File Member}
    • *
+ *

* * @see org.smeup.sys.os.file.QOperatingSystemFilePackage#getFileMemberRow() * @model diff --git a/org.smeup.sys.os.file/src/org/smeup/sys/os/file/QFileOverride.java b/org.smeup.sys.os.file/src/org/smeup/sys/os/file/QFileOverride.java index 3c1ebf0f..d0e8c597 100644 --- a/org.smeup.sys.os.file/src/org/smeup/sys/os/file/QFileOverride.java +++ b/org.smeup.sys.os.file/src/org/smeup/sys/os/file/QFileOverride.java @@ -15,12 +15,12 @@ * *

* The following features are supported: - *

*
    *
  • {@link org.smeup.sys.os.file.QFileOverride#getName Name}
    • *
  • {@link org.smeup.sys.os.file.QFileOverride#getFileTo File To}
    • *
  • {@link org.smeup.sys.os.file.QFileOverride#getMemberTo Member To}
    • *
+ *

* * @see org.smeup.sys.os.file.QOperatingSystemFilePackage#getFileOverride() * @model diff --git a/org.smeup.sys.os.file/src/org/smeup/sys/os/file/QLogicalFile.java b/org.smeup.sys.os.file/src/org/smeup/sys/os/file/QLogicalFile.java index cc54cc11..cb0f861f 100644 --- a/org.smeup.sys.os.file/src/org/smeup/sys/os/file/QLogicalFile.java +++ b/org.smeup.sys.os.file/src/org/smeup/sys/os/file/QLogicalFile.java @@ -15,11 +15,11 @@ * *

* The following features are supported: - *

*
    *
  • {@link org.smeup.sys.os.file.QLogicalFile#getCreationStatement Creation Statement}
    • *
  • {@link org.smeup.sys.os.file.QLogicalFile#getTables Tables}
    • *
+ *

* * @see org.smeup.sys.os.file.QOperatingSystemFilePackage#getLogicalFile() * @model diff --git a/org.smeup.sys.os.file/src/org/smeup/sys/os/file/QOperatingSystemFilePackage.java b/org.smeup.sys.os.file/src/org/smeup/sys/os/file/QOperatingSystemFilePackage.java index 5a6f6c05..73a9cd2d 100644 --- a/org.smeup.sys.os.file/src/org/smeup/sys/os/file/QOperatingSystemFilePackage.java +++ b/org.smeup.sys.os.file/src/org/smeup/sys/os/file/QOperatingSystemFilePackage.java @@ -88,15 +88,6 @@ public interface QOperatingSystemFilePackage extends EPackage { */ int FILE__FACETS = QOperatingSystemTypePackage.TYPED_OBJECT__FACETS; - /** - * The feature id for the 'Library' attribute. - * - * @generated - * @ordered - */ - int FILE__LIBRARY = QOperatingSystemTypePackage.TYPED_OBJECT__LIBRARY; - /** * The feature id for the 'Name' attribute. @@ -162,15 +153,6 @@ public interface QOperatingSystemFilePackage extends EPackage { */ int DATABASE_FILE__FACETS = FILE__FACETS; - /** - * The feature id for the 'Library' attribute. - * - * @generated - * @ordered - */ - int DATABASE_FILE__LIBRARY = FILE__LIBRARY; - /** * The feature id for the 'Name' attribute. @@ -875,15 +857,6 @@ public interface QOperatingSystemFilePackage extends EPackage { */ int DISPLAY_FILE__FACETS = FILE__FACETS; - /** - * The feature id for the 'Library' attribute. - * - * @generated - * @ordered - */ - int DISPLAY_FILE__LIBRARY = FILE__LIBRARY; - /** * The feature id for the 'Name' attribute. @@ -1316,7 +1289,7 @@ public interface QOperatingSystemFilePackage extends EPackage { * @generated * @ordered */ - int FILE_MEMBER__FILE = QIntegratedLanguageCorePackage.OBJECT_FEATURE_COUNT + 0; + int FILE_MEMBER__FILE = QIntegratedLanguageCorePackage.OBJECT_NAMEABLE_FEATURE_COUNT + 0; /** * The feature id for the 'Name' attribute. - * - * @generated - * @ordered - */ - int LOGICAL_FILE__LIBRARY = DATABASE_FILE__LIBRARY; - /** * The feature id for the 'Name' attribute. @@ -1610,15 +1574,6 @@ public interface QOperatingSystemFilePackage extends EPackage { */ int PHYSICAL_FILE__FACETS = DATABASE_FILE__FACETS; - /** - * The feature id for the 'Library' attribute. - * - * @generated - * @ordered - */ - int PHYSICAL_FILE__LIBRARY = DATABASE_FILE__LIBRARY; - /** * The feature id for the 'Name' attribute. @@ -1679,15 +1634,6 @@ public interface QOperatingSystemFilePackage extends EPackage { */ int PRINTER_FILE__FACETS = FILE__FACETS; - /** - * The feature id for the 'Library' attribute. - * - * @generated - * @ordered - */ - int PRINTER_FILE__LIBRARY = FILE__LIBRARY; - /** * The feature id for the 'Name' attribute. @@ -2007,15 +1953,6 @@ public interface QOperatingSystemFilePackage extends EPackage { */ int SOURCE_FILE__FACETS = FILE__FACETS; - /** - * The feature id for the 'Library' attribute. - * - * @generated - * @ordered - */ - int SOURCE_FILE__LIBRARY = FILE__LIBRARY; - /** * The feature id for the 'Name' attribute. diff --git a/org.smeup.sys.os.file/src/org/smeup/sys/os/file/QPrinterFile.java b/org.smeup.sys.os.file/src/org/smeup/sys/os/file/QPrinterFile.java index 47799156..a4371635 100644 --- a/org.smeup.sys.os.file/src/org/smeup/sys/os/file/QPrinterFile.java +++ b/org.smeup.sys.os.file/src/org/smeup/sys/os/file/QPrinterFile.java @@ -15,10 +15,10 @@ * *

* The following features are supported: - *

*
    *
  • {@link org.smeup.sys.os.file.QPrinterFile#getPrinterFormats Printer Formats}
    • *
+ *

* * @see org.smeup.sys.os.file.QOperatingSystemFilePackage#getPrinterFile() * @model diff --git a/org.smeup.sys.os.file/src/org/smeup/sys/os/file/QSourceFile.java b/org.smeup.sys.os.file/src/org/smeup/sys/os/file/QSourceFile.java index cb000bf5..86382e11 100644 --- a/org.smeup.sys.os.file/src/org/smeup/sys/os/file/QSourceFile.java +++ b/org.smeup.sys.os.file/src/org/smeup/sys/os/file/QSourceFile.java @@ -13,10 +13,10 @@ * *

* The following features are supported: - *

*
    *
  • {@link org.smeup.sys.os.file.QSourceFile#getFileType File Type}
    • *
+ *

* * @see org.smeup.sys.os.file.QOperatingSystemFilePackage#getSourceFile() * @model diff --git a/org.smeup.sys.os.file/src/org/smeup/sys/os/file/impl/DatabaseFileFieldImpl.java b/org.smeup.sys.os.file/src/org/smeup/sys/os/file/impl/DatabaseFileFieldImpl.java index fa5cd0d0..b809e6e3 100644 --- a/org.smeup.sys.os.file/src/org/smeup/sys/os/file/impl/DatabaseFileFieldImpl.java +++ b/org.smeup.sys.os.file/src/org/smeup/sys/os/file/impl/DatabaseFileFieldImpl.java @@ -14,6 +14,8 @@ /** * An implementation of the model object ' * Database File Field'. + *

+ *

* * @generated */ diff --git a/org.smeup.sys.os.file/src/org/smeup/sys/os/file/impl/DatabaseFileFormatDefImpl.java b/org.smeup.sys.os.file/src/org/smeup/sys/os/file/impl/DatabaseFileFormatDefImpl.java index eb9ec325..7d2488f6 100644 --- a/org.smeup.sys.os.file/src/org/smeup/sys/os/file/impl/DatabaseFileFormatDefImpl.java +++ b/org.smeup.sys.os.file/src/org/smeup/sys/os/file/impl/DatabaseFileFormatDefImpl.java @@ -21,6 +21,8 @@ /** * An implementation of the model object ' * Database File Format Def'. + *

+ *

* * @generated */ diff --git a/org.smeup.sys.os.file/src/org/smeup/sys/os/file/impl/DatabaseFileFormatImpl.java b/org.smeup.sys.os.file/src/org/smeup/sys/os/file/impl/DatabaseFileFormatImpl.java index de4e8b6c..4d93a18e 100644 --- a/org.smeup.sys.os.file/src/org/smeup/sys/os/file/impl/DatabaseFileFormatImpl.java +++ b/org.smeup.sys.os.file/src/org/smeup/sys/os/file/impl/DatabaseFileFormatImpl.java @@ -22,10 +22,10 @@ * Database File Format'. *

* The following features are implemented: - *

*
    *
  • {@link org.smeup.sys.os.file.impl.DatabaseFileFormatImpl#getFormatKey Format Key}
    • *
+ *

* * @generated */ diff --git a/org.smeup.sys.os.file/src/org/smeup/sys/os/file/impl/DatabaseFileImpl.java b/org.smeup.sys.os.file/src/org/smeup/sys/os/file/impl/DatabaseFileImpl.java index d01cfeda..e6967f8d 100644 --- a/org.smeup.sys.os.file/src/org/smeup/sys/os/file/impl/DatabaseFileImpl.java +++ b/org.smeup.sys.os.file/src/org/smeup/sys/os/file/impl/DatabaseFileImpl.java @@ -24,10 +24,10 @@ * Database File'. *

* The following features are implemented: - *

*
    *
  • {@link org.smeup.sys.os.file.impl.DatabaseFileImpl#getDatabaseFormat Database Format}
    • *
+ *

* * @generated */ diff --git a/org.smeup.sys.os.file/src/org/smeup/sys/os/file/impl/DisplayFileFieldImpl.java b/org.smeup.sys.os.file/src/org/smeup/sys/os/file/impl/DisplayFileFieldImpl.java index 7e76e837..38f21945 100644 --- a/org.smeup.sys.os.file/src/org/smeup/sys/os/file/impl/DisplayFileFieldImpl.java +++ b/org.smeup.sys.os.file/src/org/smeup/sys/os/file/impl/DisplayFileFieldImpl.java @@ -14,6 +14,8 @@ /** * An implementation of the model object ' * Display File Field'. + *

+ *

* * @generated */ diff --git a/org.smeup.sys.os.file/src/org/smeup/sys/os/file/impl/DisplayFileFormatDefImpl.java b/org.smeup.sys.os.file/src/org/smeup/sys/os/file/impl/DisplayFileFormatDefImpl.java index 007b9a89..addddaf1 100644 --- a/org.smeup.sys.os.file/src/org/smeup/sys/os/file/impl/DisplayFileFormatDefImpl.java +++ b/org.smeup.sys.os.file/src/org/smeup/sys/os/file/impl/DisplayFileFormatDefImpl.java @@ -21,6 +21,8 @@ /** * An implementation of the model object ' * Display File Format Def'. + *

+ *

* * @generated */ diff --git a/org.smeup.sys.os.file/src/org/smeup/sys/os/file/impl/DisplayFileFormatImpl.java b/org.smeup.sys.os.file/src/org/smeup/sys/os/file/impl/DisplayFileFormatImpl.java index 69ce48a2..0684b35e 100644 --- a/org.smeup.sys.os.file/src/org/smeup/sys/os/file/impl/DisplayFileFormatImpl.java +++ b/org.smeup.sys.os.file/src/org/smeup/sys/os/file/impl/DisplayFileFormatImpl.java @@ -15,6 +15,8 @@ /** * An implementation of the model object ' * Display File Format'. + *

+ *

* * @generated */ diff --git a/org.smeup.sys.os.file/src/org/smeup/sys/os/file/impl/DisplayFileImpl.java b/org.smeup.sys.os.file/src/org/smeup/sys/os/file/impl/DisplayFileImpl.java index 474445c2..93bccfc5 100644 --- a/org.smeup.sys.os.file/src/org/smeup/sys/os/file/impl/DisplayFileImpl.java +++ b/org.smeup.sys.os.file/src/org/smeup/sys/os/file/impl/DisplayFileImpl.java @@ -27,10 +27,10 @@ * Display File'. *

* The following features are implemented: - *

*
    *
  • {@link org.smeup.sys.os.file.impl.DisplayFileImpl#getDisplayFormats Display Formats}
    • *
+ *

* * @generated */ diff --git a/org.smeup.sys.os.file/src/org/smeup/sys/os/file/impl/ExternalFileImpl.java b/org.smeup.sys.os.file/src/org/smeup/sys/os/file/impl/ExternalFileImpl.java index d3d0f8e5..c336cacd 100644 --- a/org.smeup.sys.os.file/src/org/smeup/sys/os/file/impl/ExternalFileImpl.java +++ b/org.smeup.sys.os.file/src/org/smeup/sys/os/file/impl/ExternalFileImpl.java @@ -19,12 +19,12 @@ * External File'. *

* The following features are implemented: - *

*
    *
  • {@link org.smeup.sys.os.file.impl.ExternalFileImpl#getName Name}
    • *
  • {@link org.smeup.sys.os.file.impl.ExternalFileImpl#getFormat Format}
    • *
  • {@link org.smeup.sys.os.file.impl.ExternalFileImpl#getRule Rule}
    • *
+ *

* * @generated */ diff --git a/org.smeup.sys.os.file/src/org/smeup/sys/os/file/impl/FileFormatFieldImpl.java b/org.smeup.sys.os.file/src/org/smeup/sys/os/file/impl/FileFormatFieldImpl.java index 56201e96..7a140339 100644 --- a/org.smeup.sys.os.file/src/org/smeup/sys/os/file/impl/FileFormatFieldImpl.java +++ b/org.smeup.sys.os.file/src/org/smeup/sys/os/file/impl/FileFormatFieldImpl.java @@ -17,6 +17,8 @@ /** * An implementation of the model object ' * File Format Field'. + *

+ *

* * @generated */ diff --git a/org.smeup.sys.os.file/src/org/smeup/sys/os/file/impl/FileFormatImpl.java b/org.smeup.sys.os.file/src/org/smeup/sys/os/file/impl/FileFormatImpl.java index 218bc1df..60d868b3 100644 --- a/org.smeup.sys.os.file/src/org/smeup/sys/os/file/impl/FileFormatImpl.java +++ b/org.smeup.sys.os.file/src/org/smeup/sys/os/file/impl/FileFormatImpl.java @@ -17,6 +17,8 @@ /** * An implementation of the model object ' * File Format'. + *

+ *

* * @generated */ diff --git a/org.smeup.sys.os.file/src/org/smeup/sys/os/file/impl/FileFormatKeyFieldImpl.java b/org.smeup.sys.os.file/src/org/smeup/sys/os/file/impl/FileFormatKeyFieldImpl.java index d8df6e3b..e2753434 100644 --- a/org.smeup.sys.os.file/src/org/smeup/sys/os/file/impl/FileFormatKeyFieldImpl.java +++ b/org.smeup.sys.os.file/src/org/smeup/sys/os/file/impl/FileFormatKeyFieldImpl.java @@ -19,11 +19,11 @@ * File Format Key Field'. *

* The following features are implemented: - *

*
    *
  • {@link org.smeup.sys.os.file.impl.FileFormatKeyFieldImpl#getName Name}
    • *
  • {@link org.smeup.sys.os.file.impl.FileFormatKeyFieldImpl#isDescend Descend}
    • *
+ *

* * @generated */ diff --git a/org.smeup.sys.os.file/src/org/smeup/sys/os/file/impl/FileFormatKeyImpl.java b/org.smeup.sys.os.file/src/org/smeup/sys/os/file/impl/FileFormatKeyImpl.java index 810391b0..5f865fb3 100644 --- a/org.smeup.sys.os.file/src/org/smeup/sys/os/file/impl/FileFormatKeyImpl.java +++ b/org.smeup.sys.os.file/src/org/smeup/sys/os/file/impl/FileFormatKeyImpl.java @@ -28,11 +28,11 @@ * File Format Key'. *

* The following features are implemented: - *

*
    *
  • {@link org.smeup.sys.os.file.impl.FileFormatKeyImpl#isUnique Unique}
    • *
  • {@link org.smeup.sys.os.file.impl.FileFormatKeyImpl#getKeyFields Key Fields}
    • *
+ *

* * @generated */ diff --git a/org.smeup.sys.os.file/src/org/smeup/sys/os/file/impl/FileImpl.java b/org.smeup.sys.os.file/src/org/smeup/sys/os/file/impl/FileImpl.java index 2dfd58b8..01a55e1f 100644 --- a/org.smeup.sys.os.file/src/org/smeup/sys/os/file/impl/FileImpl.java +++ b/org.smeup.sys.os.file/src/org/smeup/sys/os/file/impl/FileImpl.java @@ -18,6 +18,8 @@ /** * An implementation of the model object ' * QFile'. + *

+ *

* * @generated */ diff --git a/org.smeup.sys.os.file/src/org/smeup/sys/os/file/impl/FileMemberImpl.java b/org.smeup.sys.os.file/src/org/smeup/sys/os/file/impl/FileMemberImpl.java index b64a887d..c602d322 100644 --- a/org.smeup.sys.os.file/src/org/smeup/sys/os/file/impl/FileMemberImpl.java +++ b/org.smeup.sys.os.file/src/org/smeup/sys/os/file/impl/FileMemberImpl.java @@ -19,7 +19,7 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList; import org.eclipse.emf.ecore.util.InternalEList; -import org.smeup.sys.il.core.impl.ObjectImpl; +import org.smeup.sys.il.core.impl.ObjectNameableImpl; import org.smeup.sys.os.file.QFileMember; import org.smeup.sys.os.file.QFileMemberRow; import org.smeup.sys.os.file.QFileMembered; @@ -30,7 +30,6 @@ * Member'. *

* The following features are implemented: - *

*
    *
  • {@link org.smeup.sys.os.file.impl.FileMemberImpl#getFile File}
    • *
  • {@link org.smeup.sys.os.file.impl.FileMemberImpl#getName Name}
    • @@ -38,10 +37,11 @@ *
  • {@link org.smeup.sys.os.file.impl.FileMemberImpl#getText Text}
    • *
  • {@link org.smeup.sys.os.file.impl.FileMemberImpl#getType Type}
    • *
+ *

* * @generated */ -public class FileMemberImpl extends ObjectImpl implements QFileMember { +public class FileMemberImpl extends ObjectNameableImpl implements QFileMember { /** * */ diff --git a/org.smeup.sys.os.file/src/org/smeup/sys/os/file/impl/FileMemberRowImpl.java b/org.smeup.sys.os.file/src/org/smeup/sys/os/file/impl/FileMemberRowImpl.java index f2e08a01..3a17cc6e 100644 --- a/org.smeup.sys.os.file/src/org/smeup/sys/os/file/impl/FileMemberRowImpl.java +++ b/org.smeup.sys.os.file/src/org/smeup/sys/os/file/impl/FileMemberRowImpl.java @@ -24,13 +24,13 @@ * Member Row'. *

* The following features are implemented: - *

*
    *
  • {@link org.smeup.sys.os.file.impl.FileMemberRowImpl#getSequence Sequence}
    • *
  • {@link org.smeup.sys.os.file.impl.FileMemberRowImpl#getDate Date}
    • *
  • {@link org.smeup.sys.os.file.impl.FileMemberRowImpl#getContent Content}
    • *
  • {@link org.smeup.sys.os.file.impl.FileMemberRowImpl#getFileMember File Member}
    • *
+ *

* * @generated */ diff --git a/org.smeup.sys.os.file/src/org/smeup/sys/os/file/impl/FileOverrideImpl.java b/org.smeup.sys.os.file/src/org/smeup/sys/os/file/impl/FileOverrideImpl.java index 8fcc47ad..7edecd31 100644 --- a/org.smeup.sys.os.file/src/org/smeup/sys/os/file/impl/FileOverrideImpl.java +++ b/org.smeup.sys.os.file/src/org/smeup/sys/os/file/impl/FileOverrideImpl.java @@ -22,12 +22,12 @@ * File Override'. *

* The following features are implemented: - *

*
    *
  • {@link org.smeup.sys.os.file.impl.FileOverrideImpl#getName Name}
    • *
  • {@link org.smeup.sys.os.file.impl.FileOverrideImpl#getFileTo File To}
    • *
  • {@link org.smeup.sys.os.file.impl.FileOverrideImpl#getMemberTo Member To}
    • *
+ *

* * @generated */ diff --git a/org.smeup.sys.os.file/src/org/smeup/sys/os/file/impl/LogicalFileImpl.java b/org.smeup.sys.os.file/src/org/smeup/sys/os/file/impl/LogicalFileImpl.java index 75f37ee4..3bafeffc 100644 --- a/org.smeup.sys.os.file/src/org/smeup/sys/os/file/impl/LogicalFileImpl.java +++ b/org.smeup.sys.os.file/src/org/smeup/sys/os/file/impl/LogicalFileImpl.java @@ -23,11 +23,11 @@ * QLogical File'. *

* The following features are implemented: - *

*
    *
  • {@link org.smeup.sys.os.file.impl.LogicalFileImpl#getCreationStatement Creation Statement}
    • *
  • {@link org.smeup.sys.os.file.impl.LogicalFileImpl#getTables Tables}
    • *
+ *

* * @generated */ diff --git a/org.smeup.sys.os.file/src/org/smeup/sys/os/file/impl/OperatingSystemFilePackageImpl.java b/org.smeup.sys.os.file/src/org/smeup/sys/os/file/impl/OperatingSystemFilePackageImpl.java index a0f60829..ba960701 100644 --- a/org.smeup.sys.os.file/src/org/smeup/sys/os/file/impl/OperatingSystemFilePackageImpl.java +++ b/org.smeup.sys.os.file/src/org/smeup/sys/os/file/impl/OperatingSystemFilePackageImpl.java @@ -953,7 +953,7 @@ public void initializePackageContents() { g2.getETypeArguments().add(g3); fileFormatFieldEClass.getEGenericSuperTypes().add(g1); fileFormatKeyEClass.getESuperTypes().add(theIntegratedLanguageCorePackage.getObject()); - fileMemberEClass.getESuperTypes().add(theIntegratedLanguageCorePackage.getObject()); + fileMemberEClass.getESuperTypes().add(theIntegratedLanguageCorePackage.getObjectNameable()); fileMemberRowEClass.getESuperTypes().add(theIntegratedLanguageCorePackage.getObject()); fileOverrideEClass.getESuperTypes().add(theIntegratedLanguageCorePackage.getObjectNameable()); logicalFileEClass.getESuperTypes().add(this.getDatabaseFile()); diff --git a/org.smeup.sys.os.file/src/org/smeup/sys/os/file/impl/PhysicalFileImpl.java b/org.smeup.sys.os.file/src/org/smeup/sys/os/file/impl/PhysicalFileImpl.java index 93151689..571d365e 100644 --- a/org.smeup.sys.os.file/src/org/smeup/sys/os/file/impl/PhysicalFileImpl.java +++ b/org.smeup.sys.os.file/src/org/smeup/sys/os/file/impl/PhysicalFileImpl.java @@ -14,6 +14,8 @@ /** * An implementation of the model object ' * QPhysical File'. + *

+ *

* * @generated */ diff --git a/org.smeup.sys.os.file/src/org/smeup/sys/os/file/impl/PrinterFileFieldImpl.java b/org.smeup.sys.os.file/src/org/smeup/sys/os/file/impl/PrinterFileFieldImpl.java index c00c1691..89f778e6 100644 --- a/org.smeup.sys.os.file/src/org/smeup/sys/os/file/impl/PrinterFileFieldImpl.java +++ b/org.smeup.sys.os.file/src/org/smeup/sys/os/file/impl/PrinterFileFieldImpl.java @@ -14,6 +14,8 @@ /** * An implementation of the model object ' * Printer File Field'. + *

+ *

* * @generated */ diff --git a/org.smeup.sys.os.file/src/org/smeup/sys/os/file/impl/PrinterFileFormatDefImpl.java b/org.smeup.sys.os.file/src/org/smeup/sys/os/file/impl/PrinterFileFormatDefImpl.java index 4a2f703c..ebcc63a3 100644 --- a/org.smeup.sys.os.file/src/org/smeup/sys/os/file/impl/PrinterFileFormatDefImpl.java +++ b/org.smeup.sys.os.file/src/org/smeup/sys/os/file/impl/PrinterFileFormatDefImpl.java @@ -21,6 +21,8 @@ /** * An implementation of the model object ' * Printer File Format Def'. + *

+ *

* * @generated */ diff --git a/org.smeup.sys.os.file/src/org/smeup/sys/os/file/impl/PrinterFileFormatImpl.java b/org.smeup.sys.os.file/src/org/smeup/sys/os/file/impl/PrinterFileFormatImpl.java index 750f4233..3d4b3e22 100644 --- a/org.smeup.sys.os.file/src/org/smeup/sys/os/file/impl/PrinterFileFormatImpl.java +++ b/org.smeup.sys.os.file/src/org/smeup/sys/os/file/impl/PrinterFileFormatImpl.java @@ -15,6 +15,8 @@ /** * An implementation of the model object ' * Printer File Format'. + *

+ *

* * @generated */ diff --git a/org.smeup.sys.os.file/src/org/smeup/sys/os/file/impl/PrinterFileImpl.java b/org.smeup.sys.os.file/src/org/smeup/sys/os/file/impl/PrinterFileImpl.java index a727c8b9..17e8f057 100644 --- a/org.smeup.sys.os.file/src/org/smeup/sys/os/file/impl/PrinterFileImpl.java +++ b/org.smeup.sys.os.file/src/org/smeup/sys/os/file/impl/PrinterFileImpl.java @@ -27,10 +27,10 @@ * Printer File'. *

* The following features are implemented: - *

*
    *
  • {@link org.smeup.sys.os.file.impl.PrinterFileImpl#getPrinterFormats Printer Formats}
    • *
+ *

* * @generated */ diff --git a/org.smeup.sys.os.file/src/org/smeup/sys/os/file/impl/SourceFileImpl.java b/org.smeup.sys.os.file/src/org/smeup/sys/os/file/impl/SourceFileImpl.java index ffca283a..38d58113 100644 --- a/org.smeup.sys.os.file/src/org/smeup/sys/os/file/impl/SourceFileImpl.java +++ b/org.smeup.sys.os.file/src/org/smeup/sys/os/file/impl/SourceFileImpl.java @@ -18,10 +18,10 @@ * Source File'. *

* The following features are implemented: - *

*
    *
  • {@link org.smeup.sys.os.file.impl.SourceFileImpl#getFileType File Type}
    • *
+ *

* * @generated */ diff --git a/org.smeup.sys.os.jobd.base/src/org/smeup/sys/os/jobd/base/api/JobDescriptionChanger.java b/org.smeup.sys.os.jobd.base/src/org/smeup/sys/os/jobd/base/api/JobDescriptionChanger.java index 609d4f8c..54181b32 100644 --- a/org.smeup.sys.os.jobd.base/src/org/smeup/sys/os/jobd/base/api/JobDescriptionChanger.java +++ b/org.smeup.sys.os.jobd.base/src/org/smeup/sys/os/jobd/base/api/JobDescriptionChanger.java @@ -11,8 +11,6 @@ */ package org.smeup.sys.os.jobd.base.api; -import java.util.List; - import javax.inject.Inject; import org.smeup.sys.dk.core.annotation.Supported; @@ -30,8 +28,8 @@ import org.smeup.sys.il.data.def.DatetimeType; import org.smeup.sys.il.memo.QResourceManager; import org.smeup.sys.il.memo.QResourceWriter; -import org.smeup.sys.os.core.OperatingSystemRuntimeException; import org.smeup.sys.il.memo.Scope; +import org.smeup.sys.os.core.OperatingSystemRuntimeException; import org.smeup.sys.os.core.jobs.QJob; import org.smeup.sys.os.core.jobs.QJobLogManager; import org.smeup.sys.os.jobd.QJobDescription; @@ -185,8 +183,7 @@ public void main(@Supported @DataDef(qualified = true) JobDescription jobDescrip } // INLLIBL - List libraries = qJobDescription.getLibraries(); - qJobDescription.getLibraries().clear(); + boolean first = true; for (QEnum initialLibrary : initialLibraryList) { if (initialLibrary.asData().isEmpty()) @@ -197,12 +194,17 @@ public void main(@Supported @DataDef(qualified = true) JobDescription jobDescrip qJobDescription.getLibraries().clear(); break; case SAME: - qJobDescription.getLibraries().addAll(libraries); break; case SYSVAL: // TODO break; case OTHER: + + if(first) { + qJobDescription.getLibraries().clear(); + first = false; + } + qJobDescription.getLibraries().add(initialLibrary.asData().asString()); break; } diff --git a/org.smeup.sys.os.jobd/src/org/smeup/sys/os/jobd/QJobDescription.java b/org.smeup.sys.os.jobd/src/org/smeup/sys/os/jobd/QJobDescription.java index 393519e0..1d1f64b2 100644 --- a/org.smeup.sys.os.jobd/src/org/smeup/sys/os/jobd/QJobDescription.java +++ b/org.smeup.sys.os.jobd/src/org/smeup/sys/os/jobd/QJobDescription.java @@ -17,7 +17,6 @@ * *

* The following features are supported: - *

*
    *
  • {@link org.smeup.sys.os.jobd.QJobDescription#getJobQueue Job Queue}
    • *
  • {@link org.smeup.sys.os.jobd.QJobDescription#getJobPriorityOnJobq Job Priority On Jobq}
    • @@ -26,6 +25,7 @@ *
  • {@link org.smeup.sys.os.jobd.QJobDescription#getUser User}
    • *
  • {@link org.smeup.sys.os.jobd.QJobDescription#getLibraries Libraries}
    • *
+ *

* * @see org.smeup.sys.os.jobd.QOperatingSystemJobDescriptionPackage#getJobDescription() * @model diff --git a/org.smeup.sys.os.jobd/src/org/smeup/sys/os/jobd/QOperatingSystemJobDescriptionPackage.java b/org.smeup.sys.os.jobd/src/org/smeup/sys/os/jobd/QOperatingSystemJobDescriptionPackage.java index d3d7b0d9..a6c4cfcc 100644 --- a/org.smeup.sys.os.jobd/src/org/smeup/sys/os/jobd/QOperatingSystemJobDescriptionPackage.java +++ b/org.smeup.sys.os.jobd/src/org/smeup/sys/os/jobd/QOperatingSystemJobDescriptionPackage.java @@ -85,15 +85,6 @@ public interface QOperatingSystemJobDescriptionPackage extends EPackage { */ int JOB_DESCRIPTION__FACETS = QOperatingSystemTypePackage.TYPED_OBJECT__FACETS; - /** - * The feature id for the 'Library' attribute. - * - * @generated - * @ordered - */ - int JOB_DESCRIPTION__LIBRARY = QOperatingSystemTypePackage.TYPED_OBJECT__LIBRARY; - /** * The feature id for the 'Name' attribute. diff --git a/org.smeup.sys.os.jobd/src/org/smeup/sys/os/jobd/impl/JobDescriptionImpl.java b/org.smeup.sys.os.jobd/src/org/smeup/sys/os/jobd/impl/JobDescriptionImpl.java index 2af3106c..fd9ec546 100644 --- a/org.smeup.sys.os.jobd/src/org/smeup/sys/os/jobd/impl/JobDescriptionImpl.java +++ b/org.smeup.sys.os.jobd/src/org/smeup/sys/os/jobd/impl/JobDescriptionImpl.java @@ -27,7 +27,6 @@ * QJob Description'. *

* The following features are implemented: - *

*
    *
  • {@link org.smeup.sys.os.jobd.impl.JobDescriptionImpl#getJobQueue Job Queue}
    • *
  • {@link org.smeup.sys.os.jobd.impl.JobDescriptionImpl#getJobPriorityOnJobq Job Priority On Jobq}
    • @@ -36,6 +35,7 @@ *
  • {@link org.smeup.sys.os.jobd.impl.JobDescriptionImpl#getUser User}
    • *
  • {@link org.smeup.sys.os.jobd.impl.JobDescriptionImpl#getLibraries Libraries}
    • *
+ *

* * @generated */ diff --git a/org.smeup.sys.os.lib.base/src/org/smeup/sys/os/lib/base/BaseLibraryListenerImpl.java b/org.smeup.sys.os.lib.base/src/org/smeup/sys/os/lib/base/BaseLibraryListenerImpl.java index 0985dd27..55641a27 100644 --- a/org.smeup.sys.os.lib.base/src/org/smeup/sys/os/lib/base/BaseLibraryListenerImpl.java +++ b/org.smeup.sys.os.lib.base/src/org/smeup/sys/os/lib/base/BaseLibraryListenerImpl.java @@ -46,7 +46,7 @@ public void handleEvent(QResourceEvent event) { if (event.getEventType() != ResourceEventType.PRE_SAVE && event.getEventType() != ResourceEventType.PRE_DELETE) return; - QContextProvider contextProvider = event.getResource().getContextProvider(); + QContextProvider contextProvider = event.getContextProvider(); QLibrary library = event.getSource(); QProject project = null; diff --git a/org.smeup.sys.os.lib/src/org/smeup/sys/os/lib/QOperatingSystemLibraryPackage.java b/org.smeup.sys.os.lib/src/org/smeup/sys/os/lib/QOperatingSystemLibraryPackage.java index d62ef0c8..e8c1384e 100644 --- a/org.smeup.sys.os.lib/src/org/smeup/sys/os/lib/QOperatingSystemLibraryPackage.java +++ b/org.smeup.sys.os.lib/src/org/smeup/sys/os/lib/QOperatingSystemLibraryPackage.java @@ -108,15 +108,6 @@ public interface QOperatingSystemLibraryPackage extends EPackage { */ int LIBRARY__FACETS = QOperatingSystemTypePackage.TYPED_OBJECT__FACETS; - /** - * The feature id for the 'Library' attribute. - * - * @generated - * @ordered - */ - int LIBRARY__LIBRARY = QOperatingSystemTypePackage.TYPED_OBJECT__LIBRARY; - /** * The feature id for the 'Name' attribute. diff --git a/org.smeup.sys.os.module/src/org/smeup/sys/os/module/QModule.java b/org.smeup.sys.os.module/src/org/smeup/sys/os/module/QModule.java index e6b1e793..c06ff2f7 100644 --- a/org.smeup.sys.os.module/src/org/smeup/sys/os/module/QModule.java +++ b/org.smeup.sys.os.module/src/org/smeup/sys/os/module/QModule.java @@ -16,11 +16,11 @@ * *

* The following features are supported: - *

*
    *
  • {@link org.smeup.sys.os.module.QModule#getAddress Address}
    • *
  • {@link org.smeup.sys.os.module.QModule#getSource Source}
    • *
+ *

* * @see org.smeup.sys.os.module.QOperatingSystemModulePackage#getModule() * @model diff --git a/org.smeup.sys.os.module/src/org/smeup/sys/os/module/QModuleContainer.java b/org.smeup.sys.os.module/src/org/smeup/sys/os/module/QModuleContainer.java index db9a5ae8..33db5c54 100644 --- a/org.smeup.sys.os.module/src/org/smeup/sys/os/module/QModuleContainer.java +++ b/org.smeup.sys.os.module/src/org/smeup/sys/os/module/QModuleContainer.java @@ -16,11 +16,11 @@ * *

* The following features are supported: - *

*
    *
  • {@link org.smeup.sys.os.module.QModuleContainer#getBasePackage Base Package}
    • *
  • {@link org.smeup.sys.os.module.QModuleContainer#isScanPackage Scan Package}
    • *
+ *

* * @see org.smeup.sys.os.module.QOperatingSystemModulePackage#getModuleContainer() * @model diff --git a/org.smeup.sys.os.module/src/org/smeup/sys/os/module/QModuleSource.java b/org.smeup.sys.os.module/src/org/smeup/sys/os/module/QModuleSource.java index 32cc927c..a38ceccb 100644 --- a/org.smeup.sys.os.module/src/org/smeup/sys/os/module/QModuleSource.java +++ b/org.smeup.sys.os.module/src/org/smeup/sys/os/module/QModuleSource.java @@ -15,11 +15,11 @@ * *

* The following features are supported: - *

*
    *
  • {@link org.smeup.sys.os.module.QModuleSource#getType Type}
    • *
  • {@link org.smeup.sys.os.module.QModuleSource#getContent Content}
    • *
+ *

* * @see org.smeup.sys.os.module.QOperatingSystemModulePackage#getModuleSource() * @model diff --git a/org.smeup.sys.os.module/src/org/smeup/sys/os/module/QOperatingSystemModulePackage.java b/org.smeup.sys.os.module/src/org/smeup/sys/os/module/QOperatingSystemModulePackage.java index df66cd00..f302ef35 100644 --- a/org.smeup.sys.os.module/src/org/smeup/sys/os/module/QOperatingSystemModulePackage.java +++ b/org.smeup.sys.os.module/src/org/smeup/sys/os/module/QOperatingSystemModulePackage.java @@ -85,15 +85,6 @@ public interface QOperatingSystemModulePackage extends EPackage { */ int MODULE__FACETS = QOperatingSystemTypePackage.TYPED_OBJECT__FACETS; - /** - * The feature id for the 'Library' attribute. - * - * @generated - * @ordered - */ - int MODULE__LIBRARY = QOperatingSystemTypePackage.TYPED_OBJECT__LIBRARY; - /** * The feature id for the 'Name' attribute. diff --git a/org.smeup.sys.os.module/src/org/smeup/sys/os/module/impl/ModuleContainerImpl.java b/org.smeup.sys.os.module/src/org/smeup/sys/os/module/impl/ModuleContainerImpl.java index 822b8bf2..7967532c 100644 --- a/org.smeup.sys.os.module/src/org/smeup/sys/os/module/impl/ModuleContainerImpl.java +++ b/org.smeup.sys.os.module/src/org/smeup/sys/os/module/impl/ModuleContainerImpl.java @@ -20,11 +20,11 @@ * Module Container'. *

* The following features are implemented: - *

*
    *
  • {@link org.smeup.sys.os.module.impl.ModuleContainerImpl#getBasePackage Base Package}
    • *
  • {@link org.smeup.sys.os.module.impl.ModuleContainerImpl#isScanPackage Scan Package}
    • *
+ *

* * @generated */ diff --git a/org.smeup.sys.os.module/src/org/smeup/sys/os/module/impl/ModuleImpl.java b/org.smeup.sys.os.module/src/org/smeup/sys/os/module/impl/ModuleImpl.java index 12fcd2e7..224bc299 100644 --- a/org.smeup.sys.os.module/src/org/smeup/sys/os/module/impl/ModuleImpl.java +++ b/org.smeup.sys.os.module/src/org/smeup/sys/os/module/impl/ModuleImpl.java @@ -24,11 +24,11 @@ * Module'. *

* The following features are implemented: - *

*
    *
  • {@link org.smeup.sys.os.module.impl.ModuleImpl#getAddress Address}
    • *
  • {@link org.smeup.sys.os.module.impl.ModuleImpl#getSource Source}
    • *
+ *

* * @generated */ diff --git a/org.smeup.sys.os.module/src/org/smeup/sys/os/module/impl/ModuleSourceImpl.java b/org.smeup.sys.os.module/src/org/smeup/sys/os/module/impl/ModuleSourceImpl.java index ea90224d..fd4b4911 100644 --- a/org.smeup.sys.os.module/src/org/smeup/sys/os/module/impl/ModuleSourceImpl.java +++ b/org.smeup.sys.os.module/src/org/smeup/sys/os/module/impl/ModuleSourceImpl.java @@ -19,11 +19,11 @@ * Module Source'. *

* The following features are implemented: - *

*
    *
  • {@link org.smeup.sys.os.module.impl.ModuleSourceImpl#getType Type}
    • *
  • {@link org.smeup.sys.os.module.impl.ModuleSourceImpl#getContent Content}
    • *
+ *

* * @generated */ diff --git a/org.smeup.sys.os.msgf.base/ASUP-INF/commands.xmi b/org.smeup.sys.os.msgf.base/ASUP-INF/commands.xmi index f5fba88b..e4d33339 100644 --- a/org.smeup.sys.os.msgf.base/ASUP-INF/commands.xmi +++ b/org.smeup.sys.os.msgf.base/ASUP-INF/commands.xmi @@ -1043,7 +1043,7 @@ - + diff --git a/org.smeup.sys.os.msgf/src/org/smeup/sys/os/msgf/QMessageDataField.java b/org.smeup.sys.os.msgf/src/org/smeup/sys/os/msgf/QMessageDataField.java index 271b4d05..f3b07817 100644 --- a/org.smeup.sys.os.msgf/src/org/smeup/sys/os/msgf/QMessageDataField.java +++ b/org.smeup.sys.os.msgf/src/org/smeup/sys/os/msgf/QMessageDataField.java @@ -18,10 +18,10 @@ * *

* The following features are supported: - *

*
    *
  • {@link org.smeup.sys.os.msgf.QMessageDataField#getOutputMask Output Mask}
    • *
+ *

* * @see org.smeup.sys.os.msgf.QOperatingSystemMessageFilePackage#getMessageDataField() * @model diff --git a/org.smeup.sys.os.msgf/src/org/smeup/sys/os/msgf/QMessageDescription.java b/org.smeup.sys.os.msgf/src/org/smeup/sys/os/msgf/QMessageDescription.java index 1a2de0f9..c1ba216c 100644 --- a/org.smeup.sys.os.msgf/src/org/smeup/sys/os/msgf/QMessageDescription.java +++ b/org.smeup.sys.os.msgf/src/org/smeup/sys/os/msgf/QMessageDescription.java @@ -17,7 +17,6 @@ * *

* The following features are supported: - *

*
    *
  • {@link org.smeup.sys.os.msgf.QMessageDescription#getName Name}
    • *
  • {@link org.smeup.sys.os.msgf.QMessageDescription#getSeverity Severity}
    • @@ -25,6 +24,7 @@ *
  • {@link org.smeup.sys.os.msgf.QMessageDescription#getMessageText Message Text}
    • *
  • {@link org.smeup.sys.os.msgf.QMessageDescription#getMessageDataFields Message Data Fields}
    • *
+ *

* * @see org.smeup.sys.os.msgf.QOperatingSystemMessageFilePackage#getMessageDescription() * @model diff --git a/org.smeup.sys.os.msgf/src/org/smeup/sys/os/msgf/QMessageFile.java b/org.smeup.sys.os.msgf/src/org/smeup/sys/os/msgf/QMessageFile.java index af5266df..becbac2c 100644 --- a/org.smeup.sys.os.msgf/src/org/smeup/sys/os/msgf/QMessageFile.java +++ b/org.smeup.sys.os.msgf/src/org/smeup/sys/os/msgf/QMessageFile.java @@ -16,10 +16,10 @@ * *

* The following features are supported: - *

*
    *
  • {@link org.smeup.sys.os.msgf.QMessageFile#getMessages Messages}
    • *
+ *

* * @see org.smeup.sys.os.msgf.QOperatingSystemMessageFilePackage#getMessageFile() * @model diff --git a/org.smeup.sys.os.msgf/src/org/smeup/sys/os/msgf/QOperatingSystemMessageFilePackage.java b/org.smeup.sys.os.msgf/src/org/smeup/sys/os/msgf/QOperatingSystemMessageFilePackage.java index 45179947..06ae6bbd 100644 --- a/org.smeup.sys.os.msgf/src/org/smeup/sys/os/msgf/QOperatingSystemMessageFilePackage.java +++ b/org.smeup.sys.os.msgf/src/org/smeup/sys/os/msgf/QOperatingSystemMessageFilePackage.java @@ -276,15 +276,6 @@ public interface QOperatingSystemMessageFilePackage extends EPackage { */ int MESSAGE_FILE__FACETS = QOperatingSystemTypePackage.TYPED_OBJECT__FACETS; - /** - * The feature id for the 'Library' attribute. - * - * @generated - * @ordered - */ - int MESSAGE_FILE__LIBRARY = QOperatingSystemTypePackage.TYPED_OBJECT__LIBRARY; - /** * The feature id for the 'Name' attribute. diff --git a/org.smeup.sys.os.msgf/src/org/smeup/sys/os/msgf/impl/MessageDataFieldImpl.java b/org.smeup.sys.os.msgf/src/org/smeup/sys/os/msgf/impl/MessageDataFieldImpl.java index 97f37efe..4fa8de3a 100644 --- a/org.smeup.sys.os.msgf/src/org/smeup/sys/os/msgf/impl/MessageDataFieldImpl.java +++ b/org.smeup.sys.os.msgf/src/org/smeup/sys/os/msgf/impl/MessageDataFieldImpl.java @@ -27,10 +27,10 @@ * *

* The following features are implemented: - *

*
    *
  • {@link org.smeup.sys.os.msgf.impl.MessageDataFieldImpl#getOutputMask Output Mask}
    • *
+ *

* * @generated */ diff --git a/org.smeup.sys.os.msgf/src/org/smeup/sys/os/msgf/impl/MessageDescriptionImpl.java b/org.smeup.sys.os.msgf/src/org/smeup/sys/os/msgf/impl/MessageDescriptionImpl.java index 191af52e..49dcd438 100644 --- a/org.smeup.sys.os.msgf/src/org/smeup/sys/os/msgf/impl/MessageDescriptionImpl.java +++ b/org.smeup.sys.os.msgf/src/org/smeup/sys/os/msgf/impl/MessageDescriptionImpl.java @@ -28,7 +28,6 @@ * Message Description'. *

* The following features are implemented: - *

*
    *
  • {@link org.smeup.sys.os.msgf.impl.MessageDescriptionImpl#getName Name}
    • *
  • {@link org.smeup.sys.os.msgf.impl.MessageDescriptionImpl#getSeverity Severity}
    • @@ -36,6 +35,7 @@ *
  • {@link org.smeup.sys.os.msgf.impl.MessageDescriptionImpl#getMessageText Message Text}
    • *
  • {@link org.smeup.sys.os.msgf.impl.MessageDescriptionImpl#getMessageDataFields Message Data Fields}
    • *
+ *

* * @generated */ diff --git a/org.smeup.sys.os.msgf/src/org/smeup/sys/os/msgf/impl/MessageFileImpl.java b/org.smeup.sys.os.msgf/src/org/smeup/sys/os/msgf/impl/MessageFileImpl.java index 9e78d164..208b3722 100644 --- a/org.smeup.sys.os.msgf/src/org/smeup/sys/os/msgf/impl/MessageFileImpl.java +++ b/org.smeup.sys.os.msgf/src/org/smeup/sys/os/msgf/impl/MessageFileImpl.java @@ -26,10 +26,10 @@ * Message File'. *

* The following features are implemented: - *

*
    *
  • {@link org.smeup.sys.os.msgf.impl.MessageFileImpl#getMessages Messages}
    • *
+ *

* * @generated */ diff --git a/org.smeup.sys.os.outq/src/org/smeup/sys/os/outq/QOperatingSystemOutQueuePackage.java b/org.smeup.sys.os.outq/src/org/smeup/sys/os/outq/QOperatingSystemOutQueuePackage.java index ccba20bd..b98968c0 100644 --- a/org.smeup.sys.os.outq/src/org/smeup/sys/os/outq/QOperatingSystemOutQueuePackage.java +++ b/org.smeup.sys.os.outq/src/org/smeup/sys/os/outq/QOperatingSystemOutQueuePackage.java @@ -89,15 +89,6 @@ public interface QOperatingSystemOutQueuePackage extends EPackage { */ int OUT_QUEUE__FACETS = QOperatingSystemTypePackage.TYPED_OBJECT__FACETS; - /** - * The feature id for the 'Library' attribute. - * - * - * @generated - * @ordered - */ - int OUT_QUEUE__LIBRARY = QOperatingSystemTypePackage.TYPED_OBJECT__LIBRARY; - /** * The feature id for the 'Name' attribute. * diff --git a/org.smeup.sys.os.outq/src/org/smeup/sys/os/outq/QOutQueue.java b/org.smeup.sys.os.outq/src/org/smeup/sys/os/outq/QOutQueue.java index 4ed4b996..db5dec5d 100644 --- a/org.smeup.sys.os.outq/src/org/smeup/sys/os/outq/QOutQueue.java +++ b/org.smeup.sys.os.outq/src/org/smeup/sys/os/outq/QOutQueue.java @@ -17,10 +17,10 @@ * *

* The following features are supported: - *

*
    *
  • {@link org.smeup.sys.os.outq.QOutQueue#getSequence Sequence}
    • *
+ *

* * @see org.smeup.sys.os.outq.QOperatingSystemOutQueuePackage#getOutQueue() * @model diff --git a/org.smeup.sys.os.outq/src/org/smeup/sys/os/outq/SequenceType.java b/org.smeup.sys.os.outq/src/org/smeup/sys/os/outq/SequenceType.java index 2d867ca8..c3b47322 100644 --- a/org.smeup.sys.os.outq/src/org/smeup/sys/os/outq/SequenceType.java +++ b/org.smeup.sys.os.outq/src/org/smeup/sys/os/outq/SequenceType.java @@ -97,8 +97,6 @@ public enum SequenceType implements Enumerator { * Returns the 'Sequence Type' literal with the specified literal value. * * - * @param literal the literal. - * @return the matching enumerator or null. * @generated */ public static SequenceType get(String literal) { @@ -115,8 +113,6 @@ public static SequenceType get(String literal) { * Returns the 'Sequence Type' literal with the specified name. * * - * @param name the name. - * @return the matching enumerator or null. * @generated */ public static SequenceType getByName(String name) { @@ -133,8 +129,6 @@ public static SequenceType getByName(String name) { * Returns the 'Sequence Type' literal with the specified integer value. * * - * @param value the integer value. - * @return the matching enumerator or null. * @generated */ public static SequenceType get(int value) { diff --git a/org.smeup.sys.os.outq/src/org/smeup/sys/os/outq/impl/OutQueueImpl.java b/org.smeup.sys.os.outq/src/org/smeup/sys/os/outq/impl/OutQueueImpl.java index 1f5b038d..1a79c701 100644 --- a/org.smeup.sys.os.outq/src/org/smeup/sys/os/outq/impl/OutQueueImpl.java +++ b/org.smeup.sys.os.outq/src/org/smeup/sys/os/outq/impl/OutQueueImpl.java @@ -21,10 +21,10 @@ * *

* The following features are implemented: - *

*
    *
  • {@link org.smeup.sys.os.outq.impl.OutQueueImpl#getSequence Sequence}
    • *
+ *

* * @generated */ diff --git a/org.smeup.sys.os.pgm/src/org/smeup/sys/os/pgm/QOperatingSystemProgramPackage.java b/org.smeup.sys.os.pgm/src/org/smeup/sys/os/pgm/QOperatingSystemProgramPackage.java index 38640cb9..18178cc3 100644 --- a/org.smeup.sys.os.pgm/src/org/smeup/sys/os/pgm/QOperatingSystemProgramPackage.java +++ b/org.smeup.sys.os.pgm/src/org/smeup/sys/os/pgm/QOperatingSystemProgramPackage.java @@ -160,15 +160,6 @@ public interface QOperatingSystemProgramPackage extends EPackage { */ int PROGRAM__FACETS = QOperatingSystemTypePackage.TYPED_OBJECT__FACETS; - /** - * The feature id for the 'Library' attribute. - * - * @generated - * @ordered - */ - int PROGRAM__LIBRARY = QOperatingSystemTypePackage.TYPED_OBJECT__LIBRARY; - /** * The feature id for the 'Name' attribute. diff --git a/org.smeup.sys.os.scde.cron/src/org/smeup/sys/os/scde/cron/CronResourceWriterImpl.java b/org.smeup.sys.os.scde.cron/src/org/smeup/sys/os/scde/cron/CronResourceWriterImpl.java index fa8e20b9..c876a0b0 100644 --- a/org.smeup.sys.os.scde.cron/src/org/smeup/sys/os/scde/cron/CronResourceWriterImpl.java +++ b/org.smeup.sys.os.scde.cron/src/org/smeup/sys/os/scde/cron/CronResourceWriterImpl.java @@ -17,6 +17,7 @@ import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.util.EcoreUtil; import org.smeup.sys.il.core.ctx.QContextProvider; +import org.smeup.sys.il.memo.QResource; import org.smeup.sys.il.memo.QResourceHelper; import org.smeup.sys.il.memo.QResourceWriter; import org.smeup.sys.os.scde.QScheduleEntry; @@ -111,4 +112,10 @@ public QScheduleEntry copy(QScheduleEntry object, String name) { return (QScheduleEntry) eObject; } + + @Override + public QResource getResource() { + // TODO Auto-generated method stub + return null; + } } diff --git a/org.smeup.sys.os.type/model/os-type.ecore b/org.smeup.sys.os.type/model/os-type.ecore index a6687718..1d4184c2 100644 --- a/org.smeup.sys.os.type/model/os-type.ecore +++ b/org.smeup.sys.os.type/model/os-type.ecore @@ -47,7 +47,16 @@ - + + +
+ + + + +
+ +
@@ -60,12 +69,6 @@
- - -
- -
diff --git a/org.smeup.sys.os.type/src/org/smeup/sys/os/type/QOperatingSystemTypePackage.java b/org.smeup.sys.os.type/src/org/smeup/sys/os/type/QOperatingSystemTypePackage.java index d48a6271..af025e9f 100644 --- a/org.smeup.sys.os.type/src/org/smeup/sys/os/type/QOperatingSystemTypePackage.java +++ b/org.smeup.sys.os.type/src/org/smeup/sys/os/type/QOperatingSystemTypePackage.java @@ -119,15 +119,6 @@ public interface QOperatingSystemTypePackage extends EPackage { */ int TYPED_OBJECT__FACETS = QIntegratedLanguageCorePackage.OBJECT_NAMEABLE_FEATURE_COUNT + 1; - /** - * The feature id for the 'Library' attribute. - * - * - * @generated - * @ordered - */ - int TYPED_OBJECT__LIBRARY = QIntegratedLanguageCorePackage.OBJECT_NAMEABLE_FEATURE_COUNT + 2; - /** * The feature id for the 'Name' attribute. * @@ -135,7 +126,7 @@ public interface QOperatingSystemTypePackage extends EPackage { * @generated * @ordered */ - int TYPED_OBJECT__NAME = QIntegratedLanguageCorePackage.OBJECT_NAMEABLE_FEATURE_COUNT + 3; + int TYPED_OBJECT__NAME = QIntegratedLanguageCorePackage.OBJECT_NAMEABLE_FEATURE_COUNT + 2; /** * The feature id for the 'Text' attribute. @@ -144,7 +135,7 @@ public interface QOperatingSystemTypePackage extends EPackage { * @generated * @ordered */ - int TYPED_OBJECT__TEXT = QIntegratedLanguageCorePackage.OBJECT_NAMEABLE_FEATURE_COUNT + 4; + int TYPED_OBJECT__TEXT = QIntegratedLanguageCorePackage.OBJECT_NAMEABLE_FEATURE_COUNT + 3; /** * The feature id for the 'Creation Info' containment reference. @@ -153,7 +144,7 @@ public interface QOperatingSystemTypePackage extends EPackage { * @generated * @ordered */ - int TYPED_OBJECT__CREATION_INFO = QIntegratedLanguageCorePackage.OBJECT_NAMEABLE_FEATURE_COUNT + 5; + int TYPED_OBJECT__CREATION_INFO = QIntegratedLanguageCorePackage.OBJECT_NAMEABLE_FEATURE_COUNT + 4; /** * The number of structural features of the 'Typed Object' class. @@ -162,7 +153,7 @@ public interface QOperatingSystemTypePackage extends EPackage { * @generated * @ordered */ - int TYPED_OBJECT_FEATURE_COUNT = QIntegratedLanguageCorePackage.OBJECT_NAMEABLE_FEATURE_COUNT + 6; + int TYPED_OBJECT_FEATURE_COUNT = QIntegratedLanguageCorePackage.OBJECT_NAMEABLE_FEATURE_COUNT + 5; /** * The feature id for the 'Application' attribute. @@ -182,15 +173,6 @@ public interface QOperatingSystemTypePackage extends EPackage { */ int TYPE__FACETS = TYPED_OBJECT__FACETS; - /** - * The feature id for the 'Library' attribute. - * - * - * @generated - * @ordered - */ - int TYPE__LIBRARY = TYPED_OBJECT__LIBRARY; - /** * The feature id for the 'Name' attribute. * @@ -421,17 +403,6 @@ public interface QOperatingSystemTypePackage extends EPackage { */ EReference getTypedObject_Facets(); - /** - * Returns the meta object for the attribute '{@link org.smeup.sys.os.type.QTypedObject#getLibrary Library}'. - * - * - * @return the meta object for the attribute 'Library'. - * @see org.smeup.sys.os.type.QTypedObject#getLibrary() - * @see #getTypedObject() - * @generated - */ - EAttribute getTypedObject_Library(); - /** * Returns the meta object for the attribute '{@link org.smeup.sys.os.type.QTypedObject#getName Name}'. * @@ -601,14 +572,6 @@ interface Literals { */ EReference TYPED_OBJECT__FACETS = eINSTANCE.getTypedObject_Facets(); - /** - * The meta object literal for the 'Library' attribute feature. - * - * - * @generated - */ - EAttribute TYPED_OBJECT__LIBRARY = eINSTANCE.getTypedObject_Library(); - /** * The meta object literal for the 'Name' attribute feature. * diff --git a/org.smeup.sys.os.type/src/org/smeup/sys/os/type/QType.java b/org.smeup.sys.os.type/src/org/smeup/sys/os/type/QType.java index 908e4ec1..a6b4275d 100644 --- a/org.smeup.sys.os.type/src/org/smeup/sys/os/type/QType.java +++ b/org.smeup.sys.os.type/src/org/smeup/sys/os/type/QType.java @@ -16,11 +16,11 @@ * *

* The following features are supported: - *

*
    *
  • {@link org.smeup.sys.os.type.QType#getTypedClassName Typed Class Name}
    • *
  • {@link org.smeup.sys.os.type.QType#isPersistent Persistent}
    • *
+ *

* * @see org.smeup.sys.os.type.QOperatingSystemTypePackage#getType() * @model diff --git a/org.smeup.sys.os.type/src/org/smeup/sys/os/type/QTypedObject.java b/org.smeup.sys.os.type/src/org/smeup/sys/os/type/QTypedObject.java index 304feed5..30887119 100644 --- a/org.smeup.sys.os.type/src/org/smeup/sys/os/type/QTypedObject.java +++ b/org.smeup.sys.os.type/src/org/smeup/sys/os/type/QTypedObject.java @@ -18,15 +18,14 @@ * *

* The following features are supported: - *

*
    *
  • {@link org.smeup.sys.os.type.QTypedObject#getApplication Application}
    • *
  • {@link org.smeup.sys.os.type.QTypedObject#getFacets Facets}
    • - *
  • {@link org.smeup.sys.os.type.QTypedObject#getLibrary Library}
    • *
  • {@link org.smeup.sys.os.type.QTypedObject#getName Name}
    • *
  • {@link org.smeup.sys.os.type.QTypedObject#getText Text}
    • *
  • {@link org.smeup.sys.os.type.QTypedObject#getCreationInfo Creation Info}
    • *
+ *

* * @see org.smeup.sys.os.type.QOperatingSystemTypePackage#getTypedObject() * @model abstract="true" @@ -88,19 +87,10 @@ public interface QTypedObject extends QObjectNameable { */ String getLibrary(); - /** - * Sets the value of the '{@link org.smeup.sys.os.type.QTypedObject#getLibrary Library}' attribute. - * - * - * @param value the new value of the 'Library' attribute. - * @see #getLibrary() - * @generated - */ - void setLibrary(String value); - /** * * @model kind="operation" + * annotation="il-data length='5'" * @generated */ String getAttribute(); diff --git a/org.smeup.sys.os.type/src/org/smeup/sys/os/type/QTypedRef.java b/org.smeup.sys.os.type/src/org/smeup/sys/os/type/QTypedRef.java index 8ae06aa8..d303d58c 100644 --- a/org.smeup.sys.os.type/src/org/smeup/sys/os/type/QTypedRef.java +++ b/org.smeup.sys.os.type/src/org/smeup/sys/os/type/QTypedRef.java @@ -15,11 +15,11 @@ * *

* The following features are supported: - *

*
    *
  • {@link org.smeup.sys.os.type.QTypedRef#getLibrary Library}
    • *
  • {@link org.smeup.sys.os.type.QTypedRef#getName Name}
    • *
+ *

* * @see org.smeup.sys.os.type.QOperatingSystemTypePackage#getTypedRef() * @model diff --git a/org.smeup.sys.os.type/src/org/smeup/sys/os/type/impl/OperatingSystemTypePackageImpl.java b/org.smeup.sys.os.type/src/org/smeup/sys/os/type/impl/OperatingSystemTypePackageImpl.java index 2cd3bdd8..1c3398ef 100644 --- a/org.smeup.sys.os.type/src/org/smeup/sys/os/type/impl/OperatingSystemTypePackageImpl.java +++ b/org.smeup.sys.os.type/src/org/smeup/sys/os/type/impl/OperatingSystemTypePackageImpl.java @@ -195,22 +195,13 @@ public EReference getTypedObject_Facets() { return (EReference)typedObjectEClass.getEStructuralFeatures().get(1); } - /** - * - * - * @generated - */ - public EAttribute getTypedObject_Library() { - return (EAttribute)typedObjectEClass.getEStructuralFeatures().get(2); - } - /** * * @generated */ @Override public EReference getTypedObject_CreationInfo() { - return (EReference)typedObjectEClass.getEStructuralFeatures().get(5); + return (EReference)typedObjectEClass.getEStructuralFeatures().get(4); } /** @@ -255,7 +246,7 @@ public EClass getTypeContainer() { */ @Override public EAttribute getTypedObject_Name() { - return (EAttribute)typedObjectEClass.getEStructuralFeatures().get(3); + return (EAttribute)typedObjectEClass.getEStructuralFeatures().get(2); } /** @@ -264,7 +255,7 @@ public EAttribute getTypedObject_Name() { */ @Override public EAttribute getTypedObject_Text() { - return (EAttribute)typedObjectEClass.getEStructuralFeatures().get(4); + return (EAttribute)typedObjectEClass.getEStructuralFeatures().get(3); } /** @@ -314,7 +305,6 @@ public void createPackageContents() { typedObjectEClass = createEClass(TYPED_OBJECT); createEAttribute(typedObjectEClass, TYPED_OBJECT__APPLICATION); createEReference(typedObjectEClass, TYPED_OBJECT__FACETS); - createEAttribute(typedObjectEClass, TYPED_OBJECT__LIBRARY); createEAttribute(typedObjectEClass, TYPED_OBJECT__NAME); createEAttribute(typedObjectEClass, TYPED_OBJECT__TEXT); createEReference(typedObjectEClass, TYPED_OBJECT__CREATION_INFO); @@ -422,13 +412,14 @@ public void initializePackageContents() { initEClass(typedObjectEClass, QTypedObject.class, "TypedObject", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEAttribute(getTypedObject_Application(), ecorePackage.getEString(), "application", null, 0, 1, QTypedObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEReference(getTypedObject_Facets(), theIntegratedLanguageCoreMetaPackage.getFacet(), null, "facets", null, 0, -1, QTypedObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getTypedObject_Library(), ecorePackage.getEString(), "library", "", 0, 1, QTypedObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEAttribute(getTypedObject_Name(), ecorePackage.getEString(), "name", null, 1, 1, QTypedObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEAttribute(getTypedObject_Text(), ecorePackage.getEString(), "text", null, 0, 1, QTypedObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEReference(getTypedObject_CreationInfo(), theOperatingSystemCorePackage.getCreationInfo(), null, "creationInfo", null, 0, 1, QTypedObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); addEOperation(typedObjectEClass, ecorePackage.getEString(), "getAttribute", 0, 1, IS_UNIQUE, IS_ORDERED); + addEOperation(typedObjectEClass, ecorePackage.getEString(), "getLibrary", 0, 1, IS_UNIQUE, IS_ORDERED); + initEClass(typedRefEClass, QTypedRef.class, "TypedRef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEAttribute(getTypedRef_Library(), ecorePackage.getEString(), "library", null, 1, 1, QTypedRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEAttribute(getTypedRef_Name(), ecorePackage.getEString(), "name", null, 0, 1, QTypedRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); @@ -454,7 +445,16 @@ public void initializePackageContents() { protected void createIldataAnnotations() { String source = "il-data"; addAnnotation - (getTypedObject_Application(), + (typedObjectEClass.getEOperations().get(0), + source, + new String[] { + "length", "5" + }, + new URI[] { + URI.createURI(QIntegratedLanguageDataPackage.eNS_URI).appendFragment("//def/CharacterDef") + }); + addAnnotation + (typedObjectEClass.getEOperations().get(1), source, new String[] { "length", "10" @@ -463,7 +463,7 @@ protected void createIldataAnnotations() { URI.createURI(QIntegratedLanguageDataPackage.eNS_URI).appendFragment("//def/CharacterDef") }); addAnnotation - (getTypedObject_Library(), + (getTypedObject_Application(), source, new String[] { "length", "10" diff --git a/org.smeup.sys.os.type/src/org/smeup/sys/os/type/impl/TypeContainerImpl.java b/org.smeup.sys.os.type/src/org/smeup/sys/os/type/impl/TypeContainerImpl.java index 562f047b..9aaccd74 100644 --- a/org.smeup.sys.os.type/src/org/smeup/sys/os/type/impl/TypeContainerImpl.java +++ b/org.smeup.sys.os.type/src/org/smeup/sys/os/type/impl/TypeContainerImpl.java @@ -17,6 +17,8 @@ * * An implementation of the model object 'Type Container'. * + *

+ *

* * @generated */ diff --git a/org.smeup.sys.os.type/src/org/smeup/sys/os/type/impl/TypeImpl.java b/org.smeup.sys.os.type/src/org/smeup/sys/os/type/impl/TypeImpl.java index e3968a92..cb0785e2 100644 --- a/org.smeup.sys.os.type/src/org/smeup/sys/os/type/impl/TypeImpl.java +++ b/org.smeup.sys.os.type/src/org/smeup/sys/os/type/impl/TypeImpl.java @@ -20,11 +20,11 @@ * *

* The following features are implemented: - *

*
    *
  • {@link org.smeup.sys.os.type.impl.TypeImpl#getTypedClassName Typed Class Name}
    • *
  • {@link org.smeup.sys.os.type.impl.TypeImpl#isPersistent Persistent}
    • *
+ *

* * @generated */ diff --git a/org.smeup.sys.os.type/src/org/smeup/sys/os/type/impl/TypedContainerImpl.java b/org.smeup.sys.os.type/src/org/smeup/sys/os/type/impl/TypedContainerImpl.java index 6d1801c2..f14caabd 100644 --- a/org.smeup.sys.os.type/src/org/smeup/sys/os/type/impl/TypedContainerImpl.java +++ b/org.smeup.sys.os.type/src/org/smeup/sys/os/type/impl/TypedContainerImpl.java @@ -19,6 +19,8 @@ /** * An implementation of the model object ' * Typed Container'. + *

+ *

* * @generated */ diff --git a/org.smeup.sys.os.type/src/org/smeup/sys/os/type/impl/TypedObjectImpl.java b/org.smeup.sys.os.type/src/org/smeup/sys/os/type/impl/TypedObjectImpl.java index 0c90047b..10e7c078 100644 --- a/org.smeup.sys.os.type/src/org/smeup/sys/os/type/impl/TypedObjectImpl.java +++ b/org.smeup.sys.os.type/src/org/smeup/sys/os/type/impl/TypedObjectImpl.java @@ -9,14 +9,19 @@ import java.util.Collection; import java.util.List; + import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; import org.eclipse.emf.common.util.EList; +import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.InternalEObject; import org.eclipse.emf.ecore.impl.ENotificationImpl; +import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.emf.ecore.util.EObjectContainmentEList; import org.eclipse.emf.ecore.util.InternalEList; +import org.smeup.sys.il.core.IntegratedLanguageCoreRuntimeException; +import org.smeup.sys.il.core.QNameable; import org.smeup.sys.il.core.impl.ObjectNameableImpl; import org.smeup.sys.il.core.meta.QFacet; import org.smeup.sys.os.core.QCreationInfo; @@ -28,15 +33,14 @@ * QTyped Object'. *

* The following features are implemented: - *

*
    *
  • {@link org.smeup.sys.os.type.impl.TypedObjectImpl#getApplication Application}
    • *
  • {@link org.smeup.sys.os.type.impl.TypedObjectImpl#getFacets Facets}
    • - *
  • {@link org.smeup.sys.os.type.impl.TypedObjectImpl#getLibrary Library}
    • *
  • {@link org.smeup.sys.os.type.impl.TypedObjectImpl#getName Name}
    • *
  • {@link org.smeup.sys.os.type.impl.TypedObjectImpl#getText Text}
    • *
  • {@link org.smeup.sys.os.type.impl.TypedObjectImpl#getCreationInfo Creation Info}
    • *
+ *

* * @generated */ @@ -44,8 +48,7 @@ public abstract class TypedObjectImpl extends ObjectNameableImpl implements QTyp /** * The default value of the '{@link #getApplication() Application}' attribute. - * - * + * * @see #getApplication() * @generated * @ordered @@ -54,8 +57,7 @@ public abstract class TypedObjectImpl extends ObjectNameableImpl implements QTyp /** * The cached value of the '{@link #getApplication() Application}' attribute. - * - * + * * @see #getApplication() * @generated * @ordered @@ -64,34 +66,13 @@ public abstract class TypedObjectImpl extends ObjectNameableImpl implements QTyp /** * The cached value of the '{@link #getFacets() Facets}' containment reference list. - * - * + * * @see #getFacets() * @generated * @ordered */ protected EList facets; - /** - * The default value of the '{@link #getLibrary() Library}' attribute. - * - * - * @see #getLibrary() - * @generated - * @ordered - */ - protected static final String LIBRARY_EDEFAULT = ""; - - /** - * The cached value of the '{@link #getLibrary() Library}' attribute. - * - * - * @see #getLibrary() - * @generated - * @ordered - */ - protected String library = LIBRARY_EDEFAULT; - /** * */ @@ -161,8 +142,7 @@ protected EClass eStaticClass() { } /** - * - * + * * @generated */ @Override @@ -171,8 +151,7 @@ public String getApplication() { } /** - * - * + * * @generated */ @Override @@ -184,8 +163,7 @@ public void setApplication(String newApplication) { } /** - * - * + * * @generated */ public List getFacets() { @@ -307,23 +285,26 @@ else if (eNotificationRequired()) /** * - * @generated + * + * @generated NOT */ @Override public String getLibrary() { - return library; - } - - /** - * - * - * @generated - */ - public void setLibrary(String newLibrary) { - String oldLibrary = library; - library = newLibrary; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, QOperatingSystemTypePackage.TYPED_OBJECT__LIBRARY, oldLibrary, library)); + Resource resource = eResource(); + if(resource == null) + if(getClass().getSimpleName().equalsIgnoreCase("UserProfileImpl")) + return "QSYS"; + else + throw new IntegratedLanguageCoreRuntimeException("Invalid library for object: " + this); + + if(resource instanceof QNameable) + return ((QNameable)resource).getName(); + + URI uri = resource.getURI(); + if(uri.segmentCount() == 0) + throw new IntegratedLanguageCoreRuntimeException("Invalid library for object: " + this); + + return uri.segment(0); } /** @@ -337,8 +318,6 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) { return getApplication(); case QOperatingSystemTypePackage.TYPED_OBJECT__FACETS: return getFacets(); - case QOperatingSystemTypePackage.TYPED_OBJECT__LIBRARY: - return getLibrary(); case QOperatingSystemTypePackage.TYPED_OBJECT__NAME: return getName(); case QOperatingSystemTypePackage.TYPED_OBJECT__TEXT: @@ -364,9 +343,6 @@ public void eSet(int featureID, Object newValue) { getFacets().clear(); getFacets().addAll((Collection)newValue); return; - case QOperatingSystemTypePackage.TYPED_OBJECT__LIBRARY: - setLibrary((String)newValue); - return; case QOperatingSystemTypePackage.TYPED_OBJECT__NAME: setName((String)newValue); return; @@ -393,9 +369,6 @@ public void eUnset(int featureID) { case QOperatingSystemTypePackage.TYPED_OBJECT__FACETS: getFacets().clear(); return; - case QOperatingSystemTypePackage.TYPED_OBJECT__LIBRARY: - setLibrary(LIBRARY_EDEFAULT); - return; case QOperatingSystemTypePackage.TYPED_OBJECT__NAME: setName(NAME_EDEFAULT); return; @@ -420,8 +393,6 @@ public boolean eIsSet(int featureID) { return APPLICATION_EDEFAULT == null ? application != null : !APPLICATION_EDEFAULT.equals(application); case QOperatingSystemTypePackage.TYPED_OBJECT__FACETS: return facets != null && !facets.isEmpty(); - case QOperatingSystemTypePackage.TYPED_OBJECT__LIBRARY: - return LIBRARY_EDEFAULT == null ? library != null : !LIBRARY_EDEFAULT.equals(library); case QOperatingSystemTypePackage.TYPED_OBJECT__NAME: return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name); case QOperatingSystemTypePackage.TYPED_OBJECT__TEXT: @@ -443,8 +414,6 @@ public String toString() { StringBuffer result = new StringBuffer(super.toString()); result.append(" (application: "); result.append(application); - result.append(", library: "); - result.append(library); result.append(", name: "); result.append(name); result.append(", text: "); diff --git a/org.smeup.sys.os.type/src/org/smeup/sys/os/type/impl/TypedRefImpl.java b/org.smeup.sys.os.type/src/org/smeup/sys/os/type/impl/TypedRefImpl.java index 9542f1d4..12ac43e2 100644 --- a/org.smeup.sys.os.type/src/org/smeup/sys/os/type/impl/TypedRefImpl.java +++ b/org.smeup.sys.os.type/src/org/smeup/sys/os/type/impl/TypedRefImpl.java @@ -20,11 +20,11 @@ * QTyped Reference'. *

* The following features are implemented: - *

*
    *
  • {@link org.smeup.sys.os.type.impl.TypedRefImpl#getLibrary Library}
    • *
  • {@link org.smeup.sys.os.type.impl.TypedRefImpl#getName Name}
    • *
+ *

* * @generated */ diff --git a/org.smeup.sys.os.usrprf/src/org/smeup/sys/os/usrprf/QOperatingSystemUserProfilePackage.java b/org.smeup.sys.os.usrprf/src/org/smeup/sys/os/usrprf/QOperatingSystemUserProfilePackage.java index 7667a4a7..cf574da2 100644 --- a/org.smeup.sys.os.usrprf/src/org/smeup/sys/os/usrprf/QOperatingSystemUserProfilePackage.java +++ b/org.smeup.sys.os.usrprf/src/org/smeup/sys/os/usrprf/QOperatingSystemUserProfilePackage.java @@ -87,15 +87,6 @@ public interface QOperatingSystemUserProfilePackage extends EPackage { */ int USER_PROFILE__FACETS = QOperatingSystemTypePackage.TYPED_OBJECT__FACETS; - /** - * The feature id for the 'Library' attribute. - * - * @generated - * @ordered - */ - int USER_PROFILE__LIBRARY = QOperatingSystemTypePackage.TYPED_OBJECT__LIBRARY; - /** * The feature id for the 'Name' attribute. diff --git a/org.smeup.sys.os.usrprf/src/org/smeup/sys/os/usrprf/QUserProfile.java b/org.smeup.sys.os.usrprf/src/org/smeup/sys/os/usrprf/QUserProfile.java index 9ad4e354..75a41585 100644 --- a/org.smeup.sys.os.usrprf/src/org/smeup/sys/os/usrprf/QUserProfile.java +++ b/org.smeup.sys.os.usrprf/src/org/smeup/sys/os/usrprf/QUserProfile.java @@ -16,7 +16,6 @@ * *

* The following features are supported: - *

*
    *
  • {@link org.smeup.sys.os.usrprf.QUserProfile#getJobDescription Job Description}
    • *
  • {@link org.smeup.sys.os.usrprf.QUserProfile#getInitialProgram Initial Program}
    • @@ -25,6 +24,7 @@ *
  • {@link org.smeup.sys.os.usrprf.QUserProfile#getUserClass User Class}
    • *
  • {@link org.smeup.sys.os.usrprf.QUserProfile#isEnabled Enabled}
    • *
+ *

* * @see org.smeup.sys.os.usrprf.QOperatingSystemUserProfilePackage#getUserProfile() * @model diff --git a/org.smeup.sys.os.usrprf/src/org/smeup/sys/os/usrprf/UserClass.java b/org.smeup.sys.os.usrprf/src/org/smeup/sys/os/usrprf/UserClass.java index dc06d746..2f333290 100644 --- a/org.smeup.sys.os.usrprf/src/org/smeup/sys/os/usrprf/UserClass.java +++ b/org.smeup.sys.os.usrprf/src/org/smeup/sys/os/usrprf/UserClass.java @@ -171,8 +171,6 @@ public enum UserClass implements Enumerator { * Returns the 'User Class' literal with the specified literal value. * * - * @param literal the literal. - * @return the matching enumerator or null. * @generated */ public static UserClass get(String literal) { @@ -189,8 +187,6 @@ public static UserClass get(String literal) { * Returns the 'User Class' literal with the specified name. * * - * @param name the name. - * @return the matching enumerator or null. * @generated */ public static UserClass getByName(String name) { @@ -207,8 +203,6 @@ public static UserClass getByName(String name) { * Returns the 'User Class' literal with the specified integer value. * * - * @param value the integer value. - * @return the matching enumerator or null. * @generated */ public static UserClass get(int value) { diff --git a/org.smeup.sys.os.usrprf/src/org/smeup/sys/os/usrprf/impl/UserProfileImpl.java b/org.smeup.sys.os.usrprf/src/org/smeup/sys/os/usrprf/impl/UserProfileImpl.java index 99726603..6e19487a 100644 --- a/org.smeup.sys.os.usrprf/src/org/smeup/sys/os/usrprf/impl/UserProfileImpl.java +++ b/org.smeup.sys.os.usrprf/src/org/smeup/sys/os/usrprf/impl/UserProfileImpl.java @@ -20,7 +20,6 @@ * QUser Profile'. *

* The following features are implemented: - *

*
    *
  • {@link org.smeup.sys.os.usrprf.impl.UserProfileImpl#getJobDescription Job Description}
    • *
  • {@link org.smeup.sys.os.usrprf.impl.UserProfileImpl#getInitialProgram Initial Program}
    • @@ -29,6 +28,7 @@ *
  • {@link org.smeup.sys.os.usrprf.impl.UserProfileImpl#getUserClass User Class}
    • *
  • {@link org.smeup.sys.os.usrprf.impl.UserProfileImpl#isEnabled Enabled}
    • *
+ *

* * @generated */ diff --git a/org.smeup.sys.os.usrspc/src/org/smeup/sys/os/usrspc/QOperatingSystemUserSpacePackage.java b/org.smeup.sys.os.usrspc/src/org/smeup/sys/os/usrspc/QOperatingSystemUserSpacePackage.java index 76f12b18..6f3a09e0 100644 --- a/org.smeup.sys.os.usrspc/src/org/smeup/sys/os/usrspc/QOperatingSystemUserSpacePackage.java +++ b/org.smeup.sys.os.usrspc/src/org/smeup/sys/os/usrspc/QOperatingSystemUserSpacePackage.java @@ -83,15 +83,6 @@ public interface QOperatingSystemUserSpacePackage extends EPackage { */ int USER_SPACE__FACETS = QOperatingSystemTypePackage.TYPED_OBJECT__FACETS; - /** - * The feature id for the 'Library' attribute. - * - * @generated - * @ordered - */ - int USER_SPACE__LIBRARY = QOperatingSystemTypePackage.TYPED_OBJECT__LIBRARY; - /** * The feature id for the 'Name' attribute. diff --git a/org.smeup.sys.os.usrspc/src/org/smeup/sys/os/usrspc/QUserSpace.java b/org.smeup.sys.os.usrspc/src/org/smeup/sys/os/usrspc/QUserSpace.java index e85b6c9e..b557d663 100644 --- a/org.smeup.sys.os.usrspc/src/org/smeup/sys/os/usrspc/QUserSpace.java +++ b/org.smeup.sys.os.usrspc/src/org/smeup/sys/os/usrspc/QUserSpace.java @@ -15,11 +15,11 @@ * *

* The following features are supported: - *

*
    *
  • {@link org.smeup.sys.os.usrspc.QUserSpace#getHeader Header}
    • *
  • {@link org.smeup.sys.os.usrspc.QUserSpace#getContent Content}
    • *
+ *

* * @see org.smeup.sys.os.usrspc.QOperatingSystemUserSpacePackage#getUserSpace() * @model diff --git a/org.smeup.sys.os.usrspc/src/org/smeup/sys/os/usrspc/impl/UserSpaceImpl.java b/org.smeup.sys.os.usrspc/src/org/smeup/sys/os/usrspc/impl/UserSpaceImpl.java index 0c136325..2f312c48 100644 --- a/org.smeup.sys.os.usrspc/src/org/smeup/sys/os/usrspc/impl/UserSpaceImpl.java +++ b/org.smeup.sys.os.usrspc/src/org/smeup/sys/os/usrspc/impl/UserSpaceImpl.java @@ -24,11 +24,11 @@ * *

* The following features are implemented: - *

*
    *
  • {@link org.smeup.sys.os.usrspc.impl.UserSpaceImpl#getHeader Header}
    • *
  • {@link org.smeup.sys.os.usrspc.impl.UserSpaceImpl#getContent Content}
    • *
+ *

* * @generated */