svn commit: r13896 - trunk/src_new: META-INF org/argouml/application org/argouml/profile org/argouml/profile/internal

Author: mvw
Date: 2007-12-09 05:14:55-0800
New Revision: 13896

Added:
   trunk/src_new/org/argouml/profile/internal/InitProfileSubsystem.java
      - copied, changed from r13871, /trunk/src_new/org/argouml/profile/InitProfileSubsystem.java
Removed:
   trunk/src_new/org/argouml/profile/InitProfileSubsystem.java
Modified:
   trunk/src_new/META-INF/MANIFEST.MF
   trunk/src_new/org/argouml/application/Main.java
   trunk/src_new/org/argouml/profile/ProfileFacade.java

Log:
Fixed a package cycle between org.argouml.profile and org.argouml.profile.internal.

Modified: trunk/src_new/META-INF/MANIFEST.MF
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/META-INF/MANIFEST.MF?view=diff&rev=13896&p1=trunk/src_new/META-INF/MANIFEST.MF&p2=trunk/src_new/META-INF/MANIFEST.MF&r1=13895&r2=13896
==============================================================================
--- trunk/src_new/META-INF/MANIFEST.MF	(original)
+++ trunk/src_new/META-INF/MANIFEST.MF	2007-12-09 05:14:55-0800
@@ -36,6 +36,7 @@
  org.argouml.pattern.cognitive.critics,
  org.argouml.persistence,
  org.argouml.profile,
+ org.argouml.profile.internal,
  org.argouml.swingext,
  org.argouml.taskmgmt,
  org.argouml.ui,

Modified: trunk/src_new/org/argouml/application/Main.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/application/Main.java?view=diff&rev=13896&p1=trunk/src_new/org/argouml/application/Main.java&p2=trunk/src_new/org/argouml/application/Main.java&r1=13895&r2=13896
==============================================================================
--- trunk/src_new/org/argouml/application/Main.java	(original)
+++ trunk/src_new/org/argouml/application/Main.java	2007-12-09 05:14:55-0800
@@ -68,7 +68,7 @@
 import org.argouml.notation.providers.uml.InitNotationUml;
 import org.argouml.notation.ui.InitNotationUI;
 import org.argouml.persistence.PersistenceManager;
-import org.argouml.profile.InitProfileSubsystem;
+import org.argouml.profile.internal.InitProfileSubsystem;
 import org.argouml.ui.ArgoFrame;
 import org.argouml.ui.LookAndFeelMgr;
 import org.argouml.ui.ProjectBrowser;

Removed: trunk/src_new/org/argouml/profile/InitProfileSubsystem.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/profile/InitProfileSubsystem.java?view=auto&rev=13895

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=13896&p1=trunk/src_new/org/argouml/profile/ProfileFacade.java&p2=trunk/src_new/org/argouml/profile/ProfileFacade.java&r1=13895&r2=13896
==============================================================================
--- trunk/src_new/org/argouml/profile/ProfileFacade.java	(original)
+++ trunk/src_new/org/argouml/profile/ProfileFacade.java	2007-12-09 05:14:55-0800
@@ -65,7 +65,10 @@
                 + " isn't initialized!");
     }
 
-    static void setManager(ProfileManager profileManager) {
+    /**
+     * @param profileManager the manager of the profiles to be used
+     */
+    public static void setManager(ProfileManager profileManager) {
         manager = profileManager;
     }
 

Copied: trunk/src_new/org/argouml/profile/internal/InitProfileSubsystem.java (from r13871, /trunk/src_new/org/argouml/profile/InitProfileSubsystem.java)
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/profile/internal/InitProfileSubsystem.java?view=diff&rev=13896&p1=/trunk/src_new/org/argouml/profile/InitProfileSubsystem.java&p2=trunk/src_new/org/argouml/profile/internal/InitProfileSubsystem.java&r1=13871&r2=13896
==============================================================================
--- /trunk/src_new/org/argouml/profile/InitProfileSubsystem.java	(original)
+++ trunk/src_new/org/argouml/profile/internal/InitProfileSubsystem.java	2007-12-09 05:14:55-0800
@@ -22,13 +22,14 @@
 // CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT,
 // UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 
-package org.argouml.profile;
+package org.argouml.profile.internal;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import org.argouml.application.api.GUISettingsTabInterface;
 import org.argouml.application.api.InitSubsystem;
+import org.argouml.profile.ProfileFacade;
 
 /**
  * Initializer class for the Profile subsystem.