svn commit: r17054 - trunk/src/argouml-app: src/org/argouml/profile/internal tests/org/argouml/persistence tests/org/argouml/profile/internal

Author: thn
Date: 2009-04-06 10:27:32-0700
New Revision: 17054

Removed:
   trunk/src/argouml-app/src/org/argouml/profile/internal/ProfileJava.java
   trunk/src/argouml-app/tests/org/argouml/profile/internal/TestProfileJava.java
Modified:
   trunk/src/argouml-app/src/org/argouml/profile/internal/ProfileManagerImpl.java
   trunk/src/argouml-app/tests/org/argouml/persistence/TestProfileConfigurationFilePersister.java
   trunk/src/argouml-app/tests/org/argouml/profile/internal/TestProfileManagerImpl.java

Log:
the Java profile has moved to the argouml-java project

Removed: trunk/src/argouml-app/src/org/argouml/profile/internal/ProfileJava.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/profile/internal/ProfileJava.java?view=markup&pathrev=17053

Modified: trunk/src/argouml-app/src/org/argouml/profile/internal/ProfileManagerImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/profile/internal/ProfileManagerImpl.java?view=diff&pathrev=17054&r1=17053&r2=17054
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/profile/internal/ProfileManagerImpl.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/profile/internal/ProfileManagerImpl.java	2009-04-06 10:27:32-0700
@@ -86,8 +86,6 @@
 
     private ProfileUML profileUML;
     
-    private ProfileJava profileJava;
-    
     private ProfileGoodPractices profileGoodPractices;
     
     private ProfileCodeGeneration profileCodeGeneration;
@@ -101,7 +99,6 @@
             disableConfigurationUpdate = true;
             
             profileUML = new ProfileUML();
-            profileJava = new ProfileJava(profileUML);
             profileGoodPractices = new ProfileGoodPractices();
             profileCodeGeneration = new ProfileCodeGeneration(
                     profileGoodPractices);
@@ -111,9 +108,8 @@
                 // the UML Profile is always present and default
             
             // register the built-in profiles
-            registerProfile(profileJava);                
-            registerProfile(profileGoodPractices);                
-            registerProfile(profileCodeGeneration);                
+            registerProfile(profileGoodPractices);
+            registerProfile(profileCodeGeneration);
             registerProfile(new ProfileMeta());
 
         } catch (ProfileException e) {
@@ -140,7 +136,6 @@
                 // add the Java profile and the code generation and good practices
                 // profiles as default
 
-                addToDefaultProfiles(profileJava);
                 addToDefaultProfiles(profileGoodPractices);
                 addToDefaultProfiles(profileCodeGeneration);
                 

Modified: trunk/src/argouml-app/tests/org/argouml/persistence/TestProfileConfigurationFilePersister.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/tests/org/argouml/persistence/TestProfileConfigurationFilePersister.java?view=diff&pathrev=17054&r1=17053&r2=17054
==============================================================================
--- trunk/src/argouml-app/tests/org/argouml/persistence/TestProfileConfigurationFilePersister.java	(original)
+++ trunk/src/argouml-app/tests/org/argouml/persistence/TestProfileConfigurationFilePersister.java	2009-04-06 10:27:32-0700
@@ -54,7 +54,6 @@
 import org.argouml.profile.ResourceModelLoader;
 import org.argouml.profile.UserProfileReference;
 import org.argouml.profile.init.InitProfileSubsystem;
-import org.argouml.profile.internal.ProfileJava;
 import org.argouml.profile.internal.ProfileUML;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
@@ -157,8 +156,6 @@
         Iterator<Profile> profileIter = profiles.iterator();
         assertTrue("Didn't get expected UML profile", 
                 profileIter.next() instanceof ProfileUML);
-        assertTrue("Didn't get expected Java profile", 
-                profileIter.next() instanceof ProfileJava);
     }
     
     /**

Removed: trunk/src/argouml-app/tests/org/argouml/profile/internal/TestProfileJava.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/tests/org/argouml/profile/internal/TestProfileJava.java?view=markup&pathrev=17053

Modified: trunk/src/argouml-app/tests/org/argouml/profile/internal/TestProfileManagerImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/tests/org/argouml/profile/internal/TestProfileManagerImpl.java?view=diff&pathrev=17054&r1=17053&r2=17054
==============================================================================
--- trunk/src/argouml-app/tests/org/argouml/profile/internal/TestProfileManagerImpl.java	(original)
+++ trunk/src/argouml-app/tests/org/argouml/profile/internal/TestProfileManagerImpl.java	2009-04-06 10:27:32-0700
@@ -36,6 +36,7 @@
 import org.argouml.profile.Profile;
 import org.argouml.profile.ProfileException;
 import org.argouml.profile.ProfileManager;
+import org.argouml.uml.cognitive.critics.ProfileGoodPractices;
 
 /**
  * Tests for the ProfileManagerImpl class.
@@ -61,8 +62,7 @@
         assertTrue(2 <= registeredProfiles.size());
         Set<String> internalProfileNameSet = new HashSet<String>();
         for (Profile profile : registeredProfiles) {
-            if (profile.getDisplayName().equals(ProfileUML.NAME)
-                    || profile.getDisplayName().equals(ProfileJava.NAME)) {
+            if (profile.getDisplayName().equals(ProfileUML.NAME_UML14)) {
                 internalProfileNameSet.add(profile.getDisplayName());
             }
         }
@@ -73,12 +73,12 @@
      * test remove profile
      */
     public void testRemoveProfileThatIsntDefault() {
-        Profile javaProfile = manager.getProfileForClass(ProfileJava.class
+        Profile gpProfile = manager.getProfileForClass(ProfileGoodPractices.class
                 .getName());
-        assertNotNull(javaProfile);
-        assertTrue(manager.getRegisteredProfiles().contains(javaProfile));
-        manager.removeProfile(javaProfile);
-        assertFalse(manager.getRegisteredProfiles().contains(javaProfile));
+        assertNotNull(gpProfile);
+        assertTrue(manager.getRegisteredProfiles().contains(gpProfile));
+        manager.removeProfile(gpProfile);
+        assertFalse(manager.getRegisteredProfiles().contains(gpProfile));
     }
 
     /**

------------------------------------------------------
http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=1563402

To unsubscribe from this discussion, e-mail: [[email protected]].