Skip to content
Snippets Groups Projects
Commit e57a6f0f authored by Simon Spinner's avatar Simon Spinner
Browse files

Move commands to subpackages

parent a66c0ac7
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 38 additions and 17 deletions
tools.descartes.prisma.core/src/tools/descartes/prisma/core/commands/ModelCommand.java
+ 1
− 1
View file @ e57a6f0f
......@@ -32,7 +32,7 @@ public abstract class ModelCommand<P extends EObject, E extends EObject> {
public abstract boolean matches(E object);
protected E find(P parent) {
public E find(P parent) {
return find((Collection<?>)parent.eGet(container));
}
......
tools.descartes.prisma.core/src/tools/descartes/prisma/core/commands/AssemblyConnectorCommand.java → tools.descartes.prisma.core/src/tools/descartes/prisma/core/commands/repository/AssemblyConnectorCommand.java
+ 2
− 1
View file @ e57a6f0f
package tools.descartes.prisma.core.commands;
package tools.descartes.prisma.core.commands.repository;
import edu.kit.ipd.descartes.mm.applicationlevel.repository.AssemblyConnector;
import edu.kit.ipd.descartes.mm.applicationlevel.repository.AssemblyContext;
......@@ -7,6 +7,7 @@ import edu.kit.ipd.descartes.mm.applicationlevel.repository.InterfaceProvidingRo
import edu.kit.ipd.descartes.mm.applicationlevel.repository.InterfaceRequiringRole;
import edu.kit.ipd.descartes.mm.applicationlevel.repository.RepositoryFactory;
import edu.kit.ipd.descartes.mm.applicationlevel.repository.RepositoryPackage;
import tools.descartes.prisma.core.commands.ModelCommand;
public class AssemblyConnectorCommand extends ModelCommand<ComposedStructure, AssemblyConnector> {
......
tools.descartes.prisma.core/src/tools/descartes/prisma/core/commands/AssemblyContextCommand.java → tools.descartes.prisma.core/src/tools/descartes/prisma/core/commands/repository/AssemblyContextCommand.java
+ 2
− 1
View file @ e57a6f0f
package tools.descartes.prisma.core.commands;
package tools.descartes.prisma.core.commands.repository;
import edu.kit.ipd.descartes.mm.applicationlevel.repository.AssemblyContext;
import edu.kit.ipd.descartes.mm.applicationlevel.repository.ComposedStructure;
import edu.kit.ipd.descartes.mm.applicationlevel.repository.RepositoryComponent;
import edu.kit.ipd.descartes.mm.applicationlevel.repository.RepositoryFactory;
import edu.kit.ipd.descartes.mm.applicationlevel.repository.RepositoryPackage;
import tools.descartes.prisma.core.commands.ModelCommand;
public class AssemblyContextCommand extends ModelCommand<ComposedStructure, AssemblyContext> {
......
tools.descartes.prisma.core/src/tools/descartes/prisma/core/commands/BasicComponentCommand.java → tools.descartes.prisma.core/src/tools/descartes/prisma/core/commands/repository/BasicComponentCommand.java
+ 3
− 1
View file @ e57a6f0f
package tools.descartes.prisma.core.commands;
package tools.descartes.prisma.core.commands.repository;
import java.util.LinkedList;
import java.util.List;
import edu.kit.ipd.descartes.mm.applicationlevel.repository.BasicComponent;
import edu.kit.ipd.descartes.mm.applicationlevel.repository.RepositoryFactory;
import tools.descartes.prisma.core.commands.ModelCommand;
import tools.descartes.prisma.core.commands.servicebehavior.FineGrainedBehaviorCommand;
public class BasicComponentCommand extends RepositoryComponentCommand<BasicComponent> {
......
tools.descartes.prisma.core/src/tools/descartes/prisma/core/commands/InterfaceCommand.java → tools.descartes.prisma.core/src/tools/descartes/prisma/core/commands/repository/InterfaceCommand.java
+ 2
− 1
View file @ e57a6f0f
package tools.descartes.prisma.core.commands;
package tools.descartes.prisma.core.commands.repository;
import java.util.LinkedList;
import java.util.List;
......@@ -7,6 +7,7 @@ import edu.kit.ipd.descartes.mm.applicationlevel.repository.Interface;
import edu.kit.ipd.descartes.mm.applicationlevel.repository.Repository;
import edu.kit.ipd.descartes.mm.applicationlevel.repository.RepositoryFactory;
import edu.kit.ipd.descartes.mm.applicationlevel.repository.RepositoryPackage;
import tools.descartes.prisma.core.commands.ModelCommand;
public class InterfaceCommand extends ModelCommand<Repository, Interface> {
......
tools.descartes.prisma.core/src/tools/descartes/prisma/core/commands/InterfaceProvidingRoleCommand.java → tools.descartes.prisma.core/src/tools/descartes/prisma/core/commands/repository/InterfaceProvidingRoleCommand.java
+ 2
− 1
View file @ e57a6f0f
package tools.descartes.prisma.core.commands;
package tools.descartes.prisma.core.commands.repository;
import edu.kit.ipd.descartes.mm.applicationlevel.repository.Interface;
import edu.kit.ipd.descartes.mm.applicationlevel.repository.InterfaceProvidingRole;
......@@ -6,6 +6,7 @@ import edu.kit.ipd.descartes.mm.applicationlevel.repository.InterfaceRequiringRo
import edu.kit.ipd.descartes.mm.applicationlevel.repository.RepositoryComponent;
import edu.kit.ipd.descartes.mm.applicationlevel.repository.RepositoryFactory;
import edu.kit.ipd.descartes.mm.applicationlevel.repository.RepositoryPackage;
import tools.descartes.prisma.core.commands.ModelCommand;
public class InterfaceProvidingRoleCommand extends ModelCommand<RepositoryComponent, InterfaceProvidingRole> {
......
tools.descartes.prisma.core/src/tools/descartes/prisma/core/commands/InterfaceRequiringRoleCommand.java → tools.descartes.prisma.core/src/tools/descartes/prisma/core/commands/repository/InterfaceRequiringRoleCommand.java
+ 2
− 1
View file @ e57a6f0f
package tools.descartes.prisma.core.commands;
package tools.descartes.prisma.core.commands.repository;
import edu.kit.ipd.descartes.mm.applicationlevel.repository.Interface;
import edu.kit.ipd.descartes.mm.applicationlevel.repository.InterfaceRequiringRole;
import edu.kit.ipd.descartes.mm.applicationlevel.repository.RepositoryComponent;
import edu.kit.ipd.descartes.mm.applicationlevel.repository.RepositoryFactory;
import edu.kit.ipd.descartes.mm.applicationlevel.repository.RepositoryPackage;
import tools.descartes.prisma.core.commands.ModelCommand;
public class InterfaceRequiringRoleCommand extends ModelCommand<RepositoryComponent, InterfaceRequiringRole> {
......
tools.descartes.prisma.core/src/tools/descartes/prisma/core/commands/RepositoryCommand.java → tools.descartes.prisma.core/src/tools/descartes/prisma/core/commands/repository/RepositoryCommand.java
+ 2
− 1
View file @ e57a6f0f
package tools.descartes.prisma.core.commands;
package tools.descartes.prisma.core.commands.repository;
import java.util.LinkedList;
import java.util.List;
import edu.kit.ipd.descartes.mm.applicationlevel.repository.Repository;
import edu.kit.ipd.descartes.mm.applicationlevel.repository.RepositoryFactory;
import tools.descartes.prisma.core.commands.ModelCommand;
public class RepositoryCommand extends ModelCommand<Repository, Repository> {
......
tools.descartes.prisma.core/src/tools/descartes/prisma/core/commands/RepositoryComponentCommand.java → tools.descartes.prisma.core/src/tools/descartes/prisma/core/commands/repository/RepositoryComponentCommand.java
+ 2
− 1
View file @ e57a6f0f
package tools.descartes.prisma.core.commands;
package tools.descartes.prisma.core.commands.repository;
import java.util.LinkedList;
import java.util.List;
......@@ -6,6 +6,7 @@ import java.util.List;
import edu.kit.ipd.descartes.mm.applicationlevel.repository.Repository;
import edu.kit.ipd.descartes.mm.applicationlevel.repository.RepositoryComponent;
import edu.kit.ipd.descartes.mm.applicationlevel.repository.RepositoryPackage;
import tools.descartes.prisma.core.commands.ModelCommand;
public abstract class RepositoryComponentCommand<E extends RepositoryComponent> extends ModelCommand<Repository, E> {
......
tools.descartes.prisma.core/src/tools/descartes/prisma/core/commands/SignatureCommand.java → tools.descartes.prisma.core/src/tools/descartes/prisma/core/commands/repository/SignatureCommand.java
+ 2
− 1
View file @ e57a6f0f
package tools.descartes.prisma.core.commands;
package tools.descartes.prisma.core.commands.repository;
import edu.kit.ipd.descartes.mm.applicationlevel.repository.Interface;
import edu.kit.ipd.descartes.mm.applicationlevel.repository.RepositoryFactory;
import edu.kit.ipd.descartes.mm.applicationlevel.repository.RepositoryPackage;
import edu.kit.ipd.descartes.mm.applicationlevel.repository.Signature;
import tools.descartes.prisma.core.commands.ModelCommand;
public class SignatureCommand extends ModelCommand<Interface, Signature> {
......
tools.descartes.prisma.core/src/tools/descartes/prisma/core/commands/AbstractActionCommand.java → tools.descartes.prisma.core/src/tools/descartes/prisma/core/commands/servicebehavior/AbstractActionCommand.java
+ 3
− 2
View file @ e57a6f0f
package tools.descartes.prisma.core.commands;
package tools.descartes.prisma.core.commands.servicebehavior;
import edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.AbstractAction;
import edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.ComponentInternalBehavior;
import edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.ServicebehaviorPackage;
import tools.descartes.prisma.core.commands.ModelCommand;
public abstract class AbstractActionCommand<E extends AbstractAction> extends ModelCommand<ComponentInternalBehavior, E> {
......@@ -22,7 +23,7 @@ public abstract class AbstractActionCommand<E extends AbstractAction> extends Mo
}
@Override
protected E find(ComponentInternalBehavior parent) {
public E find(ComponentInternalBehavior parent) {
Class<E> actionType = getElementType();
if (position < 0) {
// the position is unspecified. Search for any object of the required type
......
tools.descartes.prisma.core/src/tools/descartes/prisma/core/commands/ComponentInternalBehaviorCommand.java → tools.descartes.prisma.core/src/tools/descartes/prisma/core/commands/servicebehavior/ComponentInternalBehaviorCommand.java
+ 2
− 1
View file @ e57a6f0f
package tools.descartes.prisma.core.commands;
package tools.descartes.prisma.core.commands.servicebehavior;
import java.util.LinkedList;
import java.util.List;
......@@ -8,6 +8,7 @@ import org.eclipse.emf.ecore.EStructuralFeature;
import edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.ComponentInternalBehavior;
import edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.ServicebehaviorFactory;
import tools.descartes.prisma.core.commands.ModelCommand;
public class ComponentInternalBehaviorCommand<P extends EObject> extends ModelCommand<P, ComponentInternalBehavior> {
......
tools.descartes.prisma.core/src/tools/descartes/prisma/core/commands/ExternalCallActionCommand.java → tools.descartes.prisma.core/src/tools/descartes/prisma/core/commands/servicebehavior/ExternalCallActionCommand.java
+ 3
− 1
View file @ e57a6f0f
package tools.descartes.prisma.core.commands;
package tools.descartes.prisma.core.commands.servicebehavior;
import org.eclipse.emf.ecore.EObject;
......@@ -9,6 +9,8 @@ import edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.ComponentIntern
import edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.ExternalCall;
import edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.ExternalCallAction;
import edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.ServicebehaviorFactory;
import tools.descartes.prisma.core.commands.repository.InterfaceRequiringRoleCommand;
import tools.descartes.prisma.core.commands.repository.SignatureCommand;
public class ExternalCallActionCommand extends AbstractActionCommand<ExternalCallAction> {
......
tools.descartes.prisma.core/src/tools/descartes/prisma/core/commands/FineGrainedBehaviorCommand.java → tools.descartes.prisma.core/src/tools/descartes/prisma/core/commands/servicebehavior/FineGrainedBehaviorCommand.java
+ 4
− 1
View file @ e57a6f0f
package tools.descartes.prisma.core.commands;
package tools.descartes.prisma.core.commands.servicebehavior;
import java.util.Collections;
import java.util.List;
......@@ -10,6 +10,9 @@ import edu.kit.ipd.descartes.mm.applicationlevel.repository.Signature;
import edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.FineGrainedBehavior;
import edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.ServicebehaviorFactory;
import edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.ServicebehaviorPackage;
import tools.descartes.prisma.core.commands.ModelCommand;
import tools.descartes.prisma.core.commands.repository.InterfaceProvidingRoleCommand;
import tools.descartes.prisma.core.commands.repository.SignatureCommand;
public class FineGrainedBehaviorCommand extends ModelCommand<BasicComponent, FineGrainedBehavior> {
......
tools.descartes.prisma.core/src/tools/descartes/prisma/core/commands/LoopActionCommand.java → tools.descartes.prisma.core/src/tools/descartes/prisma/core/commands/servicebehavior/LoopActionCommand.java
+ 2
− 1
View file @ e57a6f0f
package tools.descartes.prisma.core.commands;
package tools.descartes.prisma.core.commands.servicebehavior;
import java.util.Collections;
import java.util.LinkedList;
......@@ -10,6 +10,7 @@ import edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.LoopAction;
import edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.LoopIterationCount;
import edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.ServicebehaviorFactory;
import edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.ServicebehaviorPackage;
import tools.descartes.prisma.core.commands.ModelCommand;
public class LoopActionCommand extends AbstractActionCommand<LoopAction> {
......
tools.descartes.prisma.core/src/tools/descartes/prisma/core/commands/SystemCommand.java → tools.descartes.prisma.core/src/tools/descartes/prisma/core/commands/system/SystemCommand.java
+ 4
− 1
View file @ e57a6f0f
package tools.descartes.prisma.core.commands;
package tools.descartes.prisma.core.commands.system;
import java.util.LinkedList;
import java.util.List;
import edu.kit.ipd.descartes.mm.applicationlevel.system.System;
import edu.kit.ipd.descartes.mm.applicationlevel.system.SystemFactory;
import tools.descartes.prisma.core.commands.ModelCommand;
import tools.descartes.prisma.core.commands.repository.AssemblyConnectorCommand;
import tools.descartes.prisma.core.commands.repository.AssemblyContextCommand;
public class SystemCommand extends ModelCommand<System, System> {
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment