17955 Package name wrongly displayed
authorPadraig O'Briain <padraig.obriain@oracle.com>
Fri, 11 Mar 2011 08:41:59 +0000
changeset 2249 2bd2e9e614d8
parent 2248 ed0aeb87d2e3
child 2250 f852a2b88100
17955 Package name wrongly displayed
src/gui/modules/misc.py
--- a/src/gui/modules/misc.py	Thu Mar 10 14:34:53 2011 +0000
+++ b/src/gui/modules/misc.py	Fri Mar 11 08:41:59 2011 +0000
@@ -19,7 +19,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
 #
 
 SPECIAL_CATEGORIES = ["locale", "plugin"] # We should cut all, but last part of the
@@ -216,6 +216,7 @@
                 return name_table[0]
         elif len_name_table == 1:
                 return name
+        name_table.reverse()
         max_special_level = 0
         for special_name in special_table:
                 if name.endswith(special_name):
@@ -223,16 +224,20 @@
                         if level > max_special_level:
                                 max_special_level = level
         for special_category in SPECIAL_CATEGORIES:
-                pos = name.find(special_category)
-                if pos != -1:
-                        level = len(name[pos:].split("/"))
+                found = False
+                level = 1
+                while  level < len_name_table:
+                        if special_category == name_table[level - 1]:
+                                found = True
+                                break
+                        level += 1 
+                if found:
                         if level > max_special_level:
                                 max_special_level = level
 
         if len_name_table < max_special_level:
                 return name
 
-        name_table.reverse()
         new_name = []
         i = 0
         for entry in name_table: