Fix AS7-1733

jbossas · Sep 15, 2011 · e0174d1 · e0174d1
1 parent c17d941
commit e0174d1
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 15 deletions.
diff --git a/gui/src/main/java/org/jboss/as/console/client/domain/model/impl/ProfileStoreImpl.java b/gui/src/main/java/org/jboss/as/console/client/domain/model/impl/ProfileStoreImpl.java
@@ -81,10 +81,6 @@ public void onSuccess(DMRResponse result) {
                     records.add(record);
                 }
 
-                // early initialization
-                if(records.size()>0)
-                    currentProfile.setName(records.get(0).getName());
-
                 callback.onSuccess(records);
             }
         });

diff --git a/gui/src/main/java/org/jboss/as/console/client/domain/profiles/ProfileSelector.java b/gui/src/main/java/org/jboss/as/console/client/domain/profiles/ProfileSelector.java
@@ -67,11 +67,13 @@ public Widget asWidget() {
     }
 
     private void fireProfileSelection(String name) {
-       Console.MODULES.getEventBus().fireEvent(new ProfileSelectionEvent(name));
+        Console.MODULES.getEventBus().fireEvent(new ProfileSelectionEvent(name));
     }
 
     public void updateProfiles(final List<ProfileRecord> profileRecords) {
 
+        final String prevSelected = profileSelection.getSelectedValue();
+
         profileSelection.clearValues();
 
         for(ProfileRecord record : profileRecords)
@@ -85,19 +87,16 @@ public void updateProfiles(final List<ProfileRecord> profileRecords) {
             public void execute() {
 
                 int selectedIndex = 0;
-                for(int i=0; i<profileSelection.getItemCount(); i++)
+                if(prevSelected!=null && !prevSelected.equals(""))
                 {
-                    if("preview-base".equals(profileSelection.getValue(i)))     // domain-preview.xml
-                    {
-                        selectedIndex=i;
-                        break;
-                    }
-                    else if("web-base".equals(profileSelection.getValue(i)))     // domain.xml
+                    for(int i=0; i<profileSelection.getItemCount(); i++)
                     {
-                        selectedIndex=i;
-                        break;
+                        if(prevSelected.equals(profileSelection.getValue(i)))
+                        {
+                            selectedIndex=i;
+                            break;
+                        }
                     }
-
                 }
 
                 profileSelection.setItemSelected(selectedIndex, true);