svn commit: r13846 - trunk: src_new/org/argouml/application src_new/org/argouml/kernel src_new/org/argouml/persistence src_new/org/argouml/ui src_new/org/argouml/ui/explorer src_new/org/argouml/ui/explorer/rules src_new/org/argouml/uml/profile src_new/org/argouml/uml/ui tests tests/org/argouml/cognitive tests/org/argouml/kernel tests/org/argouml/model tests/org/argouml/notation tests/org/argouml/notation/providers tests/org/argouml/notation/providers/java tests/org/argouml/notation/providers/uml tests/org/argouml/persistence tests/org/argouml/ui tests/org/argouml/ui/targetmanager tests/org/argouml/uml tests/org/argouml/uml/diagram/activity/ui tests/org/argouml/uml/diagram/collaboration/ui tests/org/argouml/uml/diagram/deployment/ui tests/org/argouml/uml/diagram/state/ui tests/org/argouml /uml/diagram/static_structure/ui tests/org/argouml/uml/diagram/use_case/ui tests/org/argoum
[email protected] 28 Nov 2007 02:31:26 -0000
Newsgroups
gmane.comp.lang.uml.argouml.cvs
Message-ID
<[email protected] >
Author: euluis
Date: 2007-11-27 18:31:26-0800
New Revision: 13846
Added:
trunk/src_new/org/argouml/kernel/ProfileConfiguration.java
- copied, changed from r13844, /trunk/src_new/org/argouml/uml/profile/ProfileConfiguration.java
Removed:
trunk/src_new/org/argouml/uml/profile/
Modified:
trunk/src_new/org/argouml/application/Main.java
trunk/src_new/org/argouml/kernel/MemberList.java
trunk/src_new/org/argouml/kernel/Project.java
trunk/src_new/org/argouml/kernel/ProjectImpl.java
trunk/src_new/org/argouml/persistence/ModelMemberFilePersister.java
trunk/src_new/org/argouml/persistence/OldZargoFilePersister.java
trunk/src_new/org/argouml/persistence/ProfileConfigurationFilePersister.java
trunk/src_new/org/argouml/persistence/UmlFilePersister.java
trunk/src_new/org/argouml/persistence/ZargoFilePersister.java
trunk/src_new/org/argouml/persistence/ZipFilePersister.java
trunk/src_new/org/argouml/ui/ProfileSelectionTab.java
trunk/src_new/org/argouml/ui/ProjectSettingsTabProfile.java
trunk/src_new/org/argouml/ui/SettingsTabProfile.java
trunk/src_new/org/argouml/ui/explorer/ActionExportProfileXMI.java
trunk/src_new/org/argouml/ui/explorer/ExplorerPopup.java
trunk/src_new/org/argouml/ui/explorer/NameOrder.java
trunk/src_new/org/argouml/ui/explorer/rules/GoProfileConfigurationToProfile.java
trunk/src_new/org/argouml/ui/explorer/rules/GoProfileToModel.java
trunk/src_new/org/argouml/uml/ui/PropPanel.java
trunk/src_new/org/argouml/uml/ui/UMLComboBoxEntry.java
trunk/src_new/org/argouml/uml/ui/UMLUserInterfaceContainer.java
trunk/tests/Model all tests.launch
trunk/tests/org/argouml/cognitive/TestItemUID.java
trunk/tests/org/argouml/kernel/TestProject.java
trunk/tests/org/argouml/kernel/TestProjectManager.java
trunk/tests/org/argouml/kernel/TestProjectSettings.java
trunk/tests/org/argouml/kernel/TestProjectWithProfiles.java
trunk/tests/org/argouml/model/TestModelEventPump.java
trunk/tests/org/argouml/notation/TestNotationProvider.java
trunk/tests/org/argouml/notation/providers/TestNotationProviderFactory2.java
trunk/tests/org/argouml/notation/providers/java/TestModelElementNameNotationJava.java
trunk/tests/org/argouml/notation/providers/uml/TestAttributeAndOperationNotationUml.java
trunk/tests/org/argouml/notation/providers/uml/TestCallStateNotationUml.java
trunk/tests/org/argouml/notation/providers/uml/TestClassifierRoleNotationUml.java
trunk/tests/org/argouml/notation/providers/uml/TestMessageNotationUml.java
trunk/tests/org/argouml/notation/providers/uml/TestStateBodyNotationUml.java
trunk/tests/org/argouml/notation/providers/uml/TestTransitionNotationUml.java
trunk/tests/org/argouml/persistence/TestXmiFilePersister.java
trunk/tests/org/argouml/persistence/TestZargoFilePersister.java
trunk/tests/org/argouml/ui/TestDetailsPane.java
trunk/tests/org/argouml/ui/TestPropertyPanels.java
trunk/tests/org/argouml/ui/TestStylePanel.java
trunk/tests/org/argouml/ui/targetmanager/TestTargetManager.java
trunk/tests/org/argouml/uml/TestProfileJava.java
trunk/tests/org/argouml/uml/diagram/activity/ui/TestUMLActivityDiagram.java
trunk/tests/org/argouml/uml/diagram/collaboration/ui/TestUMLCollaborationDiagram.java
trunk/tests/org/argouml/uml/diagram/deployment/ui/TestUMLDeploymentDiagram.java
trunk/tests/org/argouml/uml/diagram/state/ui/TestFigClonable.java
trunk/tests/org/argouml/uml/diagram/state/ui/TestUMLStateDiagram.java
trunk/tests/org/argouml/uml/diagram/static_structure/ui/TestUMLClassDiagram.java
trunk/tests/org/argouml/uml/diagram/use_case/ui/TestFigClonable.java
trunk/tests/org/argouml/uml/diagram/use_case/ui/TestUMLUseCaseDiagram.java
trunk/tests/org/argouml/uml/reveng/TestJavaImportClass.java
trunk/tests/org/argouml/uml/reveng/TestJavaImportEnumeration.java
trunk/tests/org/argouml/uml/reveng/TestJavaImportInterface.java
trunk/tests/org/argouml/uml/reveng/TestJavaImportUnicode.java
trunk/tests/org/argouml/uml/ui/AbstractTestActionAddDiagram.java
trunk/tests/org/argouml/uml/ui/MockUMLUserInterfaceContainer.java
trunk/tests/org/argouml/uml/ui/TestActionCollaborationDiagram.java
trunk/tests/org/argouml/uml/ui/TestActionStateDiagram.java
trunk/tests/org/argouml/uml/ui/TestSourcePathController.java
trunk/tests/org/argouml/uml/ui/TestUMLTagDefinitionComboBoxModel.java
trunk/tests/org/argouml/uml/ui/behavior/collaborations/TestUMLAssociationRoleBaseComboBoxModel.java
trunk/tests/org/argouml/uml/ui/behavior/collaborations/TestUMLCollaborationRepresentedClassifierComboBoxModel.java
trunk/tests/org/argouml/uml/ui/behavior/collaborations/TestUMLCollaborationRepresentedOperationComboBoxModel.java
trunk/tests/org/argouml/uml/ui/behavior/common_behavior/TestUMLReceptionSignalComboBoxModel.java
trunk/tests/org/argouml/uml/ui/foundation/core/TestUMLGeneralizationPowertypeComboBoxModel.java
trunk/tests/org/argouml/uml/ui/foundation/core/TestUMLStructuralFeatureTypeComboBoxModel.java
Log:
Issue #4885: removing old org.argouml.uml.profile package and addapting a bunch of code accordingly, including loads of initializations that before were implicit by the use of the ProfileMagerImpl singleton.
Modified: trunk/src_new/org/argouml/application/Main.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/application/Main.java?view=diff&rev=13846&p1=trunk/src_new/org/argouml/application/Main.java&p2=trunk/src_new/org/argouml/application/Main.java&r1=13845&r2=13846
==============================================================================
--- trunk/src_new/org/argouml/application/Main.java (original)
+++ trunk/src_new/org/argouml/application/Main.java 2007-11-27 18:31:26-0800
@@ -68,6 +68,7 @@
import org.argouml.notation.providers.uml.InitNotationUml;
import org.argouml.notation.ui.InitNotationUI;
import org.argouml.persistence.PersistenceManager;
+import org.argouml.profile.InitProfileSubsystem;
import org.argouml.ui.ArgoFrame;
import org.argouml.ui.LookAndFeelMgr;
import org.argouml.ui.ProjectBrowser;
@@ -260,6 +261,10 @@
initModel();
updateProgress(splash, 5, "statusmsg.bar.model-subsystem");
+
+ // Initialize the Profile subsystem
+ st.mark("initialize the profile subsystem");
+ new InitProfileSubsystem().init();
/*
* Initialize the module loader. At least the plug-ins that provide
Modified: trunk/src_new/org/argouml/kernel/MemberList.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/kernel/MemberList.java?view=diff&rev=13846&p1=trunk/src_new/org/argouml/kernel/MemberList.java&p2=trunk/src_new/org/argouml/kernel/MemberList.java&r1=13845&r2=13846
==============================================================================
--- trunk/src_new/org/argouml/kernel/MemberList.java (original)
+++ trunk/src_new/org/argouml/kernel/MemberList.java 2007-11-27 18:31:26-0800
@@ -34,7 +34,6 @@
import org.argouml.uml.ProjectMemberModel;
import org.argouml.uml.cognitive.ProjectMemberTodoList;
import org.argouml.uml.diagram.ProjectMemberDiagram;
-import org.argouml.uml.profile.ProfileConfiguration;
import org.tigris.gef.base.Diagram;
/**
Copied: trunk/src_new/org/argouml/kernel/ProfileConfiguration.java (from r13844, /trunk/src_new/org/argouml/uml/profile/ProfileConfiguration.java)
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/kernel/ProfileConfiguration.java?view=diff&rev=13846&p1=/trunk/src_new/org/argouml/uml/profile/ProfileConfiguration.java&p2=trunk/src_new/org/argouml/kernel/ProfileConfiguration.java&r1=13844&r2=13846
==============================================================================
--- /trunk/src_new/org/argouml/uml/profile/ProfileConfiguration.java (original)
+++ trunk/src_new/org/argouml/kernel/ProfileConfiguration.java 2007-11-27 18:31:26-0800
@@ -22,7 +22,7 @@
// CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT,
// UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-package org.argouml.uml.profile;
+package org.argouml.kernel;
import java.awt.Image;
import java.util.Collection;
@@ -33,9 +33,13 @@
import java.util.ArrayList;
import org.apache.log4j.Logger;
-import org.argouml.kernel.AbstractProjectMember;
-import org.argouml.kernel.Project;
import org.argouml.model.Model;
+import org.argouml.profile.DefaultTypeStrategy;
+import org.argouml.profile.FigNodeStrategy;
+import org.argouml.profile.FormatingStrategy;
+import org.argouml.profile.Profile;
+import org.argouml.profile.ProfileException;
+import org.argouml.profile.ProfileFacade;
import org.argouml.ui.explorer.ExplorerEventAdaptor;
/**
@@ -75,8 +79,7 @@
public ProfileConfiguration(Project project) {
super(EXTENSION, project);
- for (Profile p
- : ProfileManagerImpl.getInstance().getDefaultProfiles()) {
+ for (Profile p : ProfileFacade.getManager().getDefaultProfiles()) {
addProfile(p);
}
@@ -305,7 +308,7 @@
*/
public Object findType(String name) {
for (Object model : getProfileModels()) {
- Object result = ModelUtils.findTypeInModel(name, model);
+ Object result = findTypeInModel(name, model);
if (result != null) {
return result;
}
@@ -313,6 +316,44 @@
return null;
}
+ /**
+ * Finds a type in a model by name
+ *
+ * FIXME: duplicated from the method with the same name in
+ * org.argouml.profile.internal.ModelUtils.
+ *
+ * @param s the type name
+ * @param model the model
+ * @return the type or <code>null</code> if the type has not been found.
+ */
+ public static Object findTypeInModel(String s, Object model) {
+
+ if (!Model.getFacade().isANamespace(model)) {
+ throw new IllegalArgumentException(
+ "Looking for the classifier " + s
+ + " in a non-namespace object of " + model
+ + ". A namespace was expected.");
+ }
+
+ Collection allClassifiers =
+ Model.getModelManagementHelper()
+ .getAllModelElementsOfKind(model,
+ Model.getMetaTypes().getClassifier());
+
+ Object[] classifiers = allClassifiers.toArray();
+ Object classifier = null;
+
+ for (int i = 0; i < classifiers.length; i++) {
+
+ classifier = classifiers[i];
+ if (Model.getFacade().getName(classifier) != null
+ && Model.getFacade().getName(classifier).equals(s)) {
+ return classifier;
+ }
+ }
+
+ return null;
+ }
@SuppressWarnings("unchecked")
public Collection findByMetaType(Object metaType) {
Modified: trunk/src_new/org/argouml/kernel/Project.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/kernel/Project.java?view=diff&rev=13846&p1=trunk/src_new/org/argouml/kernel/Project.java&p2=trunk/src_new/org/argouml/kernel/Project.java&r1=13845&r2=13846
==============================================================================
--- trunk/src_new/org/argouml/kernel/Project.java (original)
+++ trunk/src_new/org/argouml/kernel/Project.java 2007-11-27 18:31:26-0800
@@ -34,8 +34,7 @@
import java.util.Vector;
import org.argouml.uml.diagram.ArgoDiagram;
-import org.argouml.uml.profile.Profile;
-import org.argouml.uml.profile.ProfileConfiguration;
+import org.argouml.profile.Profile;
import org.tigris.gef.presentation.Fig;
/**
Modified: trunk/src_new/org/argouml/kernel/ProjectImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/kernel/ProjectImpl.java?view=diff&rev=13846&p1=trunk/src_new/org/argouml/kernel/ProjectImpl.java&p2=trunk/src_new/org/argouml/kernel/ProjectImpl.java&r1=13845&r2=13846
==============================================================================
--- trunk/src_new/org/argouml/kernel/ProjectImpl.java (original)
+++ trunk/src_new/org/argouml/kernel/ProjectImpl.java 2007-11-27 18:31:26-0800
@@ -56,8 +56,7 @@
import org.argouml.uml.diagram.ArgoDiagram;
import org.argouml.uml.diagram.DiagramFactory;
import org.argouml.uml.diagram.ProjectMemberDiagram;
-import org.argouml.uml.profile.Profile;
-import org.argouml.uml.profile.ProfileConfiguration;
+import org.argouml.profile.Profile;
import org.tigris.gef.presentation.Fig;
/**
@@ -509,7 +508,7 @@
for (Profile profile : getProfileConfiguration().getProfiles()) {
try {
result.addAll(profile.getProfilePackages());
- } catch (org.argouml.uml.profile.ProfileException e) {
+ } catch (org.argouml.profile.ProfileException e) {
LOG.error("Exception when fetching models from profile "
+ profile.getDisplayName(), e);
}
Modified: trunk/src_new/org/argouml/persistence/ModelMemberFilePersister.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/persistence/ModelMemberFilePersister.java?view=diff&rev=13846&p1=trunk/src_new/org/argouml/persistence/ModelMemberFilePersister.java&p2=trunk/src_new/org/argouml/persistence/ModelMemberFilePersister.java&r1=13845&r2=13846
==============================================================================
--- trunk/src_new/org/argouml/persistence/ModelMemberFilePersister.java (original)
+++ trunk/src_new/org/argouml/persistence/ModelMemberFilePersister.java 2007-11-27 18:31:26-0800
@@ -56,7 +56,7 @@
import org.argouml.uml.diagram.DiagramFactory;
import org.argouml.uml.diagram.ProjectMemberDiagram;
import org.argouml.uml.diagram.DiagramFactory.DiagramType;
-import org.argouml.uml.profile.ProfileConfiguration;
+import org.argouml.kernel.ProfileConfiguration;
import org.xml.sax.InputSource;
/**
Modified: trunk/src_new/org/argouml/persistence/OldZargoFilePersister.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/persistence/OldZargoFilePersister.java?view=diff&rev=13846&p1=trunk/src_new/org/argouml/persistence/OldZargoFilePersister.java&p2=trunk/src_new/org/argouml/persistence/OldZargoFilePersister.java&r1=13845&r2=13846
==============================================================================
--- trunk/src_new/org/argouml/persistence/OldZargoFilePersister.java (original)
+++ trunk/src_new/org/argouml/persistence/OldZargoFilePersister.java 2007-11-27 18:31:26-0800
@@ -151,13 +151,11 @@
int size = project.getMembers().size();
Collection<String> names = new ArrayList<String>();
for (int i = 0; i < size; i++) {
- ProjectMember projectMember =
- (ProjectMember) project.getMembers().get(i);
+ ProjectMember projectMember = project.getMembers().get(i);
if (!(projectMember.getType().equalsIgnoreCase("xmi"))) {
if (LOG.isInfoEnabled()) {
- LOG.info("Saving member: "
- + ((ProjectMember) project.getMembers()
- .get(i)).getZipName());
+ LOG.info("Saving member: "
+ + project.getMembers().get(i).getZipName());
}
String name = projectMember.getZipName();
String originalName = name;
@@ -175,13 +173,11 @@
}
for (int i = 0; i < size; i++) {
- ProjectMember projectMember =
- (ProjectMember) project.getMembers().get(i);
+ ProjectMember projectMember = project.getMembers().get(i);
if (projectMember.getType().equalsIgnoreCase("xmi")) {
if (LOG.isInfoEnabled()) {
LOG.info("Saving member of type: "
- + ((ProjectMember) project.getMembers()
- .get(i)).getType());
+ + project.getMembers().get(i).getType());
}
stream.putNextEntry(
new ZipEntry(projectMember.getZipName()));
Modified: trunk/src_new/org/argouml/persistence/ProfileConfigurationFilePersister.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/persistence/ProfileConfigurationFilePersister.java?view=diff&rev=13846&p1=trunk/src_new/org/argouml/persistence/ProfileConfigurationFilePersister.java&p2=trunk/src_new/org/argouml/persistence/ProfileConfigurationFilePersister.java&r1=13845&r2=13846
==============================================================================
--- trunk/src_new/org/argouml/persistence/ProfileConfigurationFilePersister.java (original)
+++ trunk/src_new/org/argouml/persistence/ProfileConfigurationFilePersister.java 2007-11-27 18:31:26-0800
@@ -48,10 +48,10 @@
import org.argouml.model.UmlException;
import org.argouml.model.XmiReader;
import org.argouml.model.XmiWriter;
-import org.argouml.uml.profile.Profile;
-import org.argouml.uml.profile.ProfileConfiguration;
-import org.argouml.uml.profile.ProfileManagerImpl;
-import org.argouml.uml.profile.UserDefinedProfile;
+import org.argouml.profile.Profile;
+import org.argouml.profile.ProfileFacade;
+import org.argouml.kernel.ProfileConfiguration;
+import org.argouml.profile.UserDefinedProfile;
/**
* Persister for Project's Profile Configuration
@@ -95,8 +95,8 @@
}
Profile profile = null;
- List<Profile> profiles = ProfileManagerImpl.getInstance()
- .getRegisteredProfiles();
+ List<Profile> profiles =
+ ProfileFacade.getManager().getRegisteredProfiles();
if (line.equals("<userDefined>")) {
line = br.readLine().trim();
@@ -127,7 +127,7 @@
} else if (line.equals("<plugin>")) {
String className = br.readLine().trim();
- profile = ProfileManagerImpl.getInstance()
+ profile = ProfileFacade.getManager()
.getProfileForClass(className);
line = br.readLine().trim();
Modified: trunk/src_new/org/argouml/persistence/UmlFilePersister.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/persistence/UmlFilePersister.java?view=diff&rev=13846&p1=trunk/src_new/org/argouml/persistence/UmlFilePersister.java&p2=trunk/src_new/org/argouml/persistence/UmlFilePersister.java&r1=13845&r2=13846
==============================================================================
--- trunk/src_new/org/argouml/persistence/UmlFilePersister.java (original)
+++ trunk/src_new/org/argouml/persistence/UmlFilePersister.java 2007-11-27 18:31:26-0800
@@ -70,7 +70,7 @@
import org.argouml.uml.ProjectMemberModel;
import org.argouml.uml.cognitive.ProjectMemberTodoList;
import org.argouml.uml.diagram.ProjectMemberDiagram;
-import org.argouml.uml.profile.ProfileConfiguration;
+import org.argouml.kernel.ProfileConfiguration;
import org.argouml.util.ThreadUtils;
import org.tigris.gef.ocl.ExpansionException;
import org.tigris.gef.ocl.OCLExpander;
@@ -264,13 +264,11 @@
// Write out XMI section first
int size = project.getMembers().size();
for (int i = 0; i < size; i++) {
- ProjectMember projectMember =
- (ProjectMember) project.getMembers().get(i);
+ ProjectMember projectMember = project.getMembers().get(i);
if (projectMember.getType().equalsIgnoreCase("xmi")) {
if (LOG.isInfoEnabled()) {
LOG.info("Saving member of type: "
- + ((ProjectMember) project.getMembers()
- .get(i)).getType());
+ + project.getMembers().get(i).getType());
}
MemberFilePersister persister
= getMemberFilePersister(projectMember);
@@ -290,13 +288,11 @@
// Write out all non-XMI sections
for (int i = 0; i < size; i++) {
- ProjectMember projectMember =
- (ProjectMember) project.getMembers().get(i);
+ ProjectMember projectMember = project.getMembers().get(i);
if (!projectMember.getType().equalsIgnoreCase("xmi")) {
if (LOG.isInfoEnabled()) {
LOG.info("Saving member of type: "
- + ((ProjectMember) project.getMembers().
- get(i)).getType());
+ + project.getMembers().get(i).getType());
}
MemberFilePersister persister
= getMemberFilePersister(projectMember);
Modified: trunk/src_new/org/argouml/persistence/ZargoFilePersister.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/persistence/ZargoFilePersister.java?view=diff&rev=13846&p1=trunk/src_new/org/argouml/persistence/ZargoFilePersister.java&p2=trunk/src_new/org/argouml/persistence/ZargoFilePersister.java&r1=13845&r2=13846
==============================================================================
--- trunk/src_new/org/argouml/persistence/ZargoFilePersister.java (original)
+++ trunk/src_new/org/argouml/persistence/ZargoFilePersister.java 2007-11-27 18:31:26-0800
@@ -53,7 +53,7 @@
import org.argouml.kernel.Project;
import org.argouml.kernel.ProjectFactory;
import org.argouml.kernel.ProjectMember;
-import org.argouml.uml.profile.ProfileConfiguration;
+import org.argouml.kernel.ProfileConfiguration;
import org.argouml.util.FileConstants;
import org.argouml.util.ThreadUtils;
import org.xml.sax.InputSource;
Modified: trunk/src_new/org/argouml/persistence/ZipFilePersister.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/persistence/ZipFilePersister.java?view=diff&rev=13846&p1=trunk/src_new/org/argouml/persistence/ZipFilePersister.java&p2=trunk/src_new/org/argouml/persistence/ZipFilePersister.java&r1=13845&r2=13846
==============================================================================
--- trunk/src_new/org/argouml/persistence/ZipFilePersister.java (original)
+++ trunk/src_new/org/argouml/persistence/ZipFilePersister.java 2007-11-27 18:31:26-0800
@@ -46,7 +46,7 @@
import org.argouml.uml.ProjectMemberModel;
import org.argouml.uml.cognitive.ProjectMemberTodoList;
import org.argouml.uml.diagram.ProjectMemberDiagram;
-import org.argouml.uml.profile.ProfileConfiguration;
+import org.argouml.kernel.ProfileConfiguration;
import org.xml.sax.InputSource;
/**
Modified: trunk/src_new/org/argouml/ui/ProfileSelectionTab.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/ProfileSelectionTab.java?view=diff&rev=13846&p1=trunk/src_new/org/argouml/ui/ProfileSelectionTab.java&p2=trunk/src_new/org/argouml/ui/ProfileSelectionTab.java&r1=13845&r2=13846
==============================================================================
--- trunk/src_new/org/argouml/ui/ProfileSelectionTab.java (original)
+++ trunk/src_new/org/argouml/ui/ProfileSelectionTab.java 2007-11-27 18:31:26-0800
@@ -48,12 +48,12 @@
import org.argouml.application.api.GUISettingsTabInterface;
import org.argouml.i18n.Translator;
import org.argouml.kernel.ProjectManager;
-import org.argouml.uml.profile.Profile;
-import org.argouml.uml.profile.ProfileConfiguration;
-import org.argouml.uml.profile.ProfileException;
-import org.argouml.uml.profile.ProfileManager;
-import org.argouml.uml.profile.ProfileManagerImpl;
-import org.argouml.uml.profile.UserDefinedProfile;
+import org.argouml.profile.Profile;
+import org.argouml.kernel.ProfileConfiguration;
+import org.argouml.profile.ProfileException;
+import org.argouml.profile.ProfileManager;
+import org.argouml.profile.ProfileFacade;
+import org.argouml.profile.UserDefinedProfile;
/**
* The Tab where new profiles can be added and the registered
@@ -85,8 +85,7 @@
* @author maurelio1234
*/
private class AvailableProfilesListModel implements ListModel {
- private ProfileManager profileManager = ProfileManagerImpl
- .getInstance();
+ private ProfileManager profileManager = ProfileFacade.getManager();
private List<ListDataListener> listeners =
new ArrayList<ListDataListener>();
@@ -330,7 +329,7 @@
Profile selected = modelAvl.getProfileAt(availableList
.getSelectedIndex());
if (selected instanceof UserDefinedProfile) {
- ProfileManagerImpl.getInstance().removeProfile(selected);
+ ProfileFacade.getManager().removeProfile(selected);
modelAvl.fireListeners();
modelUsd.fireListeners();
@@ -363,7 +362,7 @@
try {
UserDefinedProfile profile = new UserDefinedProfile(file);
- ProfileManagerImpl.getInstance().registerProfile(profile);
+ ProfileFacade.getManager().registerProfile(profile);
ProjectManager.getManager().getCurrentProject()
.getProfileConfiguration().addProfile(profile);
Modified: trunk/src_new/org/argouml/ui/ProjectSettingsTabProfile.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/ProjectSettingsTabProfile.java?view=diff&rev=13846&p1=trunk/src_new/org/argouml/ui/ProjectSettingsTabProfile.java&p2=trunk/src_new/org/argouml/ui/ProjectSettingsTabProfile.java&r1=13845&r2=13846
==============================================================================
--- trunk/src_new/org/argouml/ui/ProjectSettingsTabProfile.java (original)
+++ trunk/src_new/org/argouml/ui/ProjectSettingsTabProfile.java 2007-11-27 18:31:26-0800
@@ -54,11 +54,11 @@
import org.argouml.kernel.ProjectSettings;
import org.argouml.ui.explorer.ExplorerEventAdaptor;
import org.argouml.uml.diagram.ui.FigNodeModelElement;
-import org.argouml.uml.profile.Profile;
-import org.argouml.uml.profile.ProfileConfiguration;
-import org.argouml.uml.profile.ProfileException;
-import org.argouml.uml.profile.ProfileManagerImpl;
-import org.argouml.uml.profile.UserDefinedProfile;
+import org.argouml.profile.Profile;
+import org.argouml.kernel.ProfileConfiguration;
+import org.argouml.profile.ProfileException;
+import org.argouml.profile.ProfileFacade;
+import org.argouml.profile.UserDefinedProfile;
/**
* The Tab where new profiles can be added and the registered
@@ -215,7 +215,7 @@
List<Profile> used = getUsedProfiles();
List<Profile> ret = new ArrayList<Profile>();
- for (Profile profile : ProfileManagerImpl.getInstance()
+ for (Profile profile : ProfileFacade.getManager()
.getRegisteredProfiles()) {
if (!used.contains(profile)) {
ret.add(profile);
@@ -269,9 +269,9 @@
}
if (remove) {
- if (!ProfileManagerImpl.getInstance()
+ if (!ProfileFacade.getManager()
.getRegisteredProfiles().contains(selected)
- && !ProfileManagerImpl.getInstance()
+ && !ProfileFacade.getManager()
.getDefaultProfiles().contains(selected)) {
remove = (JOptionPane
.showConfirmDialog(
@@ -299,7 +299,7 @@
Profile selected = (Profile) modelAvailable
.getElementAt(availableList.getSelectedIndex());
if (selected instanceof UserDefinedProfile) {
- ProfileManagerImpl.getInstance().removeProfile(selected);
+ ProfileFacade.getManager().removeProfile(selected);
modelAvailable.removeElement(selected);
} else {
JOptionPane.showMessageDialog(this, Translator
@@ -329,7 +329,7 @@
try {
UserDefinedProfile profile = new UserDefinedProfile(file);
- ProfileManagerImpl.getInstance().registerProfile(profile);
+ ProfileFacade.getManager().registerProfile(profile);
modelAvailable.addElement(profile);
} catch (ProfileException e) {
Modified: trunk/src_new/org/argouml/ui/SettingsTabProfile.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/SettingsTabProfile.java?view=diff&rev=13846&p1=trunk/src_new/org/argouml/ui/SettingsTabProfile.java&p2=trunk/src_new/org/argouml/ui/SettingsTabProfile.java&r1=13845&r2=13846
==============================================================================
--- trunk/src_new/org/argouml/ui/SettingsTabProfile.java (original)
+++ trunk/src_new/org/argouml/ui/SettingsTabProfile.java 2007-11-27 18:31:26-0800
@@ -53,10 +53,10 @@
import org.argouml.configuration.ConfigurationKey;
import org.argouml.i18n.Translator;
import org.argouml.uml.diagram.ui.FigNodeModelElement;
-import org.argouml.uml.profile.Profile;
-import org.argouml.uml.profile.ProfileException;
-import org.argouml.uml.profile.ProfileManagerImpl;
-import org.argouml.uml.profile.UserDefinedProfile;
+import org.argouml.profile.Profile;
+import org.argouml.profile.ProfileException;
+import org.argouml.profile.ProfileFacade;
+import org.argouml.profile.UserDefinedProfile;
/**
* The Tab containing the global settings for profiles
@@ -252,12 +252,12 @@
.toArray()));
defaultList.setModel(new DefaultComboBoxModel(getUsedProfiles()
.toArray()));
- directoryList.setModel(new DefaultComboBoxModel(ProfileManagerImpl
- .getInstance().getSearchPathDirectories().toArray()));
+ directoryList.setModel(new DefaultComboBoxModel(ProfileFacade
+ .getManager().getSearchPathDirectories().toArray()));
}
private List<Profile> getUsedProfiles() {
- return new ArrayList<Profile>(ProfileManagerImpl.getInstance()
+ return new ArrayList<Profile>(ProfileFacade.getManager()
.getDefaultProfiles());
}
@@ -265,7 +265,7 @@
List<Profile> used = getUsedProfiles();
List<Profile> ret = new ArrayList<Profile>();
- for (Profile profile : ProfileManagerImpl.getInstance()
+ for (Profile profile : ProfileFacade.getManager()
.getRegisteredProfiles()) {
if (!used.contains(profile)) {
ret.add(profile);
@@ -303,7 +303,7 @@
Profile selected = (Profile) modelAvl.getElementAt(availableList
.getSelectedIndex());
if (selected instanceof UserDefinedProfile) {
- ProfileManagerImpl.getInstance().removeProfile(selected);
+ ProfileFacade.getManager().removeProfile(selected);
modelAvl.removeElement(selected);
} else {
JOptionPane.showMessageDialog(this, Translator
@@ -334,7 +334,7 @@
try {
UserDefinedProfile profile = new UserDefinedProfile(file);
- ProfileManagerImpl.getInstance().registerProfile(profile);
+ ProfileFacade.getManager().registerProfile(profile);
modelAvl.addElement(profile);
} catch (ProfileException e) {
@@ -361,7 +361,7 @@
if (refresh) {
handleSettingsTabSave();
- ProfileManagerImpl.getInstance().refreshRegisteredProfiles();
+ ProfileFacade.getManager().refreshRegisteredProfiles();
refreshLists();
}
} else if (arg0.getSource() == addDirectory) {
@@ -450,7 +450,7 @@
usedItens.add((Profile) modelUsd.getElementAt(i));
}
- for (Profile profile : ProfileManagerImpl.getInstance()
+ for (Profile profile : ProfileFacade.getManager()
.getDefaultProfiles()) {
if (!usedItens.contains(profile)) {
toRemove.add(profile);
@@ -458,13 +458,13 @@
}
for (Profile profile : toRemove) {
- ProfileManagerImpl.getInstance().removeFromDefaultProfiles(profile);
+ ProfileFacade.getManager().removeFromDefaultProfiles(profile);
}
for (Profile profile : usedItens) {
- if (!ProfileManagerImpl.getInstance().getDefaultProfiles()
+ if (!ProfileFacade.getManager().getDefaultProfiles()
.contains(profile)) {
- ProfileManagerImpl.getInstance().addToDefaultProfiles(profile);
+ ProfileFacade.getManager().addToDefaultProfiles(profile);
}
}
@@ -475,7 +475,7 @@
usedItensDir.add((String) modelDir.getElementAt(i));
}
- for (String dirEntry : ProfileManagerImpl.getInstance()
+ for (String dirEntry : ProfileFacade.getManager()
.getSearchPathDirectories()) {
if (!usedItensDir.contains(dirEntry)) {
toRemoveDir.add(dirEntry);
@@ -483,14 +483,14 @@
}
for (String dirEntry : toRemoveDir) {
- ProfileManagerImpl.getInstance()
+ ProfileFacade.getManager()
.removeSearchPathDirectory(dirEntry);
}
for (String dirEntry : usedItensDir) {
- if (!ProfileManagerImpl.getInstance().getSearchPathDirectories()
+ if (!ProfileFacade.getManager().getSearchPathDirectories()
.contains(dirEntry)) {
- ProfileManagerImpl.getInstance().addSearchPathDirectory(
+ ProfileFacade.getManager().addSearchPathDirectory(
dirEntry);
}
}
Modified: trunk/src_new/org/argouml/ui/explorer/ActionExportProfileXMI.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/explorer/ActionExportProfileXMI.java?view=diff&rev=13846&p1=trunk/src_new/org/argouml/ui/explorer/ActionExportProfileXMI.java&p2=trunk/src_new/org/argouml/ui/explorer/ActionExportProfileXMI.java&r1=13845&r2=13846
==============================================================================
--- trunk/src_new/org/argouml/ui/explorer/ActionExportProfileXMI.java (original)
+++ trunk/src_new/org/argouml/ui/explorer/ActionExportProfileXMI.java 2007-11-27 18:31:26-0800
@@ -43,7 +43,7 @@
import org.argouml.persistence.PersistenceManager;
import org.argouml.persistence.UmlFilePersister;
import org.argouml.ui.ArgoFrame;
-import org.argouml.uml.profile.Profile;
+import org.argouml.profile.Profile;
import org.argouml.uml.ui.ProjectFileView;
/**
Modified: trunk/src_new/org/argouml/ui/explorer/ExplorerPopup.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/explorer/ExplorerPopup.java?view=diff&rev=13846&p1=trunk/src_new/org/argouml/ui/explorer/ExplorerPopup.java&p2=trunk/src_new/org/argouml/ui/explorer/ExplorerPopup.java&r1=13845&r2=13846
==============================================================================
--- trunk/src_new/org/argouml/ui/explorer/ExplorerPopup.java (original)
+++ trunk/src_new/org/argouml/ui/explorer/ExplorerPopup.java 2007-11-27 18:31:26-0800
@@ -56,9 +56,9 @@
import org.argouml.uml.diagram.ui.ActionAddExistingNode;
import org.argouml.uml.diagram.ui.ActionAddExistingNodes;
import org.argouml.uml.diagram.ui.ActionSaveDiagramToClipboard;
-import org.argouml.uml.profile.Profile;
-import org.argouml.uml.profile.ProfileConfiguration;
-import org.argouml.uml.profile.ProfileException;
+import org.argouml.profile.Profile;
+import org.argouml.kernel.ProfileConfiguration;
+import org.argouml.profile.ProfileException;
import org.argouml.uml.ui.ActionActivityDiagram;
import org.argouml.uml.ui.ActionAddPackage;
import org.argouml.uml.ui.ActionClassDiagram;
Modified: trunk/src_new/org/argouml/ui/explorer/NameOrder.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/explorer/NameOrder.java?view=diff&rev=13846&p1=trunk/src_new/org/argouml/ui/explorer/NameOrder.java&p2=trunk/src_new/org/argouml/ui/explorer/NameOrder.java&r1=13845&r2=13846
==============================================================================
--- trunk/src_new/org/argouml/ui/explorer/NameOrder.java (original)
+++ trunk/src_new/org/argouml/ui/explorer/NameOrder.java 2007-11-27 18:31:26-0800
@@ -32,8 +32,8 @@
import org.argouml.i18n.Translator;
import org.argouml.model.InvalidElementException;
import org.argouml.model.Model;
-import org.argouml.uml.profile.Profile;
-import org.argouml.uml.profile.ProfileConfiguration;
+import org.argouml.profile.Profile;
+import org.argouml.kernel.ProfileConfiguration;
import org.tigris.gef.base.Diagram;
/**
Modified: trunk/src_new/org/argouml/ui/explorer/rules/GoProfileConfigurationToProfile.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/explorer/rules/GoProfileConfigurationToProfile.java?view=diff&rev=13846&p1=trunk/src_new/org/argouml/ui/explorer/rules/GoProfileConfigurationToProfile.java&p2=trunk/src_new/org/argouml/ui/explorer/rules/GoProfileConfigurationToProfile.java&r1=13845&r2=13846
==============================================================================
--- trunk/src_new/org/argouml/ui/explorer/rules/GoProfileConfigurationToProfile.java (original)
+++ trunk/src_new/org/argouml/ui/explorer/rules/GoProfileConfigurationToProfile.java 2007-11-27 18:31:26-0800
@@ -29,7 +29,7 @@
import java.util.Set;
import org.argouml.i18n.Translator;
-import org.argouml.uml.profile.ProfileConfiguration;
+import org.argouml.kernel.ProfileConfiguration;
/**
* Rule for Project->Profile.
Modified: trunk/src_new/org/argouml/ui/explorer/rules/GoProfileToModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/explorer/rules/GoProfileToModel.java?view=diff&rev=13846&p1=trunk/src_new/org/argouml/ui/explorer/rules/GoProfileToModel.java&p2=trunk/src_new/org/argouml/ui/explorer/rules/GoProfileToModel.java&r1=13845&r2=13846
==============================================================================
--- trunk/src_new/org/argouml/ui/explorer/rules/GoProfileToModel.java (original)
+++ trunk/src_new/org/argouml/ui/explorer/rules/GoProfileToModel.java 2007-11-27 18:31:26-0800
@@ -29,8 +29,8 @@
import java.util.Set;
import org.argouml.i18n.Translator;
-import org.argouml.uml.profile.Profile;
-import org.argouml.uml.profile.ProfileException;
+import org.argouml.profile.Profile;
+import org.argouml.profile.ProfileException;
/**
* Rule for Project->Profile.
Modified: trunk/src_new/org/argouml/uml/ui/PropPanel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/PropPanel.java?view=diff&rev=13846&p1=trunk/src_new/org/argouml/uml/ui/PropPanel.java&p2=trunk/src_new/org/argouml/uml/ui/PropPanel.java&r1=13845&r2=13846
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/PropPanel.java (original)
+++ trunk/src_new/org/argouml/uml/ui/PropPanel.java 2007-11-27 18:31:26-0800
@@ -61,7 +61,7 @@
import org.argouml.ui.targetmanager.TargetEvent;
import org.argouml.ui.targetmanager.TargetListener;
import org.argouml.ui.targetmanager.TargettableModelView;
-import org.argouml.uml.profile.ProfileConfiguration;
+import org.argouml.kernel.ProfileConfiguration;
import org.tigris.gef.presentation.Fig;
import org.tigris.swidgets.GridLayout2;
import org.tigris.swidgets.Horizontal;
Modified: trunk/src_new/org/argouml/uml/ui/UMLComboBoxEntry.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/UMLComboBoxEntry.java?view=diff&rev=13846&p1=trunk/src_new/org/argouml/uml/ui/UMLComboBoxEntry.java&p2=trunk/src_new/org/argouml/uml/ui/UMLComboBoxEntry.java&r1=13845&r2=13846
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/UMLComboBoxEntry.java (original)
+++ trunk/src_new/org/argouml/uml/ui/UMLComboBoxEntry.java 2007-11-27 18:31:26-0800
@@ -28,8 +28,8 @@
import org.apache.log4j.Logger;
import org.argouml.model.Model;
-import org.argouml.uml.profile.FormatingStrategy;
-import org.argouml.uml.profile.Profile;
+import org.argouml.profile.FormatingStrategy;
+import org.argouml.profile.Profile;
/**
* A combobox entry. <p>
Modified: trunk/src_new/org/argouml/uml/ui/UMLUserInterfaceContainer.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/UMLUserInterfaceContainer.java?view=diff&rev=13846&p1=trunk/src_new/org/argouml/uml/ui/UMLUserInterfaceContainer.java&p2=trunk/src_new/org/argouml/uml/ui/UMLUserInterfaceContainer.java&r1=13845&r2=13846
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/UMLUserInterfaceContainer.java (original)
+++ trunk/src_new/org/argouml/uml/ui/UMLUserInterfaceContainer.java 2007-11-27 18:31:26-0800
@@ -26,7 +26,7 @@
package org.argouml.uml.ui;
import java.util.Iterator;
-import org.argouml.uml.profile.ProfileConfiguration;
+import org.argouml.kernel.ProfileConfiguration;
/**
* Interface supported by any container of UML user interface components.
Modified: trunk/tests/Model all tests.launch
Url: http://argouml.tigris.org/source/browse/argouml/trunk/tests/Model%20all%20tests.launch?view=diff&rev=13846&p1=trunk/tests/Model%20all%20tests.launch&p2=trunk/tests/Model%20all%20tests.launch&r1=13845&r2=13846
==============================================================================
--- trunk/tests/Model all tests.launch (original)
+++ trunk/tests/Model all tests.launch 2007-11-27 18:31:26-0800
@@ -1,9 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="org.eclipse.jdt.junit.launchconfig">
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/argouml-core-tests/org/argouml/model/AllTests.java"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="1"/>
+</listAttribute>
+<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
+<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
-<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.argouml.model.AllTests"/>
<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
+<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit3"/>
<listAttribute key="org.eclipse.jdt.launching.CLASSPATH">
<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry containerPath="org.eclipse.jdt.launching.JRE_CONTAINER" javaProject="argouml-core-tests" path="1" type="4"/> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry path="3" projectName="argouml-core-model-mdr" type="1"/> "/>
@@ -26,9 +33,8 @@
<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/argouml-core-tools/lib/easymock12.jar" path="3" type="2"/> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry id="org.eclipse.jdt.launching.classpathentry.defaultClasspath"> <memento exportedEntriesOnly="false" project="argouml-core-tests"/> </runtimeClasspathEntry> "/>
</listAttribute>
+<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.argouml.model.AllTests"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="argouml-core-tests"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx64M -Dtest.model.uml=${resource_loc:/argouml-core-model-mdr/src/org/argouml/model/mdr/mof/01-02-15.xml} -Dlog4j.configuration=${resource_loc:/argouml/org/argouml/resource/default_console.lcf} -Djava.awt.headless="true" -Dargouml.tests.dir=${project_loc}"/>
-<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
-<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
-<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit3"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="${project_loc:xpto} -Xmx64M -Dtest.model.uml=${resource_loc:/argouml-core-model-mdr/src/org/argouml/model/mdr/mof/01-02-15.xml} -Dlog4j.configuration=${resource_loc:/argouml/org/argouml/resource/default_console.lcf} -Djava.awt.headless="true" -Dargouml.tests.dir=${project_loc}"/>
</launchConfiguration>
Modified: trunk/tests/org/argouml/cognitive/TestItemUID.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/tests/org/argouml/cognitive/TestItemUID.java?view=diff&rev=13846&p1=trunk/tests/org/argouml/cognitive/TestItemUID.java&p2=trunk/tests/org/argouml/cognitive/TestItemUID.java&r1=13845&r2=13846
==============================================================================
--- trunk/tests/org/argouml/cognitive/TestItemUID.java (original)
+++ trunk/tests/org/argouml/cognitive/TestItemUID.java 2007-11-27 18:31:26-0800
@@ -29,6 +29,7 @@
import org.argouml.model.InitializeModel;
import org.argouml.model.Model;
+import org.argouml.profile.InitProfileSubsystem;
import org.argouml.uml.CommentEdge;
import org.argouml.uml.diagram.activity.ui.FigActionState;
import org.argouml.uml.diagram.activity.ui.UMLActivityDiagram;
@@ -83,6 +84,7 @@
public void setUp() throws Exception {
super.setUp();
InitializeModel.initializeDefault();
+ new InitProfileSubsystem().init();
}
/**
Modified: trunk/tests/org/argouml/kernel/TestProject.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/tests/org/argouml/kernel/TestProject.java?view=diff&rev=13846&p1=trunk/tests/org/argouml/kernel/TestProject.java&p2=trunk/tests/org/argouml/kernel/TestProject.java&r1=13845&r2=13846
==============================================================================
--- trunk/tests/org/argouml/kernel/TestProject.java (original)
+++ trunk/tests/org/argouml/kernel/TestProject.java 2007-11-27 18:31:26-0800
@@ -31,6 +31,7 @@
import org.argouml.i18n.Translator;
import org.argouml.model.Model;
+import org.argouml.profile.InitProfileSubsystem;
import org.argouml.ui.targetmanager.TargetManager;
import org.argouml.uml.diagram.activity.ui.UMLActivityDiagram;
import org.argouml.uml.diagram.state.ui.UMLStateDiagram;
@@ -473,5 +474,6 @@
super.setUp();
InitializeModel.initializeDefault();
ProjectManager.getManager().setCurrentProject(null);
+ new InitProfileSubsystem().init();
}
}
Modified: trunk/tests/org/argouml/kernel/TestProjectManager.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/tests/org/argouml/kernel/TestProjectManager.java?view=diff&rev=13846&p1=trunk/tests/org/argouml/kernel/TestProjectManager.java&p2=trunk/tests/org/argouml/kernel/TestProjectManager.java&r1=13845&r2=13846
==============================================================================
--- trunk/tests/org/argouml/kernel/TestProjectManager.java (original)
+++ trunk/tests/org/argouml/kernel/TestProjectManager.java 2007-11-27 18:31:26-0800
@@ -29,6 +29,7 @@
import org.argouml.i18n.Translator;
import org.argouml.model.Model;
+import org.argouml.profile.InitProfileSubsystem;
/**
* @since Nov 22, 2002
@@ -51,6 +52,7 @@
public void setUp() throws Exception {
super.setUp();
InitializeModel.initializeDefault();
+ new InitProfileSubsystem().init();
}
/**
Modified: trunk/tests/org/argouml/kernel/TestProjectSettings.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/tests/org/argouml/kernel/TestProjectSettings.java?view=diff&rev=13846&p1=trunk/tests/org/argouml/kernel/TestProjectSettings.java&p2=trunk/tests/org/argouml/kernel/TestProjectSettings.java&r1=13845&r2=13846
==============================================================================
--- trunk/tests/org/argouml/kernel/TestProjectSettings.java (original)
+++ trunk/tests/org/argouml/kernel/TestProjectSettings.java 2007-11-27 18:31:26-0800
@@ -37,6 +37,7 @@
import org.argouml.notation.Notation;
import org.argouml.notation.providers.java.InitNotationJava;
import org.argouml.notation.providers.uml.InitNotationUml;
+import org.argouml.profile.InitProfileSubsystem;
/**
* Tests for the ProjectSettings.
@@ -295,6 +296,7 @@
protected void setUp() throws Exception {
super.setUp();
InitializeModel.initializeDefault();
+ (new InitProfileSubsystem()).init();
(new InitNotation()).init();
(new InitNotationUml()).init();
(new InitNotationJava()).init();
Modified: trunk/tests/org/argouml/kernel/TestProjectWithProfiles.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/tests/org/argouml/kernel/TestProjectWithProfiles.java?view=diff&rev=13846&p1=trunk/tests/org/argouml/kernel/TestProjectWithProfiles.java&p2=trunk/tests/org/argouml/kernel/TestProjectWithProfiles.java&r1=13845&r2=13846
==============================================================================
--- trunk/tests/org/argouml/kernel/TestProjectWithProfiles.java (original)
+++ trunk/tests/org/argouml/kernel/TestProjectWithProfiles.java 2007-11-27 18:31:26-0800
@@ -36,12 +36,10 @@
import org.argouml.model.Model;
import org.argouml.persistence.AbstractFilePersister;
import org.argouml.persistence.PersistenceManager;
-import org.argouml.uml.profile.Profile;
-import org.argouml.uml.profile.ProfileConfiguration;
-import org.argouml.uml.profile.ProfileJava;
-import org.argouml.uml.profile.ProfileManager;
-import org.argouml.uml.profile.ProfileManagerImpl;
-import org.argouml.uml.profile.ProfileUML;
+import org.argouml.profile.InitProfileSubsystem;
+import org.argouml.profile.Profile;
+import org.argouml.profile.ProfileFacade;
+import org.argouml.profile.ProfileManager;
/**
* Tests the {@link ProjectImpl} with profiles, specifically this enables the
@@ -59,9 +57,7 @@
protected void setUp() throws Exception {
super.setUp();
InitializeModel.initializeMDR();
- ProjectManager.getManager().setCurrentProject(null);
- // FIXME: in the near future we we'll do also:
- //new InitProfileSubsystem().init();
+ new InitProfileSubsystem().init();
if (ApplicationVersion.getVersion() == null) {
Class<?> argoVersionClass =
@@ -72,7 +68,7 @@
assertNotNull(ApplicationVersion.getVersion());
}
}
-
+
public void testCreatedProjectContainsProfileConfiguration() {
Project project = ProjectManager.getManager().makeEmptyProject();
ProfileConfiguration profileConfiguration =
@@ -80,7 +76,7 @@
assertNotNull(profileConfiguration);
assertNotNull(profileConfiguration.getProfiles());
assertTrue(profileConfiguration.getProfiles().contains(
- ProfileUML.getInstance()));
+ ProfileFacade.getManager().getUMLProfile()));
}
/**
@@ -110,11 +106,11 @@
*
* @throws Exception when something goes wrong
*/
- public void xtestRemoveProfileWithModelThatRefersToProfile()
+ public void testRemoveProfileWithModelThatRefersToProfile()
throws Exception {
- ProfileManager profileManager = ProfileManagerImpl.getInstance();
+ ProfileManager profileManager = ProfileFacade.getManager();
Profile javaProfile = profileManager.getProfileForClass(
- ProfileJava.class.getName());
+ "org.argouml.profile.internal.ProfileJava");
if (!profileManager.getDefaultProfiles().contains(javaProfile)) {
profileManager.addToDefaultProfiles(javaProfile);
}
@@ -160,6 +156,7 @@
persister.save(project, file);
project = persister.doLoad(file);
+ project.postLoad();
fooClass = project.findType("Foo", false);
// FIXME: fails here when executed with other tests in Eclipse
assertNotNull(fooClass);
Modified: trunk/tests/org/argouml/model/TestModelEventPump.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/tests/org/argouml/model/TestModelEventPump.java?view=diff&rev=13846&p1=trunk/tests/org/argouml/model/TestModelEventPump.java&p2=trunk/tests/org/argouml/model/TestModelEventPump.java&r1=13845&r2=13846
==============================================================================
--- trunk/tests/org/argouml/model/TestModelEventPump.java (original)
+++ trunk/tests/org/argouml/model/TestModelEventPump.java 2007-11-27 18:31:26-0800
@@ -31,6 +31,7 @@
import org.argouml.kernel.Project;
import org.argouml.kernel.ProjectManager;
+import org.argouml.profile.InitProfileSubsystem;
/**
* Test delivery of Model events.
@@ -81,6 +82,7 @@
super.setUp();
elem = Model.getCoreFactory().createClass();
+ new InitProfileSubsystem().init();
Project project = ProjectManager.getManager().getCurrentProject();
Object model = project.getRoot();
Model.getCoreHelper().addOwnedElement(model, elem);
Modified: trunk/tests/org/argouml/notation/TestNotationProvider.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/tests/org/argouml/notation/TestNotationProvider.java?view=diff&rev=13846&p1=trunk/tests/org/argouml/notation/TestNotationProvider.java&p2=trunk/tests/org/argouml/notation/TestNotationProvider.java&r1=13845&r2=13846
==============================================================================
--- trunk/tests/org/argouml/notation/TestNotationProvider.java (original)
+++ trunk/tests/org/argouml/notation/TestNotationProvider.java 2007-11-27 18:31:26-0800
@@ -35,6 +35,7 @@
import org.argouml.kernel.ProjectManager;
import org.argouml.model.InitializeModel;
import org.argouml.model.Model;
+import org.argouml.profile.InitProfileSubsystem;
/**
* @author Michiel
@@ -49,6 +50,7 @@
public void setUp() throws Exception {
super.setUp();
InitializeModel.initializeDefault();
+ new InitProfileSubsystem().init();
}
private Object aClass;
Modified: trunk/tests/org/argouml/notation/providers/TestNotationProviderFactory2.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/tests/org/argouml/notation/providers/TestNotationProviderFactory2.java?view=diff&rev=13846&p1=trunk/tests/org/argouml/notation/providers/TestNotationProviderFactory2.java&p2=trunk/tests/org/argouml/notation/providers/TestNotationProviderFactory2.java&r1=13845&r2=13846
==============================================================================
--- trunk/tests/org/argouml/notation/providers/TestNotationProviderFactory2.java (original)
+++ trunk/tests/org/argouml/notation/providers/TestNotationProviderFactory2.java 2007-11-27 18:31:26-0800
@@ -35,6 +35,7 @@
import org.argouml.notation.Notation;
import org.argouml.notation.NotationName;
import org.argouml.notation.NotationProvider;
+import org.argouml.profile.InitProfileSubsystem;
@@ -53,6 +54,7 @@
*/
protected void setUp() throws Exception {
InitializeModel.initializeDefault();
+ new InitProfileSubsystem().init();
name = Notation.makeNotation(
"Test",
null,
Modified: trunk/tests/org/argouml/notation/providers/java/TestModelElementNameNotationJava.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/tests/org/argouml/notation/providers/java/TestModelElementNameNotationJava.java?view=diff&rev=13846&p1=trunk/tests/org/argouml/notation/providers/java/TestModelElementNameNotationJava.java&p2=trunk/tests/org/argouml/notation/providers/java/TestModelElementNameNotationJava.java&r1=13845&r2=13846
==============================================================================
--- trunk/tests/org/argouml/notation/providers/java/TestModelElementNameNotationJava.java (original)
+++ trunk/tests/org/argouml/notation/providers/java/TestModelElementNameNotationJava.java 2007-11-27 18:31:26-0800
@@ -32,6 +32,7 @@
import org.argouml.kernel.ProjectManager;
import org.argouml.model.Model;
import org.argouml.notation.providers.ModelElementNameNotation;
+import org.argouml.profile.InitProfileSubsystem;
/**
* Tests the ModelElementNameNotationJava class.
@@ -44,6 +45,7 @@
protected void setUp() throws Exception {
super.setUp();
InitializeModel.initializeDefault();
+ new InitProfileSubsystem().init();
theClass = Model.getCoreFactory().buildClass("TheClass", getModel());
}
Modified: trunk/tests/org/argouml/notation/providers/uml/TestAttributeAndOperationNotationUml.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/tests/org/argouml/notation/providers/uml/TestAttributeAndOperationNotationUml.java?view=diff&rev=13846&p1=trunk/tests/org/argouml/notation/providers/uml/TestAttributeAndOperationNotationUml.java&p2=trunk/tests/org/argouml/notation/providers/uml/TestAttributeAndOperationNotationUml.java&r1=13845&r2=13846
==============================================================================
--- trunk/tests/org/argouml/notation/providers/uml/TestAttributeAndOperationNotationUml.java (original)
+++ trunk/tests/org/argouml/notation/providers/uml/TestAttributeAndOperationNotationUml.java 2007-11-27 18:31:26-0800
@@ -39,6 +39,7 @@
import org.argouml.notation.InitNotation;
import org.argouml.notation.NotationProvider;
import org.argouml.notation.providers.java.InitNotationJava;
+import org.argouml.profile.InitProfileSubsystem;
/**
* @author michiel
@@ -116,6 +117,7 @@
* @see junit.framework.TestCase#setUp()
*/
protected void setUp() {
+ (new InitProfileSubsystem()).init();
(new InitNotation()).init();
(new InitNotationUml()).init();
(new InitNotationJava()).init();
Modified: trunk/tests/org/argouml/notation/providers/uml/TestCallStateNotationUml.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/tests/org/argouml/notation/providers/uml/TestCallStateNotationUml.java?view=diff&rev=13846&p1=trunk/tests/org/argouml/notation/providers/uml/TestCallStateNotationUml.java&p2=trunk/tests/org/argouml/notation/providers/uml/TestCallStateNotationUml.java&r1=13845&r2=13846
==============================================================================
--- trunk/tests/org/argouml/notation/providers/uml/TestCallStateNotationUml.java (original)
+++ trunk/tests/org/argouml/notation/providers/uml/TestCallStateNotationUml.java 2007-11-27 18:31:26-0800
@@ -32,6 +32,7 @@
import org.argouml.kernel.ProjectManager;
import org.argouml.model.InitializeModel;
import org.argouml.model.Model;
+import org.argouml.profile.InitProfileSubsystem;
/**
* Test the notation for a CallState.
@@ -60,6 +61,7 @@
*/
protected void setUp() {
InitializeModel.initializeDefault();
+ new InitProfileSubsystem().init();
Object model =
Model.getModelManagementFactory().createModel();
Project p = ProjectManager.getManager().getCurrentProject();
Modified: trunk/tests/org/argouml/notation/providers/uml/TestClassifierRoleNotationUml.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/tests/org/argouml/notation/providers/uml/TestClassifierRoleNotationUml.java?view=diff&rev=13846&p1=trunk/tests/org/argouml/notation/providers/uml/TestClassifierRoleNotationUml.java&p2=trunk/tests/org/argouml/notation/providers/uml/TestClassifierRoleNotationUml.java&r1=13845&r2=13846
==============================================================================
--- trunk/tests/org/argouml/notation/providers/uml/TestClassifierRoleNotationUml.java (original)
+++ trunk/tests/org/argouml/notation/providers/uml/TestClassifierRoleNotationUml.java 2007-11-27 18:31:26-0800
@@ -32,6 +32,7 @@
import org.argouml.model.InitializeModel;
import org.argouml.model.Model;
+import org.argouml.profile.InitProfileSubsystem;
/**
* Test ClassifierRoleNotationUml (formerly ParserDisplay):
@@ -64,6 +65,7 @@
public void setUp() throws Exception {
super.setUp();
InitializeModel.initializeDefault();
+ new InitProfileSubsystem().init();
}
/**
Modified: trunk/tests/org/argouml/notation/providers/uml/TestMessageNotationUml.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/tests/org/argouml/notation/providers/uml/TestMessageNotationUml.java?view=diff&rev=13846&p1=trunk/tests/org/argouml/notation/providers/uml/TestMessageNotationUml.java&p2=trunk/tests/org/argouml/notation/providers/uml/TestMessageNotationUml.java&r1=13845&r2=13846
==============================================================================
--- trunk/tests/org/argouml/notation/providers/uml/TestMessageNotationUml.java (original)
+++ trunk/tests/org/argouml/notation/providers/uml/TestMessageNotationUml.java 2007-11-27 18:31:26-0800
@@ -31,6 +31,7 @@
import org.argouml.model.InitializeModel;
import org.argouml.model.Model;
+import org.argouml.profile.InitProfileSubsystem;
/**
* Test class to test the parsing of a message.<p>
@@ -55,6 +56,7 @@
public void setUp() throws Exception {
super.setUp();
InitializeModel.initializeDefault();
+ new InitProfileSubsystem().init();
}
/**
Modified: trunk/tests/org/argouml/notation/providers/uml/TestStateBodyNotationUml.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/tests/org/argouml/notation/providers/uml/TestStateBodyNotationUml.java?view=diff&rev=13846&p1=trunk/tests/org/argouml/notation/providers/uml/TestStateBodyNotationUml.java&p2=trunk/tests/org/argouml/notation/providers/uml/TestStateBodyNotationUml.java&r1=13845&r2=13846
==============================================================================
--- trunk/tests/org/argouml/notation/providers/uml/TestStateBodyNotationUml.java (original)
+++ trunk/tests/org/argouml/notation/providers/uml/TestStateBodyNotationUml.java 2007-11-27 18:31:26-0800
@@ -33,6 +33,7 @@
import org.argouml.kernel.Project;
import org.argouml.kernel.ProjectManager;
import org.argouml.model.Model;
+import org.argouml.profile.InitProfileSubsystem;
/**
* Test StateBodyNotationUml (formerly ParserDisplay): parsing state body.
@@ -60,6 +61,7 @@
protected void setUp() {
Object model =
Model.getModelManagementFactory().createModel();
+ new InitProfileSubsystem().init();
Project p = ProjectManager.getManager().getCurrentProject();
aClass = Model.getCoreFactory().buildClass(model);
Object returnType = p.getDefaultReturnType();
Modified: trunk/tests/org/argouml/notation/providers/uml/TestTransitionNotationUml.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/tests/org/argouml/notation/providers/uml/TestTransitionNotationUml.java?view=diff&rev=13846&p1=trunk/tests/org/argouml/notation/providers/uml/TestTransitionNotationUml.java&p2=trunk/tests/org/argouml/notation/providers/uml/TestTransitionNotationUml.java&r1=13845&r2=13846
==============================================================================
--- trunk/tests/org/argouml/notation/providers/uml/TestTransitionNotationUml.java (original)
+++ trunk/tests/org/argouml/notation/providers/uml/TestTransitionNotationUml.java 2007-11-27 18:31:26-0800
@@ -33,6 +33,7 @@
import org.argouml.kernel.ProjectManager;
import org.argouml.model.Model;
import org.argouml.notation.NotationProvider;
+import org.argouml.profile.InitProfileSubsystem;
/**
* Test ParserDisplay: parsing transitions.
@@ -60,6 +61,7 @@
protected void setUp() {
InitializeModel.initializeDefault();
assertTrue("Model subsystem init failed.", Model.isInitiated());
+ new InitProfileSubsystem().init();
Project p = ProjectManager.getManager().getCurrentProject();
Object model =
Model.getModelManagementFactory().createModel();
Modified: trunk/tests/org/argouml/persistence/TestXmiFilePersister.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/tests/org/argouml/persistence/TestXmiFilePersister.java?view=diff&rev=13846&p1=trunk/tests/org/argouml/persistence/TestXmiFilePersister.java&p2=trunk/tests/org/argouml/persistence/TestXmiFilePersister.java&r1=13845&r2=13846
==============================================================================
--- trunk/tests/org/argouml/persistence/TestXmiFilePersister.java (original)
+++ trunk/tests/org/argouml/persistence/TestXmiFilePersister.java 2007-11-27 18:31:26-0800
@@ -32,6 +32,7 @@
import org.argouml.kernel.Project;
import org.argouml.kernel.ProjectManager;
import org.argouml.model.Model;
+import org.argouml.profile.InitProfileSubsystem;
/**
* Testclass for the XMIReader. Placeholder for all saving/loading tests
@@ -56,6 +57,7 @@
public void setUp() throws Exception {
super.setUp();
InitializeModel.initializeDefault();
+ new InitProfileSubsystem().init();
}
/**
Modified: trunk/tests/org/argouml/persistence/TestZargoFilePersister.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/tests/org/argouml/persistence/TestZargoFilePersister.java?view=diff&rev=13846&p1=trunk/tests/org/argouml/persistence/TestZargoFilePersister.java&p2=trunk/tests/org/argouml/persistence/TestZargoFilePersister.java&r1=13845&r2=13846
==============================================================================
--- trunk/tests/org/argouml/persistence/TestZargoFilePersister.java (original)
+++ trunk/tests/org/argouml/persistence/TestZargoFilePersister.java 2007-11-27 18:31:26-0800
@@ -39,6 +39,7 @@
import org.argouml.notation.InitNotation;
import org.argouml.notation.providers.java.InitNotationJava;
import org.argouml.notation.providers.uml.InitNotationUml;
+import org.argouml.profile.InitProfileSubsystem;
import org.argouml.uml.diagram.ui.InitDiagramAppearanceUI;
/**
@@ -53,6 +54,7 @@
(new InitNotationUml()).init();
(new InitNotationJava()).init();
(new InitDiagramAppearanceUI()).init();
+ (new InitProfileSubsystem()).init();
}
/**
Modified: trunk/tests/org/argouml/ui/TestDetailsPane.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/tests/org/argouml/ui/TestDetailsPane.java?view=diff&rev=13846&p1=trunk/tests/org/argouml/ui/TestDetailsPane.java&p2=trunk/tests/org/argouml/ui/TestDetailsPane.java&r1=13845&r2=13846
==============================================================================
--- trunk/tests/org/argouml/ui/TestDetailsPane.java (original)
+++ trunk/tests/org/argouml/ui/TestDetailsPane.java 2007-11-27 18:31:26-0800
@@ -31,6 +31,7 @@
import org.argouml.cognitive.ui.TabToDo;
import org.argouml.model.InitializeModel;
import org.argouml.model.Model;
+import org.argouml.profile.InitProfileSubsystem;
import org.argouml.ui.targetmanager.TargetEvent;
import org.argouml.ui.targetmanager.TargetManager;
import org.argouml.uml.diagram.static_structure.ui.UMLClassDiagram;
@@ -56,6 +57,7 @@
public void setUp() throws Exception {
super.setUp();
InitializeModel.initializeDefault();
+ new InitProfileSubsystem().init();
}
/**
Modified: trunk/tests/org/argouml/ui/TestPropertyPanels.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/tests/org/argouml/ui/TestPropertyPanels.java?view=diff&rev=13846&p1=trunk/tests/org/argouml/ui/TestPropertyPanels.java&p2=trunk/tests/org/argouml/ui/TestPropertyPanels.java&r1=13845&r2=13846
==============================================================================
--- trunk/tests/org/argouml/ui/TestPropertyPanels.java (original)
+++ trunk/tests/org/argouml/ui/TestPropertyPanels.java 2007-11-27 18:31:26-0800
@@ -43,6 +43,7 @@
import org.argouml.notation.providers.uml.InitNotationUml;
import org.argouml.persistence.AbstractFilePersister;
import org.argouml.persistence.PersistenceManager;
+import org.argouml.profile.InitProfileSubsystem;
import org.argouml.ui.targetmanager.TargetEvent;
import org.argouml.uml.diagram.ui.InitDiagramAppearanceUI;
import org.argouml.uml.ui.TabProps;
@@ -130,6 +131,7 @@
new InitNotation().init();
(new InitNotationUml()).init();
(new InitNotationJava()).init();
+ (new InitProfileSubsystem()).init();
// constains instances of each modelelement
Modified: trunk/tests/org/argouml/ui/TestStylePanel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/tests/org/argouml/ui/TestStylePanel.java?view=diff&rev=13846&p1=trunk/tests/org/argouml/ui/TestStylePanel.java&p2=trunk/tests/org/argouml/ui/TestStylePanel.java&r1=13845&r2=13846
==============================================================================
--- trunk/tests/org/argouml/ui/TestStylePanel.java (original)
+++ trunk/tests/org/argouml/ui/TestStylePanel.java 2007-11-27 18:31:26-0800
@@ -28,6 +28,7 @@
import org.argouml.model.InitializeModel;
import org.argouml.model.Model;
+import org.argouml.profile.InitProfileSubsystem;
import org.argouml.ui.targetmanager.TargetEvent;
import org.argouml.uml.diagram.static_structure.ui.UMLClassDiagram;
import org.tigris.gef.presentation.FigText;
@@ -76,6 +77,7 @@
public void setUp() throws Exception {
super.setUp();
InitializeModel.initializeDefault();
+ new InitProfileSubsystem().init();
}
/**
Modified: trunk/tests/org/argouml/ui/targetmanager/TestTargetManager.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/tests/org/argouml/ui/targetmanager/TestTargetManager.java?view=diff&rev=13846&p1=trunk/tests/org/argouml/ui/targetmanager/TestTargetManager.java&p2=trunk/tests/org/argouml/ui/targetmanager/TestTargetManager.java&r1=13845&r2=13846
==============================================================================
--- trunk/tests/org/argouml/ui/targetmanager/TestTargetManager.java (original)
+++ trunk/tests/org/argouml/ui/targetmanager/TestTargetManager.java 2007-11-27 18:31:26-0800
@@ -36,6 +36,7 @@
import org.argouml.kernel.ProjectManager;
import org.argouml.model.InitializeModel;
import org.argouml.model.Model;
+import org.argouml.profile.InitProfileSubsystem;
import org.argouml.uml.diagram.ArgoDiagram;
import org.argouml.uml.diagram.ArgoDiagramImpl;
import org.tigris.gef.presentation.Fig;
@@ -789,6 +790,7 @@
*/
protected void setUp() {
InitializeModel.initializeDefault();
+ new InitProfileSubsystem().init();
TargetManager.getInstance().setTarget(null);
}
Modified: trunk/tests/org/argouml/uml/TestProfileJava.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/tests/org/argouml/uml/TestProfileJava.java?view=diff&rev=13846&p1=trunk/tests/org/argouml/uml/TestProfileJava.java&p2=trunk/tests/org/argouml/uml/TestProfileJava.java&r1=13845&r2=13846
==============================================================================
--- trunk/tests/org/argouml/uml/TestProfileJava.java (original)
+++ trunk/tests/org/argouml/uml/TestProfileJava.java 2007-11-27 18:31:26-0800
@@ -28,10 +28,11 @@
import junit.framework.TestCase;
+import org.argouml.kernel.ProfileConfiguration;
import org.argouml.kernel.ProjectManager;
import org.argouml.model.InitializeModel;
import org.argouml.model.Model;
-import org.argouml.uml.profile.ProfileConfiguration;
+import org.argouml.profile.InitProfileSubsystem;
/**
*
@@ -57,6 +58,7 @@
public void setUp() throws Exception {
super.setUp();
InitializeModel.initializeDefault();
+ new InitProfileSubsystem().init();
}
/**
Modified: trunk/tests/org/argouml/uml/diagram/activity/ui/TestUMLActivityDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/tests/org/argouml/uml/diagram/activity/ui/TestUMLActivityDiagram.java?view=diff&rev=13846&p1=trunk/tests/org/argouml/uml/diagram/activity/ui/TestUMLActivityDiagram.java&p2=trunk/tests/org/argouml/uml/diagram/activity/ui/TestUMLActivityDiagram.java&r1=13845&r2=13846
==============================================================================
--- trunk/tests/org/argouml/uml/diagram/activity/ui/TestUMLActivityDiagram.java (original)
+++ trunk/tests/org/argouml/uml/diagram/activity/ui/TestUMLActivityDiagram.java 2007-11-27 18:31:26-0800
@@ -28,6 +28,7 @@
import junit.framework.TestCase;
import org.argouml.model.InitializeModel;
+import org.argouml.profile.InitProfileSubsystem;
/**
* General test methods for UMLActivityDiagrams
@@ -49,6 +50,7 @@
public void setUp() throws Exception {
super.setUp();
InitializeModel.initializeDefault();
+ new InitProfileSubsystem().init();
}
/**
Modified: trunk/tests/org/argouml/uml/diagram/collaboration/ui/TestUMLCollaborationDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/tests/org/argouml/uml/diagram/collaboration/ui/TestUMLCollaborationDiagram.java?view=diff&rev=13846&p1=trunk/tests/org/argouml/uml/diagram/collaboration/ui/TestUMLCollaborationDiagram.java&p2=trunk/tests/org/argouml/uml/diagram/collaboration/ui/TestUMLCollaborationDiagram.java&r1=13845&r2=13846
==============================================================================
--- trunk/tests/org/argouml/uml/diagram/collaboration/ui/TestUMLCollaborationDiagram.java (original)
+++ trunk/tests/org/argouml/uml/diagram/collaboration/ui/TestUMLCollaborationDiagram.java 2007-11-27 18:31:26-0800
@@ -28,6 +28,7 @@
import junit.framework.TestCase;
import org.argouml.model.InitializeModel;
+import org.argouml.profile.InitProfileSubsystem;
/**
@@ -50,6 +51,7 @@
public void setUp() throws Exception {
super.setUp();
InitializeModel.initializeDefault();
+ new InitProfileSubsystem().init();
}
/**
Modified: trunk/tests/org/argouml/uml/diagram/deployment/ui/TestUMLDeploymentDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/tests/org/argouml/uml/diagram/deployment/ui/TestUMLDeploymentDiagram.java?view=diff&rev=13846&p1=trunk/tests/org/argouml/uml/diagram/deployment/ui/TestUMLDeploymentDiagram.java&p2=trunk/tests/org/argouml/uml/diagram/deployment/ui/TestUMLDeploymentDiagram.java&r1=13845&r2=13846
==============================================================================
--- trunk/tests/org/argouml/uml/diagram/deployment/ui/TestUMLDeploymentDiagram.java (original)
+++ trunk/tests/org/argouml/uml/diagram/deployment/ui/TestUMLDeploymentDiagram.java 2007-11-27 18:31:26-0800
@@ -26,6 +26,7 @@
import junit.framework.TestCase;
import org.argouml.model.InitializeModel;
+import org.argouml.profile.InitProfileSubsystem;
import org.argouml.uml.diagram.deployment.DeploymentDiagramGraphModel;
@@ -50,6 +51,7 @@
public void setUp() throws Exception {
super.setUp();
InitializeModel.initializeDefault();
+ new InitProfileSubsystem().init();
}
/**
Modified: trunk/tests/org/argouml/uml/diagram/state/ui/TestFigClonable.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/tests/org/argouml/uml/diagram/state/ui/TestFigClonable.java?view=diff&rev=13846&p1=trunk/tests/org/argouml/uml/diagram/state/ui/TestFigClonable.java&p2=trunk/tests/org/argouml/uml/diagram/state/ui/TestFigClonable.java&r1=13845&r2=13846
==============================================================================
--- trunk/tests/org/argouml/uml/diagram/state/ui/TestFigClonable.java (original)
+++ trunk/tests/org/argouml/uml/diagram/state/ui/TestFigClonable.java 2007-11-27 18:31:26-0800
@@ -26,6 +26,7 @@
import junit.framework.TestCase;
import org.argouml.model.InitializeModel;
+import org.argouml.profile.InitProfileSubsystem;
/**
* Tests whether Figs in state.ui are clonable,
@@ -49,6 +50,7 @@
public void setUp() throws Exception {
super.setUp();
InitializeModel.initializeDefault();
+ new InitProfileSubsystem().init();
}
/**
Modified: trunk/tests/org/argouml/uml/diagram/state/ui/TestUMLStateDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/tests/org/argouml/uml/diagram/state/ui/TestUMLStateDiagram.java?view=diff&rev=13846&p1=trunk/tests/org/argouml/uml/diagram/state/ui/TestUMLStateDiagram.java&p2=trunk/tests/org/argouml/uml/diagram/state/ui/TestUMLStateDiagram.java&r1=13845&r2=13846
==============================================================================
--- trunk/tests/org/argouml/uml/diagram/state/ui/TestUMLStateDiagram.java (original)
+++ trunk/tests/org/argouml/uml/diagram/state/ui/TestUMLStateDiagram.java 2007-11-27 18:31:26-0800
@@ -28,6 +28,7 @@
import junit.framework.TestCase;
import org.argouml.model.InitializeModel;
+import org.argouml.profile.InitProfileSubsystem;
/**
* General test methods for UMLUseCaseDiagrams
@@ -49,6 +50,7 @@
public void setUp() throws Exception {
super.setUp();
InitializeModel.initializeDefault();
+ new InitProfileSubsystem().init();
}
/**
Modified: trunk/tests/org/argouml/uml/diagram/static_structure/ui/TestUMLClassDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/tests/org/argouml/uml/diagram/static_structure/ui/TestUMLClassDiagram.java?view=diff&rev=13846&p1=trunk/tests/org/argouml/uml/diagram/static_structure/ui/TestUMLClassDiagram.java&p2=trunk/tests/org/argouml/uml/diagram/static_structure/ui/TestUMLClassDiagram.java&r1=13845&r2=13846
==============================================================================
--- trunk/tests/org/argouml/uml/diagram/static_structure/ui/TestUMLClassDiagram.java (original)
+++ trunk/tests/org/argouml/uml/diagram/static_structure/ui/TestUMLClassDiagram.java 2007-11-27 18:31:26-0800
@@ -33,6 +33,7 @@
import org.argouml.notation.InitNotation;
import org.argouml.notation.providers.java.InitNotationJava;
import org.argouml.notation.providers.uml.InitNotationUml;
+import org.argouml.profile.InitProfileSubsystem;
import org.argouml.uml.diagram.static_structure.ClassDiagramGraphModel;
import org.tigris.gef.graph.GraphModel;
import org.tigris.gef.presentation.Fig;
@@ -64,6 +65,7 @@
(new InitNotationJava()).init();
InitializeModel.initializeDefault();
+ new InitProfileSubsystem().init();
nodeTypes =
new Object[] {
Model.getCoreFactory().createClass(),
Modified: trunk/tests/org/argouml/uml/diagram/use_case/ui/TestFigClonable.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/tests/org/argouml/uml/diagram/use_case/ui/TestFigClonable.java?view=diff&rev=13846&p1=trunk/tests/org/argouml/uml/diagram/use_case/ui/TestFigClonable.java&p2=trunk/tests/org/argouml/uml/diagram/use_case/ui/TestFigClonable.java&r1=13845&r2=13846
==============================================================================
--- trunk/tests/org/argouml/uml/diagram/use_case/ui/TestFigClonable.java (original)
+++ trunk/tests/org/argouml/uml/diagram/use_case/ui/TestFigClonable.java 2007-11-27 18:31:26-0800
@@ -26,6 +26,7 @@
import junit.framework.TestCase;
import org.argouml.model.InitializeModel;
+import org.argouml.profile.InitProfileSubsystem;
/**
* Test if a Fig is cloneable.
@@ -47,6 +48,7 @@
public void setUp() throws Exception {
super.setUp();
InitializeModel.initializeDefault();
+ new InitProfileSubsystem().init();
}
/**
Modified: trunk/tests/org/argouml/uml/diagram/use_case/ui/TestUMLUseCaseDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/tests/org/argouml/uml/diagram/use_case/ui/TestUMLUseCaseDiagram.java?view=diff&rev=13846&p1=trunk/tests/org/argouml/uml/diagram/use_case/ui/TestUMLUseCaseDiagram.java&p2=trunk/tests/org/argouml/uml/diagram/use_case/ui/TestUMLUseCaseDiagram.java&r1=13845&r2=13846
==============================================================================
--- trunk/tests/org/argouml/uml/diagram/use_case/ui/TestUMLUseCaseDiagram.java (original)
+++ trunk/tests/org/argouml/uml/diagram/use_case/ui/TestUMLUseCaseDiagram.java 2007-11-27 18:31:26-0800
@@ -28,6 +28,7 @@
import junit.framework.TestCase;
import org.argouml.model.InitializeModel;
+import org.argouml.profile.InitProfileSubsystem;
/**
* General test methods for UMLUseCaseDiagrams
@@ -49,6 +50,7 @@
public void setUp() throws Exception {
super.setUp();
InitializeModel.initializeDefault();
+ new InitProfileSubsystem().init();
}
/**
Modified: trunk/tests/org/argouml/uml/reveng/TestJavaImportClass.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/tests/org/argouml/uml/reveng/TestJavaImportClass.java?view=diff&rev=13846&p1=trunk/tests/org/argouml/uml/reveng/TestJavaImportClass.java&p2=trunk/tests/org/argouml/uml/reveng/TestJavaImportClass.java&r1=13845&r2=13846
==============================================================================
--- trunk/tests/org/argouml/uml/reveng/TestJavaImportClass.java (original)
+++ trunk/tests/org/argouml/uml/reveng/TestJavaImportClass.java 2007-11-27 18:31:26-0800
@@ -30,6 +30,7 @@
import junit.framework.TestCase;
import org.argouml.model.InitializeModel;
import org.argouml.model.Model;
+import org.argouml.profile.InitProfileSubsystem;
import org.argouml.uml.reveng.java.JavaLexer;
import org.argouml.uml.reveng.java.JavaRecognizer;
import org.argouml.uml.reveng.java.Modeller;
@@ -76,6 +77,7 @@
assertNotNull("Creation of model failed.", parsedModel);
Model.getModelManagementFactory().setRootModel(parsedModel);
+ new InitProfileSubsystem().init();
Modeller modeller =
new Modeller(parsedModel, new DummyImportSettings(),
Modified: trunk/tests/org/argouml/uml/reveng/TestJavaImportEnumeration.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/tests/org/argouml/uml/reveng/TestJavaImportEnumeration.java?view=diff&rev=13846&p1=trunk/tests/org/argouml/uml/reveng/TestJavaImportEnumeration.java&p2=trunk/tests/org/argouml/uml/reveng/TestJavaImportEnumeration.java&r1=13845&r2=13846
==============================================================================
--- trunk/tests/org/argouml/uml/reveng/TestJavaImportEnumeration.java (original)
+++ trunk/tests/org/argouml/uml/reveng/TestJavaImportEnumeration.java 2007-11-27 18:31:26-0800
@@ -32,6 +32,7 @@
import org.argouml.model.InitializeModel;
import org.argouml.model.Model;
+import org.argouml.profile.InitProfileSubsystem;
import org.argouml.uml.reveng.java.JavaLexer;
import org.argouml.uml.reveng.java.JavaRecognizer;
import org.argouml.uml.reveng.java.Modeller;
@@ -78,6 +79,7 @@
assertNotNull("Creation of model failed.", parsedModel);
Model.getModelManagementFactory().setRootModel(parsedModel);
+ new InitProfileSubsystem().init();
Modeller modeller = new Modeller(parsedModel,
new DummyImportSettings(), "TestClass.java");
Modified: trunk/tests/org/argouml/uml/reveng/TestJavaImportInterface.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/tests/org/argouml/uml/reveng/TestJavaImportInterface.java?view=diff&rev=13846&p1=trunk/tests/org/argouml/uml/reveng/TestJavaImportInterface.java&p2=trunk/tests/org/argouml/uml/reveng/TestJavaImportInterface.java&r1=13845&r2=13846
==============================================================================
--- trunk/tests/org/argouml/uml/reveng/TestJavaImportInterface.java (original)
+++ trunk/tests/org/argouml/uml/reveng/TestJavaImportInterface.java 2007-11-27 18:31:26-0800
@@ -30,6 +30,7 @@
import junit.framework.TestCase;
import org.argouml.model.InitializeModel;
import org.argouml.model.Model;
+import org.argouml.profile.InitProfileSubsystem;
import org.argouml.uml.reveng.java.JavaLexer;
import org.argouml.uml.reveng.java.JavaRecognizer;
import org.argouml.uml.reveng.java.Modeller;
@@ -76,6 +77,7 @@
assertNotNull("Creation of model failed.", parsedModel);
Model.getModelManagementFactory().setRootModel(parsedModel);
+ new InitProfileSubsystem().init();
Modeller modeller =
new Modeller(parsedModel, new DummyImportSettings(),
Modified: trunk/tests/org/argouml/uml/reveng/TestJavaImportUnicode.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/tests/org/argouml/uml/reveng/TestJavaImportUnicode.java?view=diff&rev=13846&p1=trunk/tests/org/argouml/uml/reveng/TestJavaImportUnicode.java&p2=trunk/tests/org/argouml/uml/reveng/TestJavaImportUnicode.java&r1=13845&r2=13846
==============================================================================
--- trunk/tests/org/argouml/uml/reveng/TestJavaImportUnicode.java (original)
+++ trunk/tests/org/argouml/uml/reveng/TestJavaImportUnicode.java 2007-11-27 18:31:26-0800
@@ -33,6 +33,7 @@
import org.argouml.kernel.Project;
import org.argouml.kernel.ProjectManager;
import org.argouml.model.Model;
+import org.argouml.profile.InitProfileSubsystem;
import org.argouml.uml.reveng.java.JavaLexer;
import org.argouml.uml.reveng.java.JavaRecognizer;
import org.argouml.uml.reveng.java.Modeller;
@@ -57,6 +58,7 @@
public TestJavaImportUnicode(String str) {
super(str);
InitializeModel.initializeDefault();
+ new InitProfileSubsystem().init();
}
/*
@@ -84,6 +86,7 @@
assertNotNull("Creation of model failed.", parsedModel);
Model.getModelManagementFactory().setRootModel(parsedModel);
+ new InitProfileSubsystem().init();
assertEquals("Setting Root Model failed",
Model.getModelManagementFactory().getRootModel(),
Modified: trunk/tests/org/argouml/uml/ui/AbstractTestActionAddDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/tests/org/argouml/uml/ui/AbstractTestActionAddDiagram.java?view=diff&rev=13846&p1=trunk/tests/org/argouml/uml/ui/AbstractTestActionAddDiagram.java&p2=trunk/tests/org/argouml/uml/ui/AbstractTestActionAddDiagram.java&r1=13845&r2=13846
==============================================================================
--- trunk/tests/org/argouml/uml/ui/AbstractTestActionAddDiagram.java (original)
+++ trunk/tests/org/argouml/uml/ui/AbstractTestActionAddDiagram.java 2007-11-27 18:31:26-0800
@@ -35,6 +35,7 @@
import org.argouml.notation.InitNotation;
import org.argouml.notation.providers.java.InitNotationJava;
import org.argouml.notation.providers.uml.InitNotationUml;
+import org.argouml.profile.InitProfileSubsystem;
import org.argouml.uml.diagram.ArgoDiagram;
import org.argouml.uml.diagram.UMLMutableGraphSupport;
@@ -75,6 +76,7 @@
(new InitNotation()).init();
(new InitNotationUml()).init();
(new InitNotationJava()).init();
+ (new InitProfileSubsystem()).init();
action = getAction();
Modified: trunk/tests/org/argouml/uml/ui/MockUMLUserInterfaceContainer.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/tests/org/argouml/uml/ui/MockUMLUserInterfaceContainer.java?view=diff&rev=13846&p1=trunk/tests/org/argouml/uml/ui/MockUMLUserInterfaceContainer.java&p2=trunk/tests/org/argouml/uml/ui/MockUMLUserInterfaceContainer.java&r1=13845&r2=13846
==============================================================================
--- trunk/tests/org/argouml/uml/ui/MockUMLUserInterfaceContainer.java (original)
+++ trunk/tests/org/argouml/uml/ui/MockUMLUserInterfaceContainer.java 2007-11-27 18:31:26-0800
@@ -26,7 +26,7 @@
import java.util.Iterator;
-import org.argouml.uml.profile.ProfileConfiguration;
+import org.argouml.kernel.ProfileConfiguration;
/**
* @since Oct 12, 2002
Modified: trunk/tests/org/argouml/uml/ui/TestActionCollaborationDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/tests/org/argouml/uml/ui/TestActionCollaborationDiagram.java?view=diff&rev=13846&p1=trunk/tests/org/argouml/uml/ui/TestActionCollaborationDiagram.java&p2=trunk/tests/org/argouml/uml/ui/TestActionCollaborationDiagram.java&r1=13845&r2=13846
==============================================================================
--- trunk/tests/org/argouml/uml/ui/TestActionCollaborationDiagram.java (original)
+++ trunk/tests/org/argouml/uml/ui/TestActionCollaborationDiagram.java 2007-11-27 18:31:26-0800
@@ -33,6 +33,7 @@
import org.argouml.kernel.ProjectManager;
import org.argouml.model.Model;
+import org.argouml.profile.InitProfileSubsystem;
import org.argouml.ui.targetmanager.TargetManager;
import org.argouml.uml.diagram.ArgoDiagram;
import org.argouml.uml.diagram.UMLMutableGraphSupport;
@@ -102,6 +103,7 @@
*/
protected void setUp() {
InitializeModel.initializeDefault();
+ new InitProfileSubsystem().init();
action = getAction();
ns = getNamespace();
validNamespaces = getValidNamespaceClasses();
Modified: trunk/tests/org/argouml/uml/ui/TestActionStateDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/tests/org/argouml/uml/ui/TestActionStateDiagram.java?view=diff&rev=13846&p1=trunk/tests/org/argouml/uml/ui/TestActionStateDiagram.java&p2=trunk/tests/org/argouml/uml/ui/TestActionStateDiagram.java&r1=13845&r2=13846
==============================================================================
--- trunk/tests/org/argouml/uml/ui/TestActionStateDiagram.java (original)
+++ trunk/tests/org/argouml/uml/ui/TestActionStateDiagram.java 2007-11-27 18:31:26-0800
@@ -33,6 +33,7 @@
import org.argouml.kernel.ProjectManager;
import org.argouml.model.Model;
+import org.argouml.profile.InitProfileSubsystem;
import org.argouml.ui.targetmanager.TargetManager;
import org.argouml.uml.diagram.ArgoDiagram;
import org.argouml.uml.diagram.UMLMutableGraphSupport;
@@ -71,6 +72,7 @@
public TestActionStateDiagram(String arg0) {
super(arg0);
InitializeModel.initializeDefault();
+ new InitProfileSubsystem().init();
}
/*
Modified: trunk/tests/org/argouml/uml/ui/TestSourcePathController.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/tests/org/argouml/uml/ui/TestSourcePathController.java?view=diff&rev=13846&p1=trunk/tests/org/argouml/uml/ui/TestSourcePathController.java&p2=trunk/tests/org/argouml/uml/ui/TestSourcePathController.java&r1=13845&r2=13846
==============================================================================
--- trunk/tests/org/argouml/uml/ui/TestSourcePathController.java (original)
+++ trunk/tests/org/argouml/uml/ui/TestSourcePathController.java 2007-11-27 18:31:26-0800
@@ -30,6 +30,7 @@
import org.argouml.kernel.ProjectManager;
import org.argouml.model.Model;
+import org.argouml.profile.InitProfileSubsystem;
import org.argouml.uml.reveng.ImportInterface;
/**
@@ -75,6 +76,7 @@
protected void setUp() {
modelElemSourcePath = "ArgoUML/issues2579/src";
// setup the Project due to its use in SourcePathTableModel ctor
+ new InitProfileSubsystem().init();
ProjectManager.getManager().makeEmptyProject();
model = ProjectManager.getManager().getCurrentProject().getRoot();
Object taggedValue = Model.getExtensionMechanismsFactory()
Modified: trunk/tests/org/argouml/uml/ui/TestUMLTagDefinitionComboBoxModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/tests/org/argouml/uml/ui/TestUMLTagDefinitionComboBoxModel.java?view=diff&rev=13846&p1=trunk/tests/org/argouml/uml/ui/TestUMLTagDefinitionComboBoxModel.java&p2=trunk/tests/org/argouml/uml/ui/TestUMLTagDefinitionComboBoxModel.java&r1=13845&r2=13846
==============================================================================
--- trunk/tests/org/argouml/uml/ui/TestUMLTagDefinitionComboBoxModel.java (original)
+++ trunk/tests/org/argouml/uml/ui/TestUMLTagDefinitionComboBoxModel.java 2007-11-27 18:31:26-0800
@@ -32,6 +32,7 @@
import junit.framework.TestCase;
import org.argouml.model.InitializeModel;
+import org.argouml.profile.InitProfileSubsystem;
/**
* Test cases for the UMLTagDefinitionComboBoxModel class.
@@ -69,6 +70,7 @@
protected void setUp() throws Exception {
super.setUp();
InitializeModel.initializeDefault();
+ new InitProfileSubsystem().init();
proj = ProjectManager.getManager().getCurrentProject();
model = proj.getModel();
Modified: trunk/tests/org/argouml/uml/ui/behavior/collaborations/TestUMLAssociationRoleBaseComboBoxModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/tests/org/argouml/uml/ui/behavior/collaborations/TestUMLAssociationRoleBaseComboBoxModel.java?view=diff&rev=13846&p1=trunk/tests/org/argouml/uml/ui/behavior/collaborations/TestUMLAssociationRoleBaseComboBoxModel.java&p2=trunk/tests/org/argouml/uml/ui/behavior/collaborations/TestUMLAssociationRoleBaseComboBoxModel.java&r1=13845&r2=13846
==============================================================================
--- trunk/tests/org/argouml/uml/ui/behavior/collaborations/TestUMLAssociationRoleBaseComboBoxModel.java (original)
+++ trunk/tests/org/argouml/uml/ui/behavior/collaborations/TestUMLAssociationRoleBaseComboBoxModel.java 2007-11-27 18:31:26-0800
@@ -30,6 +30,7 @@
import org.argouml.kernel.Project;
import org.argouml.kernel.ProjectManager;
import org.argouml.model.Model;
+import org.argouml.profile.InitProfileSubsystem;
import org.argouml.ui.targetmanager.TargetEvent;
/**
@@ -73,6 +74,7 @@
protected void setUp() throws Exception {
super.setUp();
InitializeModel.initializeDefault();
+ new InitProfileSubsystem().init();
Project p = ProjectManager.getManager().getCurrentProject();
model = new UMLAssociationRoleBaseComboBoxModel();
Modified: trunk/tests/org/argouml/uml/ui/behavior/collaborations/TestUMLCollaborationRepresentedClassifierComboBoxModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/tests/org/argouml/uml/ui/behavior/collaborations/TestUMLCollaborationRepresentedClassifierComboBoxModel.java?view=diff&rev=13846&p1=trunk/tests/org/argouml/uml/ui/behavior/collaborations/TestUMLCollaborationRepresentedClassifierComboBoxModel.java&p2=trunk/tests/org/argouml/uml/ui/behavior/collaborations/TestUMLCollaborationRepresentedClassifierComboBoxModel.java&r1=13845&r2=13846
==============================================================================
--- trunk/tests/org/argouml/uml/ui/behavior/collaborations/TestUMLCollaborationRepresentedClassifierComboBoxModel.java (original)
+++ trunk/tests/org/argouml/uml/ui/behavior/collaborations/TestUMLCollaborationRepresentedClassifierComboBoxModel.java 2007-11-27 18:31:26-0800
@@ -30,6 +30,7 @@
import org.argouml.kernel.Project;
import org.argouml.kernel.ProjectManager;
import org.argouml.model.Model;
+import org.argouml.profile.InitProfileSubsystem;
import org.argouml.ui.targetmanager.TargetEvent;
import org.argouml.ui.targetmanager.TargetManager;
@@ -53,6 +54,7 @@
public TestUMLCollaborationRepresentedClassifierComboBoxModel(String arg0) {
super(arg0);
InitializeModel.initializeDefault();
+ new InitProfileSubsystem().init();
}
/*
Modified: trunk/tests/org/argouml/uml/ui/behavior/collaborations/TestUMLCollaborationRepresentedOperationComboBoxModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/tests/org/argouml/uml/ui/behavior/collaborations/TestUMLCollaborationRepresentedOperationComboBoxModel.java?view=diff&rev=13846&p1=trunk/tests/org/argouml/uml/ui/behavior/collaborations/TestUMLCollaborationRepresentedOperationComboBoxModel.java&p2=trunk/tests/org/argouml/uml/ui/behavior/collaborations/TestUMLCollaborationRepresentedOperationComboBoxModel.java&r1=13845&r2=13846
==============================================================================
--- trunk/tests/org/argouml/uml/ui/behavior/collaborations/TestUMLCollaborationRepresentedOperationComboBoxModel.java (original)
+++ trunk/tests/org/argouml/uml/ui/behavior/collaborations/TestUMLCollaborationRepresentedOperationComboBoxModel.java 2007-11-27 18:31:26-0800
@@ -30,6 +30,7 @@
import org.argouml.kernel.Project;
import org.argouml.kernel.ProjectManager;
import org.argouml.model.Model;
+import org.argouml.profile.InitProfileSubsystem;
import org.argouml.ui.targetmanager.TargetEvent;
import org.argouml.ui.targetmanager.TargetManager;
@@ -52,6 +53,7 @@
public TestUMLCollaborationRepresentedOperationComboBoxModel(String arg0) {
super(arg0);
InitializeModel.initializeDefault();
+ new InitProfileSubsystem().init();
}
/*
Modified: trunk/tests/org/argouml/uml/ui/behavior/common_behavior/TestUMLReceptionSignalComboBoxModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/tests/org/argouml/uml/ui/behavior/common_behavior/TestUMLReceptionSignalComboBoxModel.java?view=diff&rev=13846&p1=trunk/tests/org/argouml/uml/ui/behavior/common_behavior/TestUMLReceptionSignalComboBoxModel.java&p2=trunk/tests/org/argouml/uml/ui/behavior/common_behavior/TestUMLReceptionSignalComboBoxModel.java&r1=13845&r2=13846
==============================================================================
--- trunk/tests/org/argouml/uml/ui/behavior/common_behavior/TestUMLReceptionSignalComboBoxModel.java (original)
+++ trunk/tests/org/argouml/uml/ui/behavior/common_behavior/TestUMLReceptionSignalComboBoxModel.java 2007-11-27 18:31:26-0800
@@ -30,6 +30,7 @@
import org.argouml.kernel.Project;
import org.argouml.kernel.ProjectManager;
import org.argouml.model.Model;
+import org.argouml.profile.InitProfileSubsystem;
import org.argouml.ui.targetmanager.TargetEvent;
/**
@@ -74,6 +75,7 @@
protected void setUp() throws Exception {
super.setUp();
InitializeModel.initializeDefault();
+ new InitProfileSubsystem().init();
Project p = ProjectManager.getManager().getCurrentProject();
elem = Model.getCommonBehaviorFactory().createReception();
signals = new Object[NO_OF_ELEMENTS];
Modified: trunk/tests/org/argouml/uml/ui/foundation/core/TestUMLGeneralizationPowertypeComboBoxModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/tests/org/argouml/uml/ui/foundation/core/TestUMLGeneralizationPowertypeComboBoxModel.java?view=diff&rev=13846&p1=trunk/tests/org/argouml/uml/ui/foundation/core/TestUMLGeneralizationPowertypeComboBoxModel.java&p2=trunk/tests/org/argouml/uml/ui/foundation/core/TestUMLGeneralizationPowertypeComboBoxModel.java&r1=13845&r2=13846
==============================================================================
--- trunk/tests/org/argouml/uml/ui/foundation/core/TestUMLGeneralizationPowertypeComboBoxModel.java (original)
+++ trunk/tests/org/argouml/uml/ui/foundation/core/TestUMLGeneralizationPowertypeComboBoxModel.java 2007-11-27 18:31:26-0800
@@ -30,6 +30,7 @@
import org.apache.log4j.Logger;
import org.argouml.kernel.ProjectManager;
import org.argouml.model.Model;
+import org.argouml.profile.InitProfileSubsystem;
import org.argouml.ui.targetmanager.TargetEvent;
/**
@@ -93,6 +94,7 @@
protected void setUp() throws Exception {
super.setUp();
InitializeModel.initializeDefault();
+ new InitProfileSubsystem().init();
Object mmodel =
Model.getModelManagementFactory().createModel();
Model.getCoreHelper().setName(mmodel, "untitledModel");
Modified: trunk/tests/org/argouml/uml/ui/foundation/core/TestUMLStructuralFeatureTypeComboBoxModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/tests/org/argouml/uml/ui/foundation/core/TestUMLStructuralFeatureTypeComboBoxModel.java?view=diff&rev=13846&p1=trunk/tests/org/argouml/uml/ui/foundation/core/TestUMLStructuralFeatureTypeComboBoxModel.java&p2=trunk/tests/org/argouml/uml/ui/foundation/core/TestUMLStructuralFeatureTypeComboBoxModel.java&r1=13845&r2=13846
==============================================================================
--- trunk/tests/org/argouml/uml/ui/foundation/core/TestUMLStructuralFeatureTypeComboBoxModel.java (original)
+++ trunk/tests/org/argouml/uml/ui/foundation/core/TestUMLStructuralFeatureTypeComboBoxModel.java 2007-11-27 18:31:26-0800
@@ -29,6 +29,7 @@
import org.argouml.kernel.ProjectManager;
import org.argouml.model.Model;
+import org.argouml.profile.InitProfileSubsystem;
import org.argouml.ui.targetmanager.TargetEvent;
/**
@@ -71,6 +72,7 @@
protected void setUp() throws Exception {
super.setUp();
InitializeModel.initializeDefault();
+ new InitProfileSubsystem().init();
Object mmodel =
Model.getModelManagementFactory().createModel();
Model.getCoreHelper().setName(mmodel, "untitledModel");