svn commit: r12583 - trunk/src_new/org/argouml: application/api kernel moduleloader persistence ui ui/explorer ui/explorer/rules uml/diagram uml/diagram/static_structure/ui uml/diagram/ui uml/reveng uml/ui uml/ui/foundation/core util
[email protected] 9 May 2007 20:11:46 -0000
Newsgroups
gmane.comp.lang.uml.argouml.cvs
Message-ID
<[email protected] >
Author: mvw
Date: 2007-05-09 13:11:45-0700
New Revision: 12583
Added:
trunk/src_new/org/argouml/uml/diagram/ArgoDiagram.java
- copied, changed from r12534, /trunk/src_new/org/argouml/ui/ArgoDiagram.java
Removed:
trunk/src_new/org/argouml/ui/ArgoDiagram.java
Modified:
trunk/src_new/org/argouml/application/api/Argo.java
trunk/src_new/org/argouml/kernel/Project.java
trunk/src_new/org/argouml/kernel/ProjectManager.java
trunk/src_new/org/argouml/moduleloader/ModuleLoader2.java
trunk/src_new/org/argouml/persistence/MemberFilePersister.java
trunk/src_new/org/argouml/persistence/ModelMemberFilePersister.java
trunk/src_new/org/argouml/persistence/PersistenceManager.java
trunk/src_new/org/argouml/persistence/PgmlUtility.java
trunk/src_new/org/argouml/persistence/PrivateHandler.java
trunk/src_new/org/argouml/persistence/TodoListMemberFilePersister.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/ProjectBrowser.java
trunk/src_new/org/argouml/ui/StylePanel.java
trunk/src_new/org/argouml/ui/explorer/ExplorerPopup.java
trunk/src_new/org/argouml/ui/explorer/rules/GoBehavioralFeatureToStateDiagram.java
trunk/src_new/org/argouml/ui/explorer/rules/GoClassifierToSequenceDiagram.java
trunk/src_new/org/argouml/ui/explorer/rules/GoModelElementToContainedDiagrams.java
trunk/src_new/org/argouml/ui/explorer/rules/GoOperationToCollaborationDiagram.java
trunk/src_new/org/argouml/ui/explorer/rules/GoOperationToSequenceDiagram.java
trunk/src_new/org/argouml/uml/diagram/DiagramFactory.java
trunk/src_new/org/argouml/uml/diagram/ProjectMemberDiagram.java
trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigPackage.java
trunk/src_new/org/argouml/uml/diagram/static_structure/ui/UMLClassDiagram.java
trunk/src_new/org/argouml/uml/diagram/ui/ActionAddExistingEdge.java
trunk/src_new/org/argouml/uml/diagram/ui/ActionAddExistingNode.java
trunk/src_new/org/argouml/uml/diagram/ui/ActionAddExistingNodes.java
trunk/src_new/org/argouml/uml/diagram/ui/ActionEdgesDisplay.java
trunk/src_new/org/argouml/uml/diagram/ui/AddExistingNodeCommand.java
trunk/src_new/org/argouml/uml/diagram/ui/FigEdgeModelElement.java
trunk/src_new/org/argouml/uml/diagram/ui/FigNodeModelElement.java
trunk/src_new/org/argouml/uml/diagram/ui/UMLDiagram.java
trunk/src_new/org/argouml/uml/reveng/DiagramInterface.java
trunk/src_new/org/argouml/uml/ui/ActionGenerateAll.java
trunk/src_new/org/argouml/uml/ui/ActionGenerateProjectCode.java
trunk/src_new/org/argouml/uml/ui/ActionGenerationSettings.java
trunk/src_new/org/argouml/uml/ui/ActionLayout.java
trunk/src_new/org/argouml/uml/ui/ActionSaveAllGraphics.java
trunk/src_new/org/argouml/uml/ui/ActionStateDiagram.java
trunk/src_new/org/argouml/uml/ui/TabProps.java
trunk/src_new/org/argouml/uml/ui/TabStyle.java
trunk/src_new/org/argouml/uml/ui/foundation/core/UMLDiagramNameDocument.java
trunk/src_new/org/argouml/util/ConfigLoader.java
Log:
Made org.argouml.persistence independent of org.argouml.ui.
Made org.argouml.moduleloader independent of org.argouml.persistence.
Modified: trunk/src_new/org/argouml/application/api/Argo.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/application/api/Argo.java?view=diff&rev=12583&p1=trunk/src_new/org/argouml/application/api/Argo.java&p2=trunk/src_new/org/argouml/application/api/Argo.java&r1=12582&r2=12583
==============================================================================
--- trunk/src_new/org/argouml/application/api/Argo.java (original)
+++ trunk/src_new/org/argouml/application/api/Argo.java 2007-05-09 13:11:45-0700
@@ -386,4 +386,13 @@
Category.getRoot().getLoggerRepository().setThreshold(Level.OFF);
}
}
+
+ /**
+ * Supply the encoding to be used throughout the persistence
+ * mechanism.
+ * @return the encoding.
+ */
+ public static String getEncoding() {
+ return "UTF-8";
+ }
}
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=12583&p1=trunk/src_new/org/argouml/kernel/Project.java&p2=trunk/src_new/org/argouml/kernel/Project.java&r1=12582&r2=12583
==============================================================================
--- trunk/src_new/org/argouml/kernel/Project.java (original)
+++ trunk/src_new/org/argouml/kernel/Project.java 2007-05-09 13:11:45-0700
@@ -48,7 +48,6 @@
import org.argouml.i18n.Translator;
import org.argouml.model.Model;
import org.argouml.persistence.PersistenceManager;
-import org.argouml.ui.ArgoDiagram;
import org.argouml.ui.explorer.ExplorerEventAdaptor;
import org.argouml.ui.targetmanager.TargetEvent;
import org.argouml.ui.targetmanager.TargetListener;
@@ -58,6 +57,7 @@
import org.argouml.uml.ProfileJava;
import org.argouml.uml.ProjectMemberModel;
import org.argouml.uml.cognitive.ProjectMemberTodoList;
+import org.argouml.uml.diagram.ArgoDiagram;
import org.argouml.uml.diagram.DiagramFactory;
import org.argouml.uml.diagram.ProjectMemberDiagram;
import org.argouml.uml.diagram.static_structure.ui.CommentEdge;
Modified: trunk/src_new/org/argouml/kernel/ProjectManager.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/kernel/ProjectManager.java?view=diff&rev=12583&p1=trunk/src_new/org/argouml/kernel/ProjectManager.java&p2=trunk/src_new/org/argouml/kernel/ProjectManager.java&r1=12582&r2=12583
==============================================================================
--- trunk/src_new/org/argouml/kernel/ProjectManager.java (original)
+++ trunk/src_new/org/argouml/kernel/ProjectManager.java 2007-05-09 13:11:45-0700
@@ -37,8 +37,8 @@
import org.argouml.model.MementoCreationObserver;
import org.argouml.model.Model;
import org.argouml.model.ModelMemento;
-import org.argouml.ui.ArgoDiagram;
import org.argouml.uml.cognitive.ProjectMemberTodoList;
+import org.argouml.uml.diagram.ArgoDiagram;
import org.argouml.uml.diagram.DiagramFactory;
import org.argouml.uml.diagram.static_structure.ui.UMLClassDiagram;
import org.argouml.uml.diagram.use_case.ui.UMLUseCaseDiagram;
Modified: trunk/src_new/org/argouml/moduleloader/ModuleLoader2.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/moduleloader/ModuleLoader2.java?view=diff&rev=12583&p1=trunk/src_new/org/argouml/moduleloader/ModuleLoader2.java&p2=trunk/src_new/org/argouml/moduleloader/ModuleLoader2.java&r1=12582&r2=12583
==============================================================================
--- trunk/src_new/org/argouml/moduleloader/ModuleLoader2.java (original)
+++ trunk/src_new/org/argouml/moduleloader/ModuleLoader2.java 2007-05-09 13:11:45-0700
@@ -49,7 +49,6 @@
import org.apache.log4j.Logger;
import org.argouml.application.api.Argo;
import org.argouml.i18n.Translator;
-import org.argouml.persistence.PersistenceManager;
import org.argouml.ui.GUI;
/**
@@ -465,10 +464,10 @@
try {
argoHome = java.net.URLDecoder.decode(argoHome,
- PersistenceManager.getEncoding());
+ Argo.getEncoding());
} catch (UnsupportedEncodingException e) {
LOG.warn("Encoding "
- + PersistenceManager.getEncoding()
+ + Argo.getEncoding()
+ " is unknown.");
}
Modified: trunk/src_new/org/argouml/persistence/MemberFilePersister.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/persistence/MemberFilePersister.java?view=diff&rev=12583&p1=trunk/src_new/org/argouml/persistence/MemberFilePersister.java&p2=trunk/src_new/org/argouml/persistence/MemberFilePersister.java&r1=12582&r2=12583
==============================================================================
--- trunk/src_new/org/argouml/persistence/MemberFilePersister.java (original)
+++ trunk/src_new/org/argouml/persistence/MemberFilePersister.java 2007-05-09 13:11:45-0700
@@ -34,6 +34,7 @@
import java.io.PrintWriter;
import java.io.Writer;
+import org.argouml.application.api.Argo;
import org.argouml.kernel.Project;
import org.argouml.kernel.ProjectMember;
@@ -116,7 +117,7 @@
new BufferedReader(
new InputStreamReader(
new FileInputStream(file),
- PersistenceManager.getEncoding()));
+ Argo.getEncoding()));
// Skip the <?xml... first line
String line = reader.readLine();
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=12583&p1=trunk/src_new/org/argouml/persistence/ModelMemberFilePersister.java&p2=trunk/src_new/org/argouml/persistence/ModelMemberFilePersister.java&r1=12582&r2=12583
==============================================================================
--- trunk/src_new/org/argouml/persistence/ModelMemberFilePersister.java (original)
+++ trunk/src_new/org/argouml/persistence/ModelMemberFilePersister.java 2007-05-09 13:11:45-0700
@@ -50,9 +50,9 @@
import org.argouml.model.XmiException;
import org.argouml.model.XmiReader;
import org.argouml.model.XmiWriter;
-import org.argouml.ui.ArgoDiagram;
import org.argouml.uml.ProjectMemberModel;
import org.argouml.uml.cognitive.ProjectMemberTodoList;
+import org.argouml.uml.diagram.ArgoDiagram;
import org.argouml.uml.diagram.DiagramFactory;
import org.argouml.uml.diagram.ProjectMemberDiagram;
import org.argouml.uml.diagram.activity.ui.UMLActivityDiagram;
@@ -96,7 +96,7 @@
// of argouml if a project is corrupted. Issue 913
// Created xmireader with method getErrors to check if parsing went well
try {
- source.setEncoding(PersistenceManager.getEncoding());
+ source.setEncoding(Argo.getEncoding());
readModels(project, source);
mmodel = getCurModel();
} catch (OpenException e) {
Modified: trunk/src_new/org/argouml/persistence/PersistenceManager.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/persistence/PersistenceManager.java?view=diff&rev=12583&p1=trunk/src_new/org/argouml/persistence/PersistenceManager.java&p2=trunk/src_new/org/argouml/persistence/PersistenceManager.java&r1=12582&r2=12583
==============================================================================
--- trunk/src_new/org/argouml/persistence/PersistenceManager.java (original)
+++ trunk/src_new/org/argouml/persistence/PersistenceManager.java 2007-05-09 13:11:45-0700
@@ -24,6 +24,7 @@
package org.argouml.persistence;
+import java.awt.Component;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.OutputStream;
@@ -42,7 +43,6 @@
import org.argouml.configuration.ConfigurationKey;
import org.argouml.i18n.Translator;
import org.argouml.kernel.Project;
-import org.argouml.ui.ArgoFrame;
import org.tigris.gef.util.UnexpectedException;
@@ -331,8 +331,10 @@
* @param overwrite if true, then the user is not asked
* @param file the given file
* @return true if we are allowed to overwrite the given file
+ * @param frame the Component to display the confirmation dialog on
*/
- public boolean confirmOverwrite(boolean overwrite, File file) {
+ public boolean confirmOverwrite(Component frame,
+ boolean overwrite, File file) {
if (file.exists() && !overwrite) {
String sConfirm =
Translator.messageFormat(
@@ -340,7 +342,7 @@
new Object[] {file});
int nResult =
JOptionPane.showConfirmDialog(
- ArgoFrame.getInstance(),
+ frame,
sConfirm,
Translator.localize(
"optionpane.confirm-overwrite-title"),
@@ -354,15 +356,6 @@
}
/**
- * Supply the encoding to be used throughout the persistence
- * mechanism.
- * @return the encoding.
- */
- public static String getEncoding() {
- return "UTF-8";
- }
-
- /**
* Get the last message which caused loading to fail. Used for junit tests.
*
* @return the last message which caused loading to fail
Modified: trunk/src_new/org/argouml/persistence/PgmlUtility.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/persistence/PgmlUtility.java?view=diff&rev=12583&p1=trunk/src_new/org/argouml/persistence/PgmlUtility.java&p2=trunk/src_new/org/argouml/persistence/PgmlUtility.java&r1=12582&r2=12583
==============================================================================
--- trunk/src_new/org/argouml/persistence/PgmlUtility.java (original)
+++ trunk/src_new/org/argouml/persistence/PgmlUtility.java 2007-05-09 13:11:45-0700
@@ -29,9 +29,7 @@
import java.util.Iterator;
import java.util.List;
-import org.argouml.model.Model;
import org.argouml.uml.diagram.static_structure.ui.FigEdgeNote;
-import org.argouml.uml.diagram.static_structure.ui.FigPackage;
import org.argouml.uml.diagram.ui.FigEdgeAssociationClass;
import org.tigris.gef.base.Diagram;
import org.tigris.gef.base.Layer;
Modified: trunk/src_new/org/argouml/persistence/PrivateHandler.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/persistence/PrivateHandler.java?view=diff&rev=12583&p1=trunk/src_new/org/argouml/persistence/PrivateHandler.java&p2=trunk/src_new/org/argouml/persistence/PrivateHandler.java&r1=12582&r2=12583
==============================================================================
--- trunk/src_new/org/argouml/persistence/PrivateHandler.java (original)
+++ trunk/src_new/org/argouml/persistence/PrivateHandler.java 2007-05-09 13:11:45-0700
@@ -26,19 +26,14 @@
import java.util.StringTokenizer;
import org.apache.log4j.Logger;
-
import org.argouml.cognitive.ItemUID;
-
-import org.argouml.ui.ArgoDiagram;
-
+import org.argouml.uml.diagram.ArgoDiagram;
import org.argouml.uml.diagram.ui.FigEdgeModelElement;
import org.argouml.uml.diagram.ui.FigNodeModelElement;
-
import org.tigris.gef.persistence.pgml.Container;
import org.tigris.gef.persistence.pgml.FigEdgeHandler;
import org.tigris.gef.persistence.pgml.FigGroupHandler;
import org.tigris.gef.persistence.pgml.PGMLHandler;
-
import org.xml.sax.SAXException;
/**
Modified: trunk/src_new/org/argouml/persistence/TodoListMemberFilePersister.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/persistence/TodoListMemberFilePersister.java?view=diff&rev=12583&p1=trunk/src_new/org/argouml/persistence/TodoListMemberFilePersister.java&p2=trunk/src_new/org/argouml/persistence/TodoListMemberFilePersister.java&r1=12582&r2=12583
==============================================================================
--- trunk/src_new/org/argouml/persistence/TodoListMemberFilePersister.java (original)
+++ trunk/src_new/org/argouml/persistence/TodoListMemberFilePersister.java 2007-05-09 13:11:45-0700
@@ -34,6 +34,7 @@
import java.io.Writer;
import org.apache.log4j.Logger;
+import org.argouml.application.api.Argo;
import org.argouml.cognitive.Designer;
import org.argouml.kernel.Project;
import org.argouml.kernel.ProjectMember;
@@ -64,7 +65,7 @@
try {
TodoParser parser = new TodoParser();
Reader reader = new InputStreamReader(inputStream,
- PersistenceManager.getEncoding());
+ Argo.getEncoding());
parser.readTodoList(reader);
ProjectMemberTodoList pm = new ProjectMemberTodoList("", project);
project.addMember(pm);
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=12583&p1=trunk/src_new/org/argouml/persistence/UmlFilePersister.java&p2=trunk/src_new/org/argouml/persistence/UmlFilePersister.java&r1=12582&r2=12583
==============================================================================
--- trunk/src_new/org/argouml/persistence/UmlFilePersister.java (original)
+++ trunk/src_new/org/argouml/persistence/UmlFilePersister.java 2007-05-09 13:11:45-0700
@@ -49,6 +49,7 @@
import javax.xml.transform.stream.StreamSource;
import org.apache.log4j.Logger;
+import org.argouml.application.api.Argo;
import org.argouml.application.helpers.ApplicationVersion;
import org.argouml.i18n.Translator;
import org.argouml.kernel.Project;
@@ -229,7 +230,7 @@
try {
writer.println("<?xml version = \"1.0\" "
+ "encoding = \""
- + PersistenceManager.getEncoding() + "\" ?>");
+ + Argo.getEncoding() + "\" ?>");
writer.println("<uml version=\"" + PERSISTENCE_VERSION + "\">");
// Write out header section
try {
@@ -355,7 +356,7 @@
ArgoParser parser = new ArgoParser();
Reader reader =
new InputStreamReader(inputStream,
- PersistenceManager.getEncoding());
+ Argo.getEncoding());
parser.readProject(p, reader);
List memberList = parser.getMemberList();
@@ -428,7 +429,7 @@
new FileOutputStream(transformedFile);
Writer writer =
new BufferedWriter(new OutputStreamWriter(stream,
- PersistenceManager.getEncoding()));
+ Argo.getEncoding()));
Result result = new StreamResult(writer);
StreamSource inputStreamSource = new StreamSource(file);
@@ -458,7 +459,7 @@
try {
inputStream = new BufferedInputStream(file.toURL().openStream());
reader = new BufferedReader(new InputStreamReader(inputStream,
- PersistenceManager.getEncoding()));
+ Argo.getEncoding()));
String rootLine = reader.readLine();
while (!rootLine.startsWith("<uml ")) {
rootLine = reader.readLine();
@@ -501,7 +502,7 @@
try {
inputStream = new BufferedInputStream(file.toURL().openStream());
reader = new BufferedReader(new InputStreamReader(inputStream,
- PersistenceManager.getEncoding()));
+ Argo.getEncoding()));
String versionLine = reader.readLine();
while (!versionLine.trim().startsWith("<version>")) {
versionLine = reader.readLine();
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=12583&p1=trunk/src_new/org/argouml/persistence/ZargoFilePersister.java&p2=trunk/src_new/org/argouml/persistence/ZargoFilePersister.java&r1=12582&r2=12583
==============================================================================
--- trunk/src_new/org/argouml/persistence/ZargoFilePersister.java (original)
+++ trunk/src_new/org/argouml/persistence/ZargoFilePersister.java 2007-05-09 13:11:45-0700
@@ -42,6 +42,7 @@
import java.util.zip.ZipOutputStream;
import org.apache.log4j.Logger;
+import org.argouml.application.api.Argo;
import org.argouml.application.helpers.ApplicationVersion;
import org.argouml.i18n.Translator;
import org.argouml.kernel.Project;
@@ -209,7 +210,7 @@
+ combinedFile.getAbsolutePath());
combinedFile.deleteOnExit();
- String encoding = PersistenceManager.getEncoding();
+ String encoding = Argo.getEncoding();
FileOutputStream stream = new FileOutputStream(combinedFile);
PrintWriter writer =
new PrintWriter(new BufferedWriter(
@@ -277,7 +278,7 @@
// then the xmi
zis = openZipStreamAt(file.toURL(), ".xmi");
reader = new BufferedReader(new InputStreamReader(zis,
- PersistenceManager.getEncoding()));
+ Argo.getEncoding()));
// Skip 1 lines
reader.readLine();
@@ -345,7 +346,7 @@
BufferedReader reader = new BufferedReader(
new InputStreamReader(sub,
- PersistenceManager.getEncoding()));
+ Argo.getEncoding()));
String firstLine = reader.readLine();
if (firstLine.startsWith("<?xml")) {
// Skip the 2 lines
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=12583&p1=trunk/src_new/org/argouml/persistence/ZipFilePersister.java&p2=trunk/src_new/org/argouml/persistence/ZipFilePersister.java&r1=12582&r2=12583
==============================================================================
--- trunk/src_new/org/argouml/persistence/ZipFilePersister.java (original)
+++ trunk/src_new/org/argouml/persistence/ZipFilePersister.java 2007-05-09 13:11:45-0700
@@ -38,6 +38,7 @@
import java.util.zip.ZipOutputStream;
import org.apache.log4j.Logger;
+import org.argouml.application.api.Argo;
import org.argouml.i18n.Translator;
import org.argouml.kernel.Project;
import org.argouml.kernel.ProjectManager;
@@ -131,7 +132,7 @@
stream.putNextEntry(xmiEntry);
OutputStream bout = new BufferedOutputStream(stream);
writer = new OutputStreamWriter(bout,
- PersistenceManager.getEncoding());
+ Argo.getEncoding());
int size = project.getMembers().size();
for (int i = 0; i < size; i++) {
Removed: trunk/src_new/org/argouml/ui/ArgoDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/ArgoDiagram.java?view=auto&rev=12582
Modified: trunk/src_new/org/argouml/ui/ProjectBrowser.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/ProjectBrowser.java?view=diff&rev=12583&p1=trunk/src_new/org/argouml/ui/ProjectBrowser.java&p2=trunk/src_new/org/argouml/ui/ProjectBrowser.java&r1=12582&r2=12583
==============================================================================
--- trunk/src_new/org/argouml/ui/ProjectBrowser.java (original)
+++ trunk/src_new/org/argouml/ui/ProjectBrowser.java 2007-05-09 13:11:45-0700
@@ -84,6 +84,7 @@
import org.argouml.ui.targetmanager.TargetEvent;
import org.argouml.ui.targetmanager.TargetListener;
import org.argouml.ui.targetmanager.TargetManager;
+import org.argouml.uml.diagram.ArgoDiagram;
import org.argouml.uml.diagram.DiagramFactory;
import org.argouml.uml.diagram.UMLMutableGraphSupport;
import org.argouml.uml.diagram.ui.ActionRemoveFromDiagram;
@@ -1215,7 +1216,7 @@
try {
if (!PersistenceManager.getInstance()
- .confirmOverwrite(overwrite, file)) {
+ .confirmOverwrite(ArgoFrame.getInstance(), overwrite, file)) {
return false;
}
Modified: trunk/src_new/org/argouml/ui/StylePanel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/StylePanel.java?view=diff&rev=12583&p1=trunk/src_new/org/argouml/ui/StylePanel.java&p2=trunk/src_new/org/argouml/ui/StylePanel.java&r1=12582&r2=12583
==============================================================================
--- trunk/src_new/org/argouml/ui/StylePanel.java (original)
+++ trunk/src_new/org/argouml/ui/StylePanel.java 2007-05-09 13:11:45-0700
@@ -40,6 +40,7 @@
import org.argouml.kernel.ProjectManager;
import org.argouml.model.Model;
import org.argouml.ui.targetmanager.TargetEvent;
+import org.argouml.uml.diagram.ArgoDiagram;
import org.tigris.gef.presentation.Fig;
import org.tigris.swidgets.LabelledLayout;
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=12583&p1=trunk/src_new/org/argouml/ui/explorer/ExplorerPopup.java&p2=trunk/src_new/org/argouml/ui/explorer/ExplorerPopup.java&r1=12582&r2=12583
==============================================================================
--- trunk/src_new/org/argouml/ui/explorer/ExplorerPopup.java (original)
+++ trunk/src_new/org/argouml/ui/explorer/ExplorerPopup.java 2007-05-09 13:11:45-0700
@@ -44,9 +44,9 @@
import org.argouml.kernel.ProjectManager;
import org.argouml.model.IllegalModelElementConnectionException;
import org.argouml.model.Model;
-import org.argouml.ui.ArgoDiagram;
import org.argouml.ui.DisplayTextTree;
import org.argouml.ui.targetmanager.TargetManager;
+import org.argouml.uml.diagram.ArgoDiagram;
import org.argouml.uml.diagram.activity.ui.UMLActivityDiagram;
import org.argouml.uml.diagram.sequence.ui.UMLSequenceDiagram;
import org.argouml.uml.diagram.state.ui.UMLStateDiagram;
Modified: trunk/src_new/org/argouml/ui/explorer/rules/GoBehavioralFeatureToStateDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/explorer/rules/GoBehavioralFeatureToStateDiagram.java?view=diff&rev=12583&p1=trunk/src_new/org/argouml/ui/explorer/rules/GoBehavioralFeatureToStateDiagram.java&p2=trunk/src_new/org/argouml/ui/explorer/rules/GoBehavioralFeatureToStateDiagram.java&r1=12582&r2=12583
==============================================================================
--- trunk/src_new/org/argouml/ui/explorer/rules/GoBehavioralFeatureToStateDiagram.java (original)
+++ trunk/src_new/org/argouml/ui/explorer/rules/GoBehavioralFeatureToStateDiagram.java 2007-05-09 13:11:45-0700
@@ -33,7 +33,7 @@
import org.argouml.kernel.Project;
import org.argouml.kernel.ProjectManager;
import org.argouml.model.Model;
-import org.argouml.ui.ArgoDiagram;
+import org.argouml.uml.diagram.ArgoDiagram;
import org.argouml.uml.diagram.state.ui.UMLStateDiagram;
/**
Modified: trunk/src_new/org/argouml/ui/explorer/rules/GoClassifierToSequenceDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/explorer/rules/GoClassifierToSequenceDiagram.java?view=diff&rev=12583&p1=trunk/src_new/org/argouml/ui/explorer/rules/GoClassifierToSequenceDiagram.java&p2=trunk/src_new/org/argouml/ui/explorer/rules/GoClassifierToSequenceDiagram.java&r1=12582&r2=12583
==============================================================================
--- trunk/src_new/org/argouml/ui/explorer/rules/GoClassifierToSequenceDiagram.java (original)
+++ trunk/src_new/org/argouml/ui/explorer/rules/GoClassifierToSequenceDiagram.java 2007-05-09 13:11:45-0700
@@ -34,7 +34,7 @@
import org.argouml.kernel.Project;
import org.argouml.kernel.ProjectManager;
import org.argouml.model.Model;
-import org.argouml.ui.ArgoDiagram;
+import org.argouml.uml.diagram.ArgoDiagram;
import org.argouml.uml.diagram.sequence.SequenceDiagramGraphModel;
import org.argouml.uml.diagram.sequence.ui.UMLSequenceDiagram;
Modified: trunk/src_new/org/argouml/ui/explorer/rules/GoModelElementToContainedDiagrams.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/explorer/rules/GoModelElementToContainedDiagrams.java?view=diff&rev=12583&p1=trunk/src_new/org/argouml/ui/explorer/rules/GoModelElementToContainedDiagrams.java&p2=trunk/src_new/org/argouml/ui/explorer/rules/GoModelElementToContainedDiagrams.java&r1=12582&r2=12583
==============================================================================
--- trunk/src_new/org/argouml/ui/explorer/rules/GoModelElementToContainedDiagrams.java (original)
+++ trunk/src_new/org/argouml/ui/explorer/rules/GoModelElementToContainedDiagrams.java 2007-05-09 13:11:45-0700
@@ -34,7 +34,7 @@
import org.argouml.kernel.Project;
import org.argouml.kernel.ProjectManager;
import org.argouml.model.Model;
-import org.argouml.ui.ArgoDiagram;
+import org.argouml.uml.diagram.ArgoDiagram;
import org.argouml.uml.diagram.ui.UMLDiagram;
/**
Modified: trunk/src_new/org/argouml/ui/explorer/rules/GoOperationToCollaborationDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/explorer/rules/GoOperationToCollaborationDiagram.java?view=diff&rev=12583&p1=trunk/src_new/org/argouml/ui/explorer/rules/GoOperationToCollaborationDiagram.java&p2=trunk/src_new/org/argouml/ui/explorer/rules/GoOperationToCollaborationDiagram.java&r1=12582&r2=12583
==============================================================================
--- trunk/src_new/org/argouml/ui/explorer/rules/GoOperationToCollaborationDiagram.java (original)
+++ trunk/src_new/org/argouml/ui/explorer/rules/GoOperationToCollaborationDiagram.java 2007-05-09 13:11:45-0700
@@ -34,7 +34,7 @@
import org.argouml.kernel.Project;
import org.argouml.kernel.ProjectManager;
import org.argouml.model.Model;
-import org.argouml.ui.ArgoDiagram;
+import org.argouml.uml.diagram.ArgoDiagram;
import org.argouml.uml.diagram.collaboration.ui.UMLCollaborationDiagram;
/**
Modified: trunk/src_new/org/argouml/ui/explorer/rules/GoOperationToSequenceDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/explorer/rules/GoOperationToSequenceDiagram.java?view=diff&rev=12583&p1=trunk/src_new/org/argouml/ui/explorer/rules/GoOperationToSequenceDiagram.java&p2=trunk/src_new/org/argouml/ui/explorer/rules/GoOperationToSequenceDiagram.java&r1=12582&r2=12583
==============================================================================
--- trunk/src_new/org/argouml/ui/explorer/rules/GoOperationToSequenceDiagram.java (original)
+++ trunk/src_new/org/argouml/ui/explorer/rules/GoOperationToSequenceDiagram.java 2007-05-09 13:11:45-0700
@@ -34,7 +34,7 @@
import org.argouml.kernel.Project;
import org.argouml.kernel.ProjectManager;
import org.argouml.model.Model;
-import org.argouml.ui.ArgoDiagram;
+import org.argouml.uml.diagram.ArgoDiagram;
import org.argouml.uml.diagram.sequence.SequenceDiagramGraphModel;
import org.argouml.uml.diagram.sequence.ui.UMLSequenceDiagram;
Copied: trunk/src_new/org/argouml/uml/diagram/ArgoDiagram.java (from r12534, /trunk/src_new/org/argouml/ui/ArgoDiagram.java)
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/ArgoDiagram.java?view=diff&rev=12583&p1=/trunk/src_new/org/argouml/ui/ArgoDiagram.java&p2=trunk/src_new/org/argouml/uml/diagram/ArgoDiagram.java&r1=12534&r2=12583
==============================================================================
--- /trunk/src_new/org/argouml/ui/ArgoDiagram.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/ArgoDiagram.java 2007-05-09 13:11:45-0700
@@ -22,7 +22,7 @@
// CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT,
// UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-package org.argouml.ui;
+package org.argouml.uml.diagram;
import java.beans.PropertyVetoException;
import java.util.ArrayList;
Modified: trunk/src_new/org/argouml/uml/diagram/DiagramFactory.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/DiagramFactory.java?view=diff&rev=12583&p1=trunk/src_new/org/argouml/uml/diagram/DiagramFactory.java&p2=trunk/src_new/org/argouml/uml/diagram/DiagramFactory.java&r1=12582&r2=12583
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/DiagramFactory.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/DiagramFactory.java 2007-05-09 13:11:45-0700
@@ -39,7 +39,6 @@
import org.argouml.model.SequenceDiagram;
import org.argouml.model.StateDiagram;
import org.argouml.model.UseCaseDiagram;
-import org.argouml.ui.ArgoDiagram;
import org.argouml.ui.GraphChangeAdapter;
import org.argouml.uml.diagram.activity.ui.UMLActivityDiagram;
import org.argouml.uml.diagram.collaboration.ui.UMLCollaborationDiagram;
Modified: trunk/src_new/org/argouml/uml/diagram/ProjectMemberDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/ProjectMemberDiagram.java?view=diff&rev=12583&p1=trunk/src_new/org/argouml/uml/diagram/ProjectMemberDiagram.java&p2=trunk/src_new/org/argouml/uml/diagram/ProjectMemberDiagram.java&r1=12582&r2=12583
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/ProjectMemberDiagram.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/ProjectMemberDiagram.java 2007-05-09 13:11:45-0700
@@ -27,7 +27,6 @@
import org.argouml.kernel.Project;
import org.argouml.kernel.AbstractProjectMember;
-import org.argouml.ui.ArgoDiagram;
import org.tigris.gef.util.Util;
/**
Modified: trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigPackage.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigPackage.java?view=diff&rev=12583&p1=trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigPackage.java&p2=trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigPackage.java&r1=12582&r2=12583
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigPackage.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigPackage.java 2007-05-09 13:11:45-0700
@@ -45,10 +45,10 @@
import org.argouml.kernel.ProjectManager;
import org.argouml.model.Model;
import org.argouml.model.RemoveAssociationEvent;
-import org.argouml.ui.ArgoDiagram;
import org.argouml.ui.ArgoJMenu;
import org.argouml.ui.explorer.ExplorerEventAdaptor;
import org.argouml.ui.targetmanager.TargetManager;
+import org.argouml.uml.diagram.ArgoDiagram;
import org.argouml.uml.diagram.DiagramFactory;
import org.argouml.uml.diagram.ui.FigNodeModelElement;
import org.argouml.uml.diagram.ui.FigStereotypesCompartment;
Modified: trunk/src_new/org/argouml/uml/diagram/static_structure/ui/UMLClassDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/static_structure/ui/UMLClassDiagram.java?view=diff&rev=12583&p1=trunk/src_new/org/argouml/uml/diagram/static_structure/ui/UMLClassDiagram.java&p2=trunk/src_new/org/argouml/uml/diagram/static_structure/ui/UMLClassDiagram.java&r1=12582&r2=12583
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/static_structure/ui/UMLClassDiagram.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/static_structure/ui/UMLClassDiagram.java 2007-05-09 13:11:45-0700
@@ -661,7 +661,7 @@
/**
*
- * @see org.argouml.ui.ArgoDiagram#remove()
+ * @see org.argouml.uml.diagram.ArgoDiagram#remove()
*/
@Override
public void remove() {
Modified: trunk/src_new/org/argouml/uml/diagram/ui/ActionAddExistingEdge.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/ui/ActionAddExistingEdge.java?view=diff&rev=12583&p1=trunk/src_new/org/argouml/uml/diagram/ui/ActionAddExistingEdge.java&p2=trunk/src_new/org/argouml/uml/diagram/ui/ActionAddExistingEdge.java&r1=12582&r2=12583
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/ui/ActionAddExistingEdge.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/ui/ActionAddExistingEdge.java 2007-05-09 13:11:45-0700
@@ -29,8 +29,8 @@
import org.argouml.kernel.ProjectManager;
import org.argouml.model.Model;
-import org.argouml.ui.ArgoDiagram;
import org.argouml.ui.targetmanager.TargetManager;
+import org.argouml.uml.diagram.ArgoDiagram;
import org.tigris.gef.base.Editor;
import org.tigris.gef.base.Globals;
import org.tigris.gef.base.Layer;
Modified: trunk/src_new/org/argouml/uml/diagram/ui/ActionAddExistingNode.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/ui/ActionAddExistingNode.java?view=diff&rev=12583&p1=trunk/src_new/org/argouml/uml/diagram/ui/ActionAddExistingNode.java&p2=trunk/src_new/org/argouml/uml/diagram/ui/ActionAddExistingNode.java&r1=12582&r2=12583
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/ui/ActionAddExistingNode.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/ui/ActionAddExistingNode.java 2007-05-09 13:11:45-0700
@@ -28,8 +28,8 @@
import java.awt.event.ActionEvent;
import org.argouml.kernel.ProjectManager;
-import org.argouml.ui.ArgoDiagram;
import org.argouml.ui.targetmanager.TargetManager;
+import org.argouml.uml.diagram.ArgoDiagram;
import org.tigris.gef.graph.MutableGraphModel;
import org.tigris.gef.undo.UndoableAction;
Modified: trunk/src_new/org/argouml/uml/diagram/ui/ActionAddExistingNodes.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/ui/ActionAddExistingNodes.java?view=diff&rev=12583&p1=trunk/src_new/org/argouml/uml/diagram/ui/ActionAddExistingNodes.java&p2=trunk/src_new/org/argouml/uml/diagram/ui/ActionAddExistingNodes.java&r1=12582&r2=12583
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/ui/ActionAddExistingNodes.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/ui/ActionAddExistingNodes.java 2007-05-09 13:11:45-0700
@@ -31,7 +31,7 @@
import org.argouml.kernel.ProjectManager;
import org.argouml.model.Model;
-import org.argouml.ui.ArgoDiagram;
+import org.argouml.uml.diagram.ArgoDiagram;
import org.argouml.uml.reveng.DiagramInterface;
import org.tigris.gef.base.Globals;
import org.tigris.gef.graph.MutableGraphModel;
Modified: trunk/src_new/org/argouml/uml/diagram/ui/ActionEdgesDisplay.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/ui/ActionEdgesDisplay.java?view=diff&rev=12583&p1=trunk/src_new/org/argouml/uml/diagram/ui/ActionEdgesDisplay.java&p2=trunk/src_new/org/argouml/uml/diagram/ui/ActionEdgesDisplay.java&r1=12582&r2=12583
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/ui/ActionEdgesDisplay.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/ui/ActionEdgesDisplay.java 2007-05-09 13:11:45-0700
@@ -34,7 +34,7 @@
import org.argouml.i18n.Translator;
import org.argouml.kernel.ProjectManager;
import org.argouml.model.Model;
-import org.argouml.ui.ArgoDiagram;
+import org.argouml.uml.diagram.ArgoDiagram;
import org.tigris.gef.base.Editor;
import org.tigris.gef.base.Globals;
import org.tigris.gef.base.Selection;
Modified: trunk/src_new/org/argouml/uml/diagram/ui/AddExistingNodeCommand.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/ui/AddExistingNodeCommand.java?view=diff&rev=12583&p1=trunk/src_new/org/argouml/uml/diagram/ui/AddExistingNodeCommand.java&p2=trunk/src_new/org/argouml/uml/diagram/ui/AddExistingNodeCommand.java&r1=12582&r2=12583
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/ui/AddExistingNodeCommand.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/ui/AddExistingNodeCommand.java 2007-05-09 13:11:45-0700
@@ -33,7 +33,7 @@
import org.argouml.i18n.Translator;
import org.argouml.kernel.ProjectManager;
import org.argouml.model.Model;
-import org.argouml.ui.ArgoDiagram;
+import org.argouml.uml.diagram.ArgoDiagram;
import org.tigris.gef.base.Command;
import org.tigris.gef.base.Editor;
import org.tigris.gef.base.Globals;
Modified: trunk/src_new/org/argouml/uml/diagram/ui/FigEdgeModelElement.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/ui/FigEdgeModelElement.java?view=diff&rev=12583&p1=trunk/src_new/org/argouml/uml/diagram/ui/FigEdgeModelElement.java&p2=trunk/src_new/org/argouml/uml/diagram/ui/FigEdgeModelElement.java&r1=12582&r2=12583
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/ui/FigEdgeModelElement.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/ui/FigEdgeModelElement.java 2007-05-09 13:11:45-0700
@@ -75,11 +75,11 @@
import org.argouml.notation.NotationProviderFactory2;
import org.argouml.notation.providers.NotationProvider;
import org.argouml.ui.ActionGoToCritique;
-import org.argouml.ui.ArgoDiagram;
import org.argouml.ui.ArgoJMenu;
import org.argouml.ui.Clarifier;
import org.argouml.ui.ProjectBrowser;
import org.argouml.ui.targetmanager.TargetManager;
+import org.argouml.uml.diagram.ArgoDiagram;
import org.argouml.uml.diagram.UMLMutableGraphSupport;
import org.argouml.uml.ui.ActionDeleteModelElements;
import org.tigris.gef.base.Globals;
Modified: trunk/src_new/org/argouml/uml/diagram/ui/FigNodeModelElement.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/ui/FigNodeModelElement.java?view=diff&rev=12583&p1=trunk/src_new/org/argouml/uml/diagram/ui/FigNodeModelElement.java&p2=trunk/src_new/org/argouml/uml/diagram/ui/FigNodeModelElement.java&r1=12582&r2=12583
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/ui/FigNodeModelElement.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/ui/FigNodeModelElement.java 2007-05-09 13:11:45-0700
@@ -76,11 +76,11 @@
import org.argouml.notation.NotationProviderFactory2;
import org.argouml.notation.providers.NotationProvider;
import org.argouml.ui.ActionGoToCritique;
-import org.argouml.ui.ArgoDiagram;
import org.argouml.ui.ArgoJMenu;
import org.argouml.ui.Clarifier;
import org.argouml.ui.ProjectBrowser;
import org.argouml.ui.targetmanager.TargetManager;
+import org.argouml.uml.diagram.ArgoDiagram;
import org.argouml.uml.diagram.UMLMutableGraphSupport;
import org.argouml.uml.ui.ActionDeleteModelElements;
import org.tigris.gef.base.Editor;
Modified: trunk/src_new/org/argouml/uml/diagram/ui/UMLDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/ui/UMLDiagram.java?view=diff&rev=12583&p1=trunk/src_new/org/argouml/uml/diagram/ui/UMLDiagram.java&p2=trunk/src_new/org/argouml/uml/diagram/ui/UMLDiagram.java&r1=12582&r2=12583
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/ui/UMLDiagram.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/ui/UMLDiagram.java 2007-05-09 13:11:45-0700
@@ -40,11 +40,11 @@
import org.argouml.model.DeleteInstanceEvent;
import org.argouml.model.Model;
import org.argouml.model.ModelManagementHelper;
-import org.argouml.ui.ArgoDiagram;
import org.argouml.ui.CmdCreateNode;
import org.argouml.ui.ActionSetMode;
import org.argouml.ui.explorer.Relocatable;
import org.argouml.uml.UUIDHelper;
+import org.argouml.uml.diagram.ArgoDiagram;
import org.argouml.uml.diagram.UMLMutableGraphSupport;
import org.argouml.util.ToolBarUtility;
import org.tigris.gef.base.ModeBroom;
Modified: trunk/src_new/org/argouml/uml/reveng/DiagramInterface.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/reveng/DiagramInterface.java?view=diff&rev=12583&p1=trunk/src_new/org/argouml/uml/reveng/DiagramInterface.java&p2=trunk/src_new/org/argouml/uml/reveng/DiagramInterface.java&r1=12582&r2=12583
==============================================================================
--- trunk/src_new/org/argouml/uml/reveng/DiagramInterface.java (original)
+++ trunk/src_new/org/argouml/uml/reveng/DiagramInterface.java 2007-05-09 13:11:45-0700
@@ -34,7 +34,7 @@
import org.argouml.kernel.ProjectManager;
import org.argouml.kernel.ProjectMember;
import org.argouml.model.Model;
-import org.argouml.ui.ArgoDiagram;
+import org.argouml.uml.diagram.ArgoDiagram;
import org.argouml.uml.diagram.DiagramFactory;
import org.argouml.uml.diagram.ProjectMemberDiagram;
import org.argouml.uml.diagram.static_structure.ClassDiagramGraphModel;
Modified: trunk/src_new/org/argouml/uml/ui/ActionGenerateAll.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/ActionGenerateAll.java?view=diff&rev=12583&p1=trunk/src_new/org/argouml/uml/ui/ActionGenerateAll.java&p2=trunk/src_new/org/argouml/uml/ui/ActionGenerateAll.java&r1=12582&r2=12583
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/ActionGenerateAll.java (original)
+++ trunk/src_new/org/argouml/uml/ui/ActionGenerateAll.java 2007-05-09 13:11:45-0700
@@ -35,8 +35,8 @@
import org.argouml.i18n.Translator;
import org.argouml.kernel.ProjectManager;
import org.argouml.model.Model;
-import org.argouml.ui.ArgoDiagram;
import org.argouml.ui.targetmanager.TargetManager;
+import org.argouml.uml.diagram.ArgoDiagram;
import org.argouml.uml.diagram.static_structure.ui.UMLClassDiagram;
import org.argouml.uml.generator.ui.ClassGenerationDialog;
import org.tigris.gef.undo.UndoableAction;
Modified: trunk/src_new/org/argouml/uml/ui/ActionGenerateProjectCode.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/ActionGenerateProjectCode.java?view=diff&rev=12583&p1=trunk/src_new/org/argouml/uml/ui/ActionGenerateProjectCode.java&p2=trunk/src_new/org/argouml/uml/ui/ActionGenerateProjectCode.java&r1=12582&r2=12583
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/ActionGenerateProjectCode.java (original)
+++ trunk/src_new/org/argouml/uml/ui/ActionGenerateProjectCode.java 2007-05-09 13:11:45-0700
@@ -34,7 +34,7 @@
import org.argouml.i18n.Translator;
import org.argouml.kernel.ProjectManager;
import org.argouml.model.Model;
-import org.argouml.ui.ArgoDiagram;
+import org.argouml.uml.diagram.ArgoDiagram;
import org.argouml.uml.diagram.ui.UMLDiagram;
import org.argouml.uml.generator.GeneratorManager;
import org.argouml.uml.generator.ui.ClassGenerationDialog;
Modified: trunk/src_new/org/argouml/uml/ui/ActionGenerationSettings.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/ActionGenerationSettings.java?view=diff&rev=12583&p1=trunk/src_new/org/argouml/uml/ui/ActionGenerationSettings.java&p2=trunk/src_new/org/argouml/uml/ui/ActionGenerationSettings.java&r1=12582&r2=12583
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/ActionGenerationSettings.java (original)
+++ trunk/src_new/org/argouml/uml/ui/ActionGenerationSettings.java 2007-05-09 13:11:45-0700
@@ -69,7 +69,7 @@
* @see org.tigris.gef.undo.UndoableAction#isEnabled()
*/
public boolean isEnabled() {
- org.argouml.ui.ArgoDiagram activeDiagram =
+ org.argouml.uml.diagram.ArgoDiagram activeDiagram =
ProjectManager.getManager().getCurrentProject().getActiveDiagram();
return super.isEnabled()
&& (activeDiagram instanceof UMLDiagram);
Modified: trunk/src_new/org/argouml/uml/ui/ActionLayout.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/ActionLayout.java?view=diff&rev=12583&p1=trunk/src_new/org/argouml/uml/ui/ActionLayout.java&p2=trunk/src_new/org/argouml/uml/ui/ActionLayout.java&r1=12582&r2=12583
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/ActionLayout.java (original)
+++ trunk/src_new/org/argouml/uml/ui/ActionLayout.java 2007-05-09 13:11:45-0700
@@ -32,7 +32,7 @@
import org.argouml.i18n.Translator;
import org.argouml.kernel.Project;
import org.argouml.kernel.ProjectManager;
-import org.argouml.ui.ArgoDiagram;
+import org.argouml.uml.diagram.ArgoDiagram;
import org.argouml.uml.diagram.activity.layout.ActivityDiagramLayouter;
import org.argouml.uml.diagram.activity.ui.UMLActivityDiagram;
import org.argouml.uml.diagram.layout.Layouter;
Modified: trunk/src_new/org/argouml/uml/ui/ActionSaveAllGraphics.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/ActionSaveAllGraphics.java?view=diff&rev=12583&p1=trunk/src_new/org/argouml/uml/ui/ActionSaveAllGraphics.java&p2=trunk/src_new/org/argouml/uml/ui/ActionSaveAllGraphics.java&r1=12582&r2=12583
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/ActionSaveAllGraphics.java (original)
+++ trunk/src_new/org/argouml/uml/ui/ActionSaveAllGraphics.java 2007-05-09 13:11:45-0700
@@ -41,10 +41,10 @@
import org.argouml.i18n.Translator;
import org.argouml.kernel.Project;
import org.argouml.kernel.ProjectManager;
-import org.argouml.ui.ArgoDiagram;
import org.argouml.ui.ArgoFrame;
import org.argouml.ui.ProjectBrowser;
import org.argouml.ui.targetmanager.TargetManager;
+import org.argouml.uml.diagram.ArgoDiagram;
import org.tigris.gef.base.CmdSaveGraphics;
import org.tigris.gef.base.Diagram;
import org.tigris.gef.undo.UndoableAction;
Modified: trunk/src_new/org/argouml/uml/ui/ActionStateDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/ActionStateDiagram.java?view=diff&rev=12583&p1=trunk/src_new/org/argouml/uml/ui/ActionStateDiagram.java&p2=trunk/src_new/org/argouml/uml/ui/ActionStateDiagram.java&r1=12582&r2=12583
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/ActionStateDiagram.java (original)
+++ trunk/src_new/org/argouml/uml/ui/ActionStateDiagram.java 2007-05-09 13:11:45-0700
@@ -30,8 +30,8 @@
import org.argouml.kernel.Project;
import org.argouml.kernel.ProjectManager;
import org.argouml.model.Model;
-import org.argouml.ui.ArgoDiagram;
import org.argouml.ui.targetmanager.TargetManager;
+import org.argouml.uml.diagram.ArgoDiagram;
import org.argouml.uml.diagram.DiagramFactory;
import org.argouml.uml.diagram.state.ui.UMLStateDiagram;
import org.argouml.uml.diagram.ui.UMLDiagram;
Modified: trunk/src_new/org/argouml/uml/ui/TabProps.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/TabProps.java?view=diff&rev=12583&p1=trunk/src_new/org/argouml/uml/ui/TabProps.java&p2=trunk/src_new/org/argouml/uml/ui/TabProps.java&r1=12582&r2=12583
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/TabProps.java (original)
+++ trunk/src_new/org/argouml/uml/ui/TabProps.java 2007-05-09 13:11:45-0700
@@ -34,10 +34,10 @@
import org.apache.log4j.Logger;
import org.argouml.model.Model;
import org.argouml.ui.AbstractArgoJPanel;
-import org.argouml.ui.ArgoDiagram;
import org.argouml.ui.targetmanager.TargetEvent;
import org.argouml.ui.targetmanager.TargetListener;
import org.argouml.ui.targetmanager.TargetManager;
+import org.argouml.uml.diagram.ArgoDiagram;
import org.argouml.uml.diagram.activity.ui.UMLActivityDiagram;
import org.argouml.uml.diagram.collaboration.ui.UMLCollaborationDiagram;
import org.argouml.uml.diagram.deployment.ui.UMLDeploymentDiagram;
Modified: trunk/src_new/org/argouml/uml/ui/TabStyle.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/TabStyle.java?view=diff&rev=12583&p1=trunk/src_new/org/argouml/uml/ui/TabStyle.java&p2=trunk/src_new/org/argouml/uml/ui/TabStyle.java&r1=12582&r2=12583
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/TabStyle.java (original)
+++ trunk/src_new/org/argouml/uml/ui/TabStyle.java 2007-05-09 13:11:45-0700
@@ -41,11 +41,11 @@
import org.argouml.kernel.ProjectManager;
import org.argouml.model.Model;
import org.argouml.ui.AbstractArgoJPanel;
-import org.argouml.ui.ArgoDiagram;
import org.argouml.ui.StylePanel;
import org.argouml.ui.TabFigTarget;
import org.argouml.ui.targetmanager.TargetEvent;
import org.argouml.ui.targetmanager.TargetListener;
+import org.argouml.uml.diagram.ArgoDiagram;
import org.argouml.uml.util.namespace.Namespace;
import org.argouml.uml.util.namespace.StringNamespace;
import org.argouml.uml.util.namespace.StringNamespaceElement;
Modified: trunk/src_new/org/argouml/uml/ui/foundation/core/UMLDiagramNameDocument.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/foundation/core/UMLDiagramNameDocument.java?view=diff&rev=12583&p1=trunk/src_new/org/argouml/uml/ui/foundation/core/UMLDiagramNameDocument.java&p2=trunk/src_new/org/argouml/uml/ui/foundation/core/UMLDiagramNameDocument.java&r1=12582&r2=12583
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/foundation/core/UMLDiagramNameDocument.java (original)
+++ trunk/src_new/org/argouml/uml/ui/foundation/core/UMLDiagramNameDocument.java 2007-05-09 13:11:45-0700
@@ -28,7 +28,7 @@
import java.beans.PropertyVetoException;
import org.argouml.kernel.ProjectManager;
-import org.argouml.ui.ArgoDiagram;
+import org.argouml.uml.diagram.ArgoDiagram;
import org.argouml.uml.ui.UMLPlainTextDocument;
/**
Modified: trunk/src_new/org/argouml/util/ConfigLoader.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/util/ConfigLoader.java?view=diff&rev=12583&p1=trunk/src_new/org/argouml/util/ConfigLoader.java&p2=trunk/src_new/org/argouml/util/ConfigLoader.java&r1=12582&r2=12583
==============================================================================
--- trunk/src_new/org/argouml/util/ConfigLoader.java (original)
+++ trunk/src_new/org/argouml/util/ConfigLoader.java 2007-05-09 13:11:45-0700
@@ -36,9 +36,9 @@
import java.util.Vector;
import org.apache.log4j.Logger;
+import org.argouml.application.api.Argo;
import org.argouml.configuration.Configuration;
import org.argouml.configuration.ConfigurationKey;
-import org.argouml.persistence.PersistenceManager;
import org.tigris.swidgets.Orientation;
/**
@@ -128,7 +128,7 @@
if (is != null) {
try {
lnr = new LineNumberReader(new InputStreamReader(is,
- PersistenceManager.getEncoding()));
+ Argo.getEncoding()));
} catch (UnsupportedEncodingException ueExc) {
lnr = new LineNumberReader(new InputStreamReader(is));
}