svn commit: r14003 - trunk/src_new/org/argouml: . profile profile/internal profile/profiles

Author: tfmorris
Date: 2007-12-27 09:35:31-0800
New Revision: 14003

Added:
   trunk/src_new/org/argouml/profile/profiles/
   trunk/src_new/org/argouml/profile/profiles/README.txt
      - copied unchanged from r13882, /trunk/src/model-mdr/src/org/argouml/model/mdr/profiles/README.txt
   trunk/src_new/org/argouml/profile/profiles/andromda-profile-31.xmi
      - copied unchanged from r13882, /trunk/src/model-mdr/src/org/argouml/model/mdr/profiles/andromda-profile-31.xmi
   trunk/src_new/org/argouml/profile/profiles/andromda-profile-32-noextensions.xmi
      - copied unchanged from r13882, /trunk/src/model-mdr/src/org/argouml/model/mdr/profiles/andromda-profile-32-noextensions.xmi
   trunk/src_new/org/argouml/profile/profiles/default-java.xmi
      - copied unchanged from r13914, /trunk/src_new/org/argouml/default-java.xmi
   trunk/src_new/org/argouml/profile/profiles/default-uml14-uml20-deprecated.xmi
      - copied unchanged from r13882, /trunk/src/model-mdr/src/org/argouml/model/mdr/profiles/default-uml14-uml20-deprecated.xmi
   trunk/src_new/org/argouml/profile/profiles/default-uml14-uml20-subset.xmi
      - copied unchanged from r13882, /trunk/src/model-mdr/src/org/argouml/model/mdr/profiles/default-uml14-uml20-subset.xmi
   trunk/src_new/org/argouml/profile/profiles/default-uml14.xmi
      - copied unchanged from r13914, /trunk/src_new/org/argouml/default-uml14.xmi
Removed:
   trunk/src_new/org/argouml/default-java.xmi
   trunk/src_new/org/argouml/default-uml14.xmi
   trunk/src_new/org/argouml/default.xmi
   trunk/src_new/org/argouml/defaultold.xml
Modified:
   trunk/src_new/org/argouml/profile/Profile.java
   trunk/src_new/org/argouml/profile/internal/ProfileJava.java
   trunk/src_new/org/argouml/profile/internal/ProfileUML.java

Log:
Move profiles to their own package in main argouml project

Removed: trunk/src_new/org/argouml/default-java.xmi
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/default-java.xmi?view=auto&rev=14002

Removed: trunk/src_new/org/argouml/default-uml14.xmi
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/default-uml14.xmi?view=auto&rev=14002

Removed: trunk/src_new/org/argouml/default.xmi
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/default.xmi?view=auto&rev=14002

Removed: trunk/src_new/org/argouml/defaultold.xml
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/defaultold.xml?view=auto&rev=14002

Modified: trunk/src_new/org/argouml/profile/Profile.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/profile/Profile.java?view=diff&rev=14003&p1=trunk/src_new/org/argouml/profile/Profile.java&p2=trunk/src_new/org/argouml/profile/Profile.java&r1=14002&r2=14003
==============================================================================
--- trunk/src_new/org/argouml/profile/Profile.java	(original)
+++ trunk/src_new/org/argouml/profile/Profile.java	2007-12-27 09:35:31-0800
@@ -41,6 +41,11 @@
  */
 public abstract class Profile {
     
+    /**
+     * Base directory/resource path to use for searching for profiles
+     */
+    public static final String PROFILE_DIR = "/org/argouml/profile/profiles/";
+    
     private Set<Profile> importedProfiles  = new HashSet<Profile>();
     private Set<Profile> importingProfiles = new HashSet<Profile>();
         

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=14003&p1=trunk/src_new/org/argouml/profile/internal/ProfileJava.java&p2=trunk/src_new/org/argouml/profile/internal/ProfileJava.java&r1=14002&r2=14003
==============================================================================
--- trunk/src_new/org/argouml/profile/internal/ProfileJava.java	(original)
+++ trunk/src_new/org/argouml/profile/internal/ProfileJava.java	2007-12-27 09:35:31-0800
@@ -42,7 +42,10 @@
  */
 public class ProfileJava extends Profile {
 
+    private static final String PROFILE_FILE = 
+        PROFILE_DIR + "default-java.xmi";
     static final String NAME = "Java";
+    
     private ProfileModelLoader profileModelLoader;
     private Collection model;
     
@@ -53,7 +56,7 @@
     @SuppressWarnings("unchecked")
     ProfileJava(Profile uml) throws ProfileException {
         profileModelLoader = new ResourceModelLoader();
-        model = profileModelLoader.loadModel("/org/argouml/default-java.xmi");
+        model = profileModelLoader.loadModel(PROFILE_FILE);
 
         if (model == null) {
             model = new ArrayList();

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=14003&p1=trunk/src_new/org/argouml/profile/internal/ProfileUML.java&p2=trunk/src_new/org/argouml/profile/internal/ProfileUML.java&r1=14002&r2=14003
==============================================================================
--- trunk/src_new/org/argouml/profile/internal/ProfileUML.java	(original)
+++ trunk/src_new/org/argouml/profile/internal/ProfileUML.java	2007-12-27 09:35:31-0800
@@ -42,7 +42,8 @@
  */
 public class ProfileUML extends Profile {
     
-    private static final String PROFILE_FILE = "/org/argouml/default-uml14.xmi";
+    private static final String PROFILE_FILE = 
+        PROFILE_DIR + "default-uml14.xmi";
 
     static final String NAME = "UML 1.4";
     
@@ -58,8 +59,7 @@
     ProfileUML() throws ProfileException {
         formatingStrategy = new JavaFormatingStrategy();
         profileModelLoader = new ResourceModelLoader();
-        model = profileModelLoader
-                .loadModel(PROFILE_FILE);
+        model = profileModelLoader.loadModel(PROFILE_FILE);
 
         if (model == null) {
             model = new ArrayList();