Author: b00__1
Date: 2007-08-07 07:15:32-0700
New Revision: 13261
Modified:
branches/gsoc2007/b00__1/model-euml/src/org/argouml/model/euml/EUMLModelImplementation.java
Log:
Use the eUML types where is possible.
Modified: branches/gsoc2007/b00__1/model-euml/src/org/argouml/model/euml/EUMLModelImplementation.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/b00__1/model-euml/src/org/argouml/model/euml/EUMLModelImplementation.java?view=diff&rev=13261&p1=branches/gsoc2007/b00__1/model-euml/src/org/argouml/model/euml/EUMLModelImplementation.java&p2=branches/gsoc2007/b00__1/model-euml/src/org/argouml/model/euml/EUMLModelImplementation.java&r1=13260&r2=13261
==============================================================================
--- branches/gsoc2007/b00__1/model-euml/src/org/argouml/model/euml/EUMLModelImplementation.java (original)
+++ branches/gsoc2007/b00__1/model-euml/src/org/argouml/model/euml/EUMLModelImplementation.java 2007-08-07 07:15:32-0700
@@ -47,42 +47,9 @@
import java.util.Map;
import org.apache.log4j.Logger;
-import org.argouml.model.ActivityGraphsFactory;
-import org.argouml.model.ActivityGraphsHelper;
-import org.argouml.model.AggregationKind;
-import org.argouml.model.ChangeableKind;
-import org.argouml.model.CollaborationsFactory;
-import org.argouml.model.CollaborationsHelper;
-import org.argouml.model.CommonBehaviorFactory;
-import org.argouml.model.CommonBehaviorHelper;
-import org.argouml.model.ConcurrencyKind;
-import org.argouml.model.CopyHelper;
-import org.argouml.model.CoreFactory;
-import org.argouml.model.CoreHelper;
-import org.argouml.model.DataTypesFactory;
-import org.argouml.model.DataTypesHelper;
import org.argouml.model.DiagramInterchangeModel;
-import org.argouml.model.DirectionKind;
-import org.argouml.model.ExtensionMechanismsFactory;
-import org.argouml.model.ExtensionMechanismsHelper;
-import org.argouml.model.Facade;
-import org.argouml.model.MetaTypes;
import org.argouml.model.ModelImplementation;
-import org.argouml.model.ModelManagementFactory;
-import org.argouml.model.ModelManagementHelper;
-import org.argouml.model.OrderingKind;
-import org.argouml.model.PseudostateKind;
-import org.argouml.model.ScopeKind;
-import org.argouml.model.StateMachinesFactory;
-import org.argouml.model.StateMachinesHelper;
import org.argouml.model.UmlException;
-import org.argouml.model.UmlFactory;
-import org.argouml.model.UmlHelper;
-import org.argouml.model.UseCasesFactory;
-import org.argouml.model.UseCasesHelper;
-import org.argouml.model.VisibilityKind;
-import org.argouml.model.XmiReader;
-import org.argouml.model.XmiWriter;
import org.eclipse.emf.common.command.BasicCommandStack;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.util.URI;
@@ -124,71 +91,71 @@
private static final Logger LOG =
Logger.getLogger(EUMLModelImplementation.class);
- private ActivityGraphsFactory theActivityGraphsFactory;
+ private ActivityGraphsFactoryEUMLlImpl theActivityGraphsFactory;
- private ActivityGraphsHelper theActivityGraphsHelper;
+ private ActivityGraphsHelperEUMLImpl theActivityGraphsHelper;
- private AggregationKind theAggregationKind;
+ private AggregationKindEUMLImpl theAggregationKind;
@SuppressWarnings("deprecation")
- private ChangeableKind theChangeableKind;
+ private ChangeableKindEUMLImpl theChangeableKind;
- private CollaborationsFactory theCollaborationsFactory;
+ private CollaborationsFactoryEUMLImpl theCollaborationsFactory;
- private CollaborationsHelper theCollaborationsHelper;
+ private CollaborationsHelperEUMLImpl theCollaborationsHelper;
- private CommonBehaviorFactory theCommonBehaviorFactory;
+ private CommonBehaviorFactoryEUMLImpl theCommonBehaviorFactory;
- private CommonBehaviorHelper theCommonBehaviorHelper;
+ private CommonBehaviorHelperEUMLImpl theCommonBehaviorHelper;
- private ConcurrencyKind theConcurrencyKind;
+ private ConcurrencyKindEUMLImpl theConcurrencyKind;
- private CopyHelper theCopyHelper;
+ private CopyHelperEUMLImpl theCopyHelper;
- private CoreFactory theCoreFactory;
+ private CoreFactoryEUMLImpl theCoreFactory;
- private CoreHelper theCoreHelper;
+ private CoreHelperEUMLImpl theCoreHelper;
- private DataTypesFactory theDataTypesFactory;
+ private DataTypesFactoryEUMLImpl theDataTypesFactory;
- private DataTypesHelper theDataTypesHelper;
+ private DataTypesHelperEUMLImpl theDataTypesHelper;
- private DirectionKind theDirectionKind;
+ private DirectionKindEUMLImpl theDirectionKind;
- private ExtensionMechanismsFactory theExtensionMechanismsFactory;
+ private ExtensionMechanismsFactoryEUMLImpl theExtensionMechanismsFactory;
- private ExtensionMechanismsHelper theExtensionMechanismsHelper;
+ private ExtensionMechanismsHelperEUMLImpl theExtensionMechanismsHelper;
- private Facade theFacade;
+ private FacadeEUMLImpl theFacade;
- private MetaTypes theMetaTypes;
+ private MetaTypesEUMLImpl theMetaTypes;
private ModelEventPumpEUMLImpl theModelEventPump;
- private ModelManagementFactory theModelManagementFactory;
+ private ModelManagementFactoryEUMLImpl theModelManagementFactory;
- private ModelManagementHelper theModelManagementHelper;
+ private ModelManagementHelperEUMLImpl theModelManagementHelper;
- private OrderingKind theOrderingKind;
+ private OrderingKindEUMLImpl theOrderingKind;
- private PseudostateKind thePseudostateKind;
+ private PseudostateKindEUMLImpl thePseudostateKind;
@SuppressWarnings("deprecation")
- private ScopeKind theScopeKind;
+ private ScopeKindEUMLImpl theScopeKind;
- private StateMachinesFactory theStateMachinesFactory;
+ private StateMachinesFactoryEUMLImpl theStateMachinesFactory;
- private StateMachinesHelper theStateMachinesHelper;
+ private StateMachinesHelperEUMLImpl theStateMachinesHelper;
- private UmlFactory theUmlFactory;
+ private UmlFactoryEUMLImpl theUmlFactory;
- private UmlHelper theUmlHelper;
+ private UmlHelperEUMLImpl theUmlHelper;
- private UseCasesFactory theUseCasesFactory;
+ private UseCasesFactoryEUMLImpl theUseCasesFactory;
- private UseCasesHelper theUseCasesHelper;
+ private UseCasesHelperEUMLImpl theUseCasesHelper;
- private VisibilityKind theVisibilityKind;
+ private VisibilityKindEUMLImpl theVisibilityKind;
/**
* This keeps track of the editing domain that is used to track all changes
@@ -335,7 +302,7 @@
return editingDomain;
}
- public ActivityGraphsFactory getActivityGraphsFactory() {
+ public ActivityGraphsFactoryEUMLlImpl getActivityGraphsFactory() {
if (theActivityGraphsFactory == null) {
theActivityGraphsFactory =
new ActivityGraphsFactoryEUMLlImpl(this);
@@ -343,14 +310,14 @@
return theActivityGraphsFactory;
}
- public ActivityGraphsHelper getActivityGraphsHelper() {
+ public ActivityGraphsHelperEUMLImpl getActivityGraphsHelper() {
if (theActivityGraphsHelper == null) {
theActivityGraphsHelper = new ActivityGraphsHelperEUMLImpl(this);
}
return theActivityGraphsHelper;
}
- public AggregationKind getAggregationKind() {
+ public AggregationKindEUMLImpl getAggregationKind() {
if (theAggregationKind == null) {
theAggregationKind = new AggregationKindEUMLImpl();
}
@@ -358,91 +325,91 @@
}
@SuppressWarnings("deprecation")
- public ChangeableKind getChangeableKind() {
+ public ChangeableKindEUMLImpl getChangeableKind() {
if (theChangeableKind == null) {
theChangeableKind = new ChangeableKindEUMLImpl();
}
return theChangeableKind;
}
- public CollaborationsFactory getCollaborationsFactory() {
+ public CollaborationsFactoryEUMLImpl getCollaborationsFactory() {
if (theCollaborationsFactory == null) {
theCollaborationsFactory = new CollaborationsFactoryEUMLImpl(this);
}
return theCollaborationsFactory;
}
- public CollaborationsHelper getCollaborationsHelper() {
+ public CollaborationsHelperEUMLImpl getCollaborationsHelper() {
if (theCollaborationsHelper == null) {
theCollaborationsHelper = new CollaborationsHelperEUMLImpl(this);
}
return theCollaborationsHelper;
}
- public CommonBehaviorFactory getCommonBehaviorFactory() {
+ public CommonBehaviorFactoryEUMLImpl getCommonBehaviorFactory() {
if (theCommonBehaviorFactory == null) {
theCommonBehaviorFactory = new CommonBehaviorFactoryEUMLImpl(this);
}
return theCommonBehaviorFactory;
}
- public CommonBehaviorHelper getCommonBehaviorHelper() {
+ public CommonBehaviorHelperEUMLImpl getCommonBehaviorHelper() {
if (theCommonBehaviorHelper == null) {
theCommonBehaviorHelper = new CommonBehaviorHelperEUMLImpl(this);
}
return theCommonBehaviorHelper;
}
- public ConcurrencyKind getConcurrencyKind() {
+ public ConcurrencyKindEUMLImpl getConcurrencyKind() {
if (theConcurrencyKind == null) {
theConcurrencyKind = new ConcurrencyKindEUMLImpl();
}
return theConcurrencyKind;
}
- public CopyHelper getCopyHelper() {
+ public CopyHelperEUMLImpl getCopyHelper() {
if (theCopyHelper == null) {
theCopyHelper = new CopyHelperEUMLImpl(this);
}
return theCopyHelper;
}
- public CoreFactory getCoreFactory() {
+ public CoreFactoryEUMLImpl getCoreFactory() {
if (theCoreFactory == null) {
theCoreFactory = new CoreFactoryEUMLImpl(this);
}
return theCoreFactory;
}
- public CoreHelper getCoreHelper() {
+ public CoreHelperEUMLImpl getCoreHelper() {
if (theCoreHelper == null) {
theCoreHelper = new CoreHelperEUMLImpl(this);
}
return theCoreHelper;
}
- public DataTypesFactory getDataTypesFactory() {
+ public DataTypesFactoryEUMLImpl getDataTypesFactory() {
if (theDataTypesFactory == null) {
theDataTypesFactory = new DataTypesFactoryEUMLImpl(this);
}
return theDataTypesFactory;
}
- public DataTypesHelper getDataTypesHelper() {
+ public DataTypesHelperEUMLImpl getDataTypesHelper() {
if (theDataTypesHelper == null) {
theDataTypesHelper = new DataTypesHelperEUMLImpl(this);
}
return theDataTypesHelper;
}
- public DirectionKind getDirectionKind() {
+ public DirectionKindEUMLImpl getDirectionKind() {
if (theDirectionKind == null) {
theDirectionKind = new DirectionKindEUMLImpl();
}
return theDirectionKind;
}
- public ExtensionMechanismsFactory getExtensionMechanismsFactory() {
+ public ExtensionMechanismsFactoryEUMLImpl getExtensionMechanismsFactory() {
if (theExtensionMechanismsFactory == null) {
theExtensionMechanismsFactory =
new ExtensionMechanismsFactoryEUMLImpl(this);
@@ -450,7 +417,7 @@
return theExtensionMechanismsFactory;
}
- public ExtensionMechanismsHelper getExtensionMechanismsHelper() {
+ public ExtensionMechanismsHelperEUMLImpl getExtensionMechanismsHelper() {
if (theExtensionMechanismsHelper == null) {
theExtensionMechanismsHelper =
new ExtensionMechanismsHelperEUMLImpl(this);
@@ -458,14 +425,14 @@
return theExtensionMechanismsHelper;
}
- public Facade getFacade() {
+ public FacadeEUMLImpl getFacade() {
if (theFacade == null) {
theFacade = new FacadeEUMLImpl(this);
}
return theFacade;
}
- public MetaTypes getMetaTypes() {
+ public MetaTypesEUMLImpl getMetaTypes() {
if (theMetaTypes == null) {
theMetaTypes = new MetaTypesEUMLImpl(this);
}
@@ -479,7 +446,7 @@
return theModelEventPump;
}
- public ModelManagementFactory getModelManagementFactory() {
+ public ModelManagementFactoryEUMLImpl getModelManagementFactory() {
if (theModelManagementFactory == null) {
theModelManagementFactory =
new ModelManagementFactoryEUMLImpl(this);
@@ -487,21 +454,21 @@
return theModelManagementFactory;
}
- public ModelManagementHelper getModelManagementHelper() {
+ public ModelManagementHelperEUMLImpl getModelManagementHelper() {
if (theModelManagementHelper == null) {
theModelManagementHelper = new ModelManagementHelperEUMLImpl(this);
}
return theModelManagementHelper;
}
- public OrderingKind getOrderingKind() {
+ public OrderingKindEUMLImpl getOrderingKind() {
if (theOrderingKind == null) {
theOrderingKind = new OrderingKindEUMLImpl();
}
return theOrderingKind;
}
- public PseudostateKind getPseudostateKind() {
+ public PseudostateKindEUMLImpl getPseudostateKind() {
if (thePseudostateKind == null) {
thePseudostateKind = new PseudostateKindEUMLImpl();
}
@@ -509,7 +476,7 @@
}
@SuppressWarnings("deprecation")
- public ScopeKind getScopeKind() {
+ public ScopeKindEUMLImpl getScopeKind() {
if (theScopeKind == null) {
theScopeKind = new ScopeKindEUMLImpl();
}
@@ -517,65 +484,65 @@
}
- public StateMachinesFactory getStateMachinesFactory() {
+ public StateMachinesFactoryEUMLImpl getStateMachinesFactory() {
if (theStateMachinesFactory == null) {
theStateMachinesFactory = new StateMachinesFactoryEUMLImpl(this);
}
return theStateMachinesFactory;
}
- public StateMachinesHelper getStateMachinesHelper() {
+ public StateMachinesHelperEUMLImpl getStateMachinesHelper() {
if (theStateMachinesHelper == null) {
theStateMachinesHelper = new StateMachinesHelperEUMLImpl(this);
}
return theStateMachinesHelper;
}
- public UmlFactory getUmlFactory() {
+ public UmlFactoryEUMLImpl getUmlFactory() {
if (theUmlFactory == null) {
theUmlFactory = new UmlFactoryEUMLImpl(this);
}
return theUmlFactory;
}
- public UmlHelper getUmlHelper() {
+ public UmlHelperEUMLImpl getUmlHelper() {
if (theUmlHelper == null) {
theUmlHelper = new UmlHelperEUMLImpl(this);
}
return theUmlHelper;
}
- public UseCasesFactory getUseCasesFactory() {
+ public UseCasesFactoryEUMLImpl getUseCasesFactory() {
if (theUseCasesFactory == null) {
theUseCasesFactory = new UseCasesFactoryEUMLImpl(this);
}
return theUseCasesFactory;
}
- public UseCasesHelper getUseCasesHelper() {
+ public UseCasesHelperEUMLImpl getUseCasesHelper() {
if (theUseCasesHelper == null) {
theUseCasesHelper = new UseCasesHelperEUMLImpl(this);
}
return theUseCasesHelper;
}
- public VisibilityKind getVisibilityKind() {
+ public VisibilityKindEUMLImpl getVisibilityKind() {
if (theVisibilityKind == null) {
theVisibilityKind = new VisibilityKindEUMLImpl();
}
return theVisibilityKind;
}
- public XmiReader getXmiReader() throws UmlException {
+ public XmiReaderEUMLImpl getXmiReader() throws UmlException {
return new XmiReaderEUMLImpl(this);
}
- public XmiWriter getXmiWriter(Object model, Writer writer, String version)
+ public XmiWriterEUMLImpl getXmiWriter(Object model, Writer writer, String version)
throws UmlException {
return new XmiWriterEUMLImpl(this, model, writer, version);
}
- public XmiWriter getXmiWriter(Object model, OutputStream stream,
+ public XmiWriterEUMLImpl getXmiWriter(Object model, OutputStream stream,
String version) throws UmlException {
return new XmiWriterEUMLImpl(this, model, stream, version);
}
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.