Author: euluis
Date: 2007-11-13 17:02:49-0800
New Revision: 13765
Added:
trunk/src_new/org/argouml/profile/FileModelLoader.java
- copied, changed from r13762, /trunk/src_new/org/argouml/profile/internal/FileModelLoader.java
trunk/src_new/org/argouml/profile/ProfileModelLoader.java
- copied, changed from r13757, /trunk/src_new/org/argouml/profile/internal/ProfileModelLoader.java
trunk/src_new/org/argouml/profile/ResourceModelLoader.java
- copied, changed from r13762, /trunk/src_new/org/argouml/profile/internal/ResourceModelLoader.java
trunk/src_new/org/argouml/profile/StreamModelLoader.java
- copied, changed from r13762, /trunk/src_new/org/argouml/profile/internal/StreamModelLoader.java
trunk/src_new/org/argouml/profile/UserDefinedProfile.java
- copied, changed from r13757, /trunk/src_new/org/argouml/profile/internal/UserDefinedProfile.java
trunk/src_new/org/argouml/profile/ZipModelLoader.java
- copied, changed from r13762, /trunk/src_new/org/argouml/uml/profile/ZipModelLoader.java
Removed:
trunk/src_new/org/argouml/default-cpp.xmi
trunk/src_new/org/argouml/profile/internal/FileModelLoader.java
trunk/src_new/org/argouml/profile/internal/ProfileModelLoader.java
trunk/src_new/org/argouml/profile/internal/ResourceModelLoader.java
trunk/src_new/org/argouml/profile/internal/StreamModelLoader.java
trunk/src_new/org/argouml/profile/internal/UserDefinedProfile.java
trunk/src_new/org/argouml/uml/profile/ProfileCpp.java
Modified:
trunk/src_new/org/argouml/profile/ProfileFacade.java
trunk/src_new/org/argouml/profile/internal/ProfileJava.java
trunk/src_new/org/argouml/profile/internal/ProfileManagerImpl.java
trunk/src_new/org/argouml/profile/internal/ProfileUML.java
trunk/src_new/org/argouml/uml/profile/ProfileConfiguration.java
trunk/src_new/org/argouml/uml/profile/ProfileManagerImpl.java
Log:
Issue #4885: final restructuring of org.argouml.profile and copying into it; minor fixes in org.argouml.uml.profile; removing C++ UML profile
Removed: trunk/src_new/org/argouml/default-cpp.xmi
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/default-cpp.xmi?view=auto&rev=13764
Copied: trunk/src_new/org/argouml/profile/FileModelLoader.java (from r13762, /trunk/src_new/org/argouml/profile/internal/FileModelLoader.java)
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/profile/FileModelLoader.java?view=diff&rev=13765&p1=/trunk/src_new/org/argouml/profile/internal/FileModelLoader.java&p2=trunk/src_new/org/argouml/profile/FileModelLoader.java&r1=13762&r2=13765
==============================================================================
--- /trunk/src_new/org/argouml/profile/internal/FileModelLoader.java (original)
+++ trunk/src_new/org/argouml/profile/FileModelLoader.java 2007-11-13 17:02:49-0800
@@ -22,7 +22,7 @@
// CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT,
// UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-package org.argouml.profile.internal;
+package org.argouml.profile;
import java.io.File;
import java.io.FileInputStream;
@@ -31,11 +31,9 @@
import java.util.Collection;
import org.apache.log4j.Logger;
-import org.argouml.profile.ProfileException;
/**
- * An implementation for the ProfileModelLoader that loads profiles from file
- * resources.
+ * An implementation for the ProfileModelLoader that loads profiles from files.
*
* @author maurelio1234
*/
@@ -43,8 +41,7 @@
/**
* Logger.
*/
- private static final Logger LOG = Logger
- .getLogger(FileModelLoader.class);
+ private static final Logger LOG = Logger.getLogger(FileModelLoader.class);
/**
* @param modelFilename the model to be loaded
Modified: trunk/src_new/org/argouml/profile/ProfileFacade.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/profile/ProfileFacade.java?view=diff&rev=13765&p1=trunk/src_new/org/argouml/profile/ProfileFacade.java&p2=trunk/src_new/org/argouml/profile/ProfileFacade.java&r1=13764&r2=13765
==============================================================================
--- trunk/src_new/org/argouml/profile/ProfileFacade.java (original)
+++ trunk/src_new/org/argouml/profile/ProfileFacade.java 2007-11-13 17:02:49-0800
@@ -63,4 +63,5 @@
}
private static ProfileManager manager;
+
}
Copied: trunk/src_new/org/argouml/profile/ProfileModelLoader.java (from r13757, /trunk/src_new/org/argouml/profile/internal/ProfileModelLoader.java)
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/profile/ProfileModelLoader.java?view=diff&rev=13765&p1=/trunk/src_new/org/argouml/profile/internal/ProfileModelLoader.java&p2=trunk/src_new/org/argouml/profile/ProfileModelLoader.java&r1=13757&r2=13765
==============================================================================
--- /trunk/src_new/org/argouml/profile/internal/ProfileModelLoader.java (original)
+++ trunk/src_new/org/argouml/profile/ProfileModelLoader.java 2007-11-13 17:02:49-0800
@@ -22,12 +22,10 @@
// CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT,
// UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-package org.argouml.profile.internal;
+package org.argouml.profile;
import java.util.Collection;
-import org.argouml.profile.ProfileException;
-
/**
* Objects implementing this class are responsible for loading profile models
*
Copied: trunk/src_new/org/argouml/profile/ResourceModelLoader.java (from r13762, /trunk/src_new/org/argouml/profile/internal/ResourceModelLoader.java)
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/profile/ResourceModelLoader.java?view=diff&rev=13765&p1=/trunk/src_new/org/argouml/profile/internal/ResourceModelLoader.java&p2=trunk/src_new/org/argouml/profile/ResourceModelLoader.java&r1=13762&r2=13765
==============================================================================
--- /trunk/src_new/org/argouml/profile/internal/ResourceModelLoader.java (original)
+++ trunk/src_new/org/argouml/profile/ResourceModelLoader.java 2007-11-13 17:02:49-0800
@@ -22,12 +22,11 @@
// CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT,
// UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-package org.argouml.profile.internal;
+package org.argouml.profile;
import java.util.Collection;
import org.apache.log4j.Logger;
-import org.argouml.profile.ProfileException;
/**
* Loads models using the default ClassLoader or a provided one.
Copied: trunk/src_new/org/argouml/profile/StreamModelLoader.java (from r13762, /trunk/src_new/org/argouml/profile/internal/StreamModelLoader.java)
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/profile/StreamModelLoader.java?view=diff&rev=13765&p1=/trunk/src_new/org/argouml/profile/internal/StreamModelLoader.java&p2=trunk/src_new/org/argouml/profile/StreamModelLoader.java&r1=13762&r2=13765
==============================================================================
--- /trunk/src_new/org/argouml/profile/internal/StreamModelLoader.java (original)
+++ trunk/src_new/org/argouml/profile/StreamModelLoader.java 2007-11-13 17:02:49-0800
@@ -22,7 +22,7 @@
// CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT,
// UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-package org.argouml.profile.internal;
+package org.argouml.profile;
import java.io.InputStream;
import java.util.Collection;
@@ -31,7 +31,6 @@
import org.argouml.model.Model;
import org.argouml.model.UmlException;
import org.argouml.model.XmiReader;
-import org.argouml.profile.ProfileException;
import org.xml.sax.InputSource;
/**
Copied: trunk/src_new/org/argouml/profile/UserDefinedProfile.java (from r13757, /trunk/src_new/org/argouml/profile/internal/UserDefinedProfile.java)
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/profile/UserDefinedProfile.java?view=diff&rev=13765&p1=/trunk/src_new/org/argouml/profile/internal/UserDefinedProfile.java&p2=trunk/src_new/org/argouml/profile/UserDefinedProfile.java&r1=13757&r2=13765
==============================================================================
--- /trunk/src_new/org/argouml/profile/internal/UserDefinedProfile.java (original)
+++ trunk/src_new/org/argouml/profile/UserDefinedProfile.java 2007-11-13 17:02:49-0800
@@ -22,16 +22,11 @@
// CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT,
// UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-package org.argouml.profile.internal;
+package org.argouml.profile;
import java.io.File;
import java.util.Collection;
-import org.argouml.profile.FigNodeStrategy;
-import org.argouml.profile.FormatingStrategy;
-import org.argouml.profile.Profile;
-import org.argouml.profile.ProfileException;
-
/**
* Represents a profile defined by the user
*
Copied: trunk/src_new/org/argouml/profile/ZipModelLoader.java (from r13762, /trunk/src_new/org/argouml/uml/profile/ZipModelLoader.java)
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/profile/ZipModelLoader.java?view=diff&rev=13765&p1=/trunk/src_new/org/argouml/uml/profile/ZipModelLoader.java&p2=trunk/src_new/org/argouml/profile/ZipModelLoader.java&r1=13762&r2=13765
==============================================================================
--- /trunk/src_new/org/argouml/uml/profile/ZipModelLoader.java (original)
+++ trunk/src_new/org/argouml/profile/ZipModelLoader.java 2007-11-13 17:02:49-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.profile;
import java.io.File;
import java.io.IOException;
Removed: trunk/src_new/org/argouml/profile/internal/FileModelLoader.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/profile/internal/FileModelLoader.java?view=auto&rev=13764
Modified: trunk/src_new/org/argouml/profile/internal/ProfileJava.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/profile/internal/ProfileJava.java?view=diff&rev=13765&p1=trunk/src_new/org/argouml/profile/internal/ProfileJava.java&p2=trunk/src_new/org/argouml/profile/internal/ProfileJava.java&r1=13764&r2=13765
==============================================================================
--- trunk/src_new/org/argouml/profile/internal/ProfileJava.java (original)
+++ trunk/src_new/org/argouml/profile/internal/ProfileJava.java 2007-11-13 17:02:49-0800
@@ -32,6 +32,8 @@
import org.argouml.profile.Profile;
import org.argouml.profile.ProfileException;
import org.argouml.profile.ProfileFacade;
+import org.argouml.profile.ProfileModelLoader;
+import org.argouml.profile.ResourceModelLoader;
/**
* This class represents the Java default Profile
Modified: trunk/src_new/org/argouml/profile/internal/ProfileManagerImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/profile/internal/ProfileManagerImpl.java?view=diff&rev=13765&p1=trunk/src_new/org/argouml/profile/internal/ProfileManagerImpl.java&p2=trunk/src_new/org/argouml/profile/internal/ProfileManagerImpl.java&r1=13764&r2=13765
==============================================================================
--- trunk/src_new/org/argouml/profile/internal/ProfileManagerImpl.java (original)
+++ trunk/src_new/org/argouml/profile/internal/ProfileManagerImpl.java 2007-11-13 17:02:49-0800
@@ -36,6 +36,7 @@
import org.argouml.profile.Profile;
import org.argouml.profile.ProfileException;
import org.argouml.profile.ProfileManager;
+import org.argouml.profile.UserDefinedProfile;
/**
* Default <code>ProfileManager</code> implementation
Removed: trunk/src_new/org/argouml/profile/internal/ProfileModelLoader.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/profile/internal/ProfileModelLoader.java?view=auto&rev=13764
Modified: trunk/src_new/org/argouml/profile/internal/ProfileUML.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/profile/internal/ProfileUML.java?view=diff&rev=13765&p1=trunk/src_new/org/argouml/profile/internal/ProfileUML.java&p2=trunk/src_new/org/argouml/profile/internal/ProfileUML.java&r1=13764&r2=13765
==============================================================================
--- trunk/src_new/org/argouml/profile/internal/ProfileUML.java (original)
+++ trunk/src_new/org/argouml/profile/internal/ProfileUML.java 2007-11-13 17:02:49-0800
@@ -32,6 +32,8 @@
import org.argouml.profile.FormatingStrategy;
import org.argouml.profile.Profile;
import org.argouml.profile.ProfileException;
+import org.argouml.profile.ProfileModelLoader;
+import org.argouml.profile.ResourceModelLoader;
/**
* This class represents the default UML profile
Removed: trunk/src_new/org/argouml/profile/internal/ResourceModelLoader.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/profile/internal/ResourceModelLoader.java?view=auto&rev=13764
Removed: trunk/src_new/org/argouml/profile/internal/StreamModelLoader.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/profile/internal/StreamModelLoader.java?view=auto&rev=13764
Removed: trunk/src_new/org/argouml/profile/internal/UserDefinedProfile.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/profile/internal/UserDefinedProfile.java?view=auto&rev=13764
Modified: trunk/src_new/org/argouml/uml/profile/ProfileConfiguration.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/profile/ProfileConfiguration.java?view=diff&rev=13765&p1=trunk/src_new/org/argouml/uml/profile/ProfileConfiguration.java&p2=trunk/src_new/org/argouml/uml/profile/ProfileConfiguration.java&r1=13764&r2=13765
==============================================================================
--- trunk/src_new/org/argouml/uml/profile/ProfileConfiguration.java (original)
+++ trunk/src_new/org/argouml/uml/profile/ProfileConfiguration.java 2007-11-13 17:02:49-0800
@@ -149,6 +149,7 @@
try {
profileModels.addAll(p.getProfilePackages());
} catch (ProfileException e) {
+ LOG.warn("Error retrieving profile's " + p + " packages.", e);
}
FigNodeStrategy fns = p.getFigureStrategy();
@@ -161,6 +162,7 @@
}
updateStrategies();
+ // FIXME: remove this dependency
ExplorerEventAdaptor.getInstance().structureChanged();
}
}
@@ -206,6 +208,7 @@
}
updateStrategies();
+ // FIXME: remove this dependency
ExplorerEventAdaptor.getInstance().structureChanged();
}
@@ -264,7 +267,9 @@
/**
- * Find a stereotype with the given name which is applicable to the given element.
+ * Find a stereotype with the given name which is applicable to the given
+ * element.
+ *
* @param name name of stereotype to look for
* @param element model element to which the stereotype must be applicable
* @return the stereotype or null if none found
Removed: trunk/src_new/org/argouml/uml/profile/ProfileCpp.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/profile/ProfileCpp.java?view=auto&rev=13764
Modified: trunk/src_new/org/argouml/uml/profile/ProfileManagerImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/profile/ProfileManagerImpl.java?view=diff&rev=13765&p1=trunk/src_new/org/argouml/uml/profile/ProfileManagerImpl.java&p2=trunk/src_new/org/argouml/uml/profile/ProfileManagerImpl.java&r1=13764&r2=13765
==============================================================================
--- trunk/src_new/org/argouml/uml/profile/ProfileManagerImpl.java (original)
+++ trunk/src_new/org/argouml/uml/profile/ProfileManagerImpl.java 2007-11-13 17:02:49-0800
@@ -71,7 +71,6 @@
registerProfile(ProfileUML.getInstance());
registerProfile(ProfileJava.getInstance());
- registerProfile(ProfileCpp.getInstance());
loadDirectoriesFromConfiguration();
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.