Author: thn
Date: 2010-12-08 01:53:33-0800
New Revision: 18902
Modified:
trunk/src/argouml-app/src/org/argouml/persistence/ModelMemberFilePersister.java
trunk/src/argouml-app/src/org/argouml/profile/UserDefinedProfile.java
trunk/src/argouml-app/src/org/argouml/profile/internal/ProfileUML.java
trunk/src/argouml-app/src/org/argouml/ui/explorer/ActionDeployProfile.java
Log:
UML2 only: don't define a profile when loading it, from now on only define it when it is actively deployed by the user
Modified: trunk/src/argouml-app/src/org/argouml/persistence/ModelMemberFilePersister.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/persistence/ModelMemberFilePersister.java?view=diff&pathrev=18902&r1=18901&r2=18902
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/persistence/ModelMemberFilePersister.java (original)
+++ trunk/src/argouml-app/src/org/argouml/persistence/ModelMemberFilePersister.java 2010-12-08 01:53:33-0800
@@ -164,7 +164,7 @@
ProjectMemberModel pmm = (ProjectMemberModel) member;
Object model = pmm.getModel();
- // Next time I make such a change, I should better comment it: (thn)
+ // For now, this must only be done in ActionDeployProfile: (thn)
/*
if (Model.getFacade().getUmlVersion().charAt(0) == '2' &&
Model.getFacade().isAProfile(model)) {
Modified: trunk/src/argouml-app/src/org/argouml/profile/UserDefinedProfile.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/profile/UserDefinedProfile.java?view=diff&pathrev=18902&r1=18901&r2=18902
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/profile/UserDefinedProfile.java (original)
+++ trunk/src/argouml-app/src/org/argouml/profile/UserDefinedProfile.java 2010-12-08 01:53:33-0800
@@ -458,10 +458,11 @@
for (Object object: packages) {
if (Model.getFacade().isAPackage(object)) {
- if (Model.getFacade().isAProfile(object)) {
- object = Model.getExtensionMechanismsHelper()
- .makeProfileApplicable(object);
- }
+ // For now, this must only be done in ActionDeployProfile: (thn)
+ //if (Model.getFacade().isAProfile(object)) {
+ // object = Model.getExtensionMechanismsHelper()
+ // .makeProfileApplicable(object);
+ //}
ret.add(object);
}
}
Modified: trunk/src/argouml-app/src/org/argouml/profile/internal/ProfileUML.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/profile/internal/ProfileUML.java?view=diff&pathrev=18902&r1=18901&r2=18902
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/profile/internal/ProfileUML.java (original)
+++ trunk/src/argouml-app/src/org/argouml/profile/internal/ProfileUML.java 2010-12-08 01:53:33-0800
@@ -155,9 +155,10 @@
model.add(Model.getModelManagementFactory().createProfile());
}
- for (Object p : model) {
- Model.getExtensionMechanismsHelper().makeProfileApplicable(p);
- }
+ // For now, this must only be done in ActionDeployProfile: (thn)
+ //for (Object p : model) {
+ // Model.getExtensionMechanismsHelper().makeProfileApplicable(p);
+ //}
}
return model;
}
Modified: trunk/src/argouml-app/src/org/argouml/ui/explorer/ActionDeployProfile.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/ui/explorer/ActionDeployProfile.java?view=diff&pathrev=18902&r1=18901&r2=18902
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/ui/explorer/ActionDeployProfile.java (original)
+++ trunk/src/argouml-app/src/org/argouml/ui/explorer/ActionDeployProfile.java 2010-12-08 01:53:33-0800
@@ -136,6 +136,8 @@
if (result == JFileChooser.APPROVE_OPTION) {
theFile = chooser.getSelectedFile();
if (theFile != null) {
+ Model.getExtensionMechanismsHelper().makeProfileApplicable(
+ undeployedProfile);
String name = theFile.getName();
name = pm.fixXmiExtension(name);
theFile = new File(theFile.getParent(), name);
------------------------------------------------------
http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=2688716
To unsubscribe from this discussion, e-mail: [[email protected]].
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.