Author: maurelio1234
Date: 2007-06-16 04:57:03-0700
New Revision: 12859
Modified:
branches/gsoc2007/maurelio1234/argouml/org/argouml/kernel/Project.java
branches/gsoc2007/maurelio1234/argouml/org/argouml/persistence/ModelMemberFilePersister.java
branches/gsoc2007/maurelio1234/argouml/org/argouml/persistence/UmlFilePersister.java
branches/gsoc2007/maurelio1234/argouml/org/argouml/persistence/ZipFilePersister.java
branches/gsoc2007/maurelio1234/argouml/org/argouml/ui/ProfileSelectionTab.java
Log:
minor changes to support profile persistence
Modified: branches/gsoc2007/maurelio1234/argouml/org/argouml/kernel/Project.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/argouml/org/argouml/kernel/Project.java?view=diff&rev=12859&p1=branches/gsoc2007/maurelio1234/argouml/org/argouml/kernel/Project.java&p2=branches/gsoc2007/maurelio1234/argouml/org/argouml/kernel/Project.java&r1=12858&r2=12859
==============================================================================
--- branches/gsoc2007/maurelio1234/argouml/org/argouml/kernel/Project.java (original)
+++ branches/gsoc2007/maurelio1234/argouml/org/argouml/kernel/Project.java 2007-06-16 04:57:03-0700
@@ -169,9 +169,10 @@
* Constructor.
*/
public Project() {
- profileConfiguration = new ProfileConfiguration();
- projectSettings = new ProjectSettings();
+ setProfileConfiguration(new ProfileConfiguration(this));
+ projectSettings = new ProjectSettings();
+
Model.getModelManagementFactory().setRootModel(null);
authorname = Configuration.getString(Argo.KEY_USER_FULLNAME);
@@ -1390,6 +1391,21 @@
}
/**
+ * Sets the profile configuration
+ */
+ public void setProfileConfiguration(ProfileConfiguration pc) {
+ if (this.profileConfiguration != null) {
+ this.members.remove(this.profileConfiguration);
+ }
+
+ this.profileConfiguration = pc;
+
+ // there's just one ProfileConfiguration in a project
+ // and there's no other way to add another one
+ members.add(pc);
+ }
+
+ /**
* Repair all parts of the project before a save takes place.
* @return a report of any fixes
*/
Modified: branches/gsoc2007/maurelio1234/argouml/org/argouml/persistence/ModelMemberFilePersister.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/argouml/org/argouml/persistence/ModelMemberFilePersister.java?view=diff&rev=12859&p1=branches/gsoc2007/maurelio1234/argouml/org/argouml/persistence/ModelMemberFilePersister.java&p2=branches/gsoc2007/maurelio1234/argouml/org/argouml/persistence/ModelMemberFilePersister.java&r1=12858&r2=12859
==============================================================================
--- branches/gsoc2007/maurelio1234/argouml/org/argouml/persistence/ModelMemberFilePersister.java (original)
+++ branches/gsoc2007/maurelio1234/argouml/org/argouml/persistence/ModelMemberFilePersister.java 2007-06-16 04:57:03-0700
@@ -58,6 +58,7 @@
import org.argouml.uml.diagram.activity.ui.UMLActivityDiagram;
import org.argouml.uml.diagram.state.ui.UMLStateDiagram;
import org.argouml.uml.diagram.static_structure.ui.UMLClassDiagram;
+import org.argouml.uml.profile.ProfileConfiguration;
import org.xml.sax.InputSource;
/**
@@ -192,7 +193,10 @@
.getDiagramMemberFilePersister();
} else if (pm instanceof ProjectMemberTodoList) {
persister = new TodoListMemberFilePersister();
+ } else if (pm instanceof ProfileConfiguration) {
+ persister = new ProfileConfigurationFilePersister();
}
+
return persister;
}
Modified: branches/gsoc2007/maurelio1234/argouml/org/argouml/persistence/UmlFilePersister.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/argouml/org/argouml/persistence/UmlFilePersister.java?view=diff&rev=12859&p1=branches/gsoc2007/maurelio1234/argouml/org/argouml/persistence/UmlFilePersister.java&p2=branches/gsoc2007/maurelio1234/argouml/org/argouml/persistence/UmlFilePersister.java&r1=12858&r2=12859
==============================================================================
--- branches/gsoc2007/maurelio1234/argouml/org/argouml/persistence/UmlFilePersister.java (original)
+++ branches/gsoc2007/maurelio1234/argouml/org/argouml/persistence/UmlFilePersister.java 2007-06-16 04:57:03-0700
@@ -57,6 +57,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.util.ThreadUtils;
import org.tigris.gef.ocl.ExpansionException;
import org.tigris.gef.ocl.OCLExpander;
@@ -564,6 +565,8 @@
.getDiagramMemberFilePersister();
} else if (pm instanceof ProjectMemberTodoList) {
persister = new TodoListMemberFilePersister();
+ } else if (pm instanceof ProfileConfiguration) {
+ persister = new ProfileConfigurationFilePersister();
} else if (pm instanceof ProjectMemberModel) {
persister = new ModelMemberFilePersister();
}
@@ -584,6 +587,8 @@
.getDiagramMemberFilePersister();
} else if (tag.equals("todo")) {
persister = new TodoListMemberFilePersister();
+ } else if (tag.equals("profile")) {
+ persister = new ProfileConfigurationFilePersister();
} else if (tag.equals("xmi")) {
persister = new ModelMemberFilePersister();
}
Modified: branches/gsoc2007/maurelio1234/argouml/org/argouml/persistence/ZipFilePersister.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/argouml/org/argouml/persistence/ZipFilePersister.java?view=diff&rev=12859&p1=branches/gsoc2007/maurelio1234/argouml/org/argouml/persistence/ZipFilePersister.java&p2=branches/gsoc2007/maurelio1234/argouml/org/argouml/persistence/ZipFilePersister.java&r1=12858&r2=12859
==============================================================================
--- branches/gsoc2007/maurelio1234/argouml/org/argouml/persistence/ZipFilePersister.java (original)
+++ branches/gsoc2007/maurelio1234/argouml/org/argouml/persistence/ZipFilePersister.java 2007-06-16 04:57:03-0700
@@ -47,6 +47,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.xml.sax.InputSource;
/**
@@ -198,6 +199,8 @@
.getDiagramMemberFilePersister();
} else if (pm instanceof ProjectMemberTodoList) {
persister = new TodoListMemberFilePersister();
+ } else if (pm instanceof ProfileConfiguration) {
+ persister = new ProfileConfigurationFilePersister();
} else if (pm instanceof ProjectMemberModel) {
persister = new ModelMemberFilePersister();
}
Modified: branches/gsoc2007/maurelio1234/argouml/org/argouml/ui/ProfileSelectionTab.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/argouml/org/argouml/ui/ProfileSelectionTab.java?view=diff&rev=12859&p1=branches/gsoc2007/maurelio1234/argouml/org/argouml/ui/ProfileSelectionTab.java&p2=branches/gsoc2007/maurelio1234/argouml/org/argouml/ui/ProfileSelectionTab.java&r1=12858&r2=12859
==============================================================================
--- branches/gsoc2007/maurelio1234/argouml/org/argouml/ui/ProfileSelectionTab.java (original)
+++ branches/gsoc2007/maurelio1234/argouml/org/argouml/ui/ProfileSelectionTab.java 2007-06-16 04:57:03-0700
@@ -275,8 +275,7 @@
if (ret == JFileChooser.APPROVE_OPTION) {
File file = fileChooser.getSelectedFile();
- Profile profile = new UserDefinedProfile(file,
- new FileModelLoader());
+ Profile profile = new UserDefinedProfile(file);
if (profile.getModel() != null) {
ProfileManagerImpl.getInstance().registerProfile(profile);
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.