Index: SearchThreadJdk12_japan.java
===================================================================
RCS file: /cvs/javadoc/src/org/netbeans/modules/javadoc/search/SearchThreadJdk12_japan.java,v
retrieving revision 1.13
diff -u -u -r1.13 SearchThreadJdk12_japan.java
--- SearchThreadJdk12_japan.java	15 Jul 2005 12:13:02 -0000	1.13
+++ SearchThreadJdk12_japan.java	6 Apr 2006 00:50:50 -0000
@@ -354,16 +354,22 @@
                 currentDii.setRemark( text );
 
                 StringTokenizer st = new StringTokenizer( text );
-                String token = st.nextToken();
+                String token;
+                
+                boolean isStatic = false;
+                try {
+                    token = st.nextToken();
                 if ( token.equals( STR_DASH ) )
                     token = st.nextToken();
 
-                boolean isStatic = false;
-
                 if ( token.equalsIgnoreCase( STR_STATIC ) ) {
                     isStatic = true;
                     token = st.nextToken();
                 }
+                } catch (Exception ex) {
+                    where = IN_DESCRIPTION_SUFFIX;
+                    return;
+                }
                 
                 if ( token.equalsIgnoreCase( STR_CLASS ) )
                     currentDii.setIconIndex( DocSearchIcons.ICON_CLASS );
@@ -404,6 +410,7 @@
                 currentDii.setRemark( currentDii.getRemark() + remark);
                 String declaringClass = remark.trim();
                 if( !(".".equals(declaringClass))){    //NOI18N
+                    if (currentDii.getDeclaringClass() == null) {
                     currentDii.setDeclaringClass(declaringClass);
 
                     // System.out.println("Data: " + text );
@@ -411,14 +418,15 @@
                     if( remark.indexOf( STR_STATIC ) != -1 )
                         isStatic = true;
 
-                    if( remark.indexOf ( STR_CONSTRUCTOR_JA ) != -1 )
-                        currentDii.setIconIndex (DocSearchIcons.ICON_CONSTRUCTOR );
-                    else if( remark.indexOf ( STR_METHOD_JA ) != -1 )
-                        currentDii.setIconIndex ( isStatic ? DocSearchIcons.ICON_METHOD_ST : DocSearchIcons.ICON_METHOD );
-                    else if( remark.indexOf ( STR_VARIABLE_JA ) != -1 )
-                        currentDii.setIconIndex ( isStatic ? DocSearchIcons.ICON_VARIABLE_ST : DocSearchIcons.ICON_VARIABLE );
+                        if( remark.indexOf( STR_CONSTRUCTOR_JA ) != -1 )
+                            currentDii.setIconIndex(DocSearchIcons.ICON_CONSTRUCTOR );
+                        else if( remark.indexOf( STR_METHOD_JA ) != -1 )
+                            currentDii.setIconIndex( isStatic ? DocSearchIcons.ICON_METHOD_ST : DocSearchIcons.ICON_METHOD );
+                        else if( remark.indexOf( STR_VARIABLE_JA ) != -1 )
+                            currentDii.setIconIndex( isStatic ? DocSearchIcons.ICON_VARIABLE_ST : DocSearchIcons.ICON_VARIABLE );
                     insertDocIndexItem( currentDii );
                 }
+            }
             }
             else
                 where = IN_BALAST;