Index: Bundle.properties =================================================================== RCS file: /cvs/editor/src/org/netbeans/modules/editor/java/Bundle.properties,v retrieving revision 1.48 diff -u -r1.48 Bundle.properties --- Bundle.properties 2 May 2003 11:53:22 -0000 1.48 +++ Bundle.properties 14 Jul 2003 18:55:02 -0000 @@ -6,10 +6,11 @@ # http://www.sun.com/ # # The Original Code is NetBeans. The Initial Developer of the Original -# Code is Sun Microsystems, Inc. Portions Copyright 1997-2000 Sun +# Code is Sun Microsystems, Inc. Portions Copyright 1997-2003 Sun # Microsystems, Inc. All Rights Reserved. -JC_title=Update Code Completion Database +# {0} - file system display name +JC_title_fmt=Update Code Completion Database {0} JC_progress_title=Updating Code Completion Database JC_db_prefix=Code Completion Database File Name JC_db_prefix.mnemonic=P @@ -39,7 +40,7 @@ JC_creating_parserDB_status_displayer=Creating code completion database for the filesystem {0}... JC_parsing_finished_status_displayer=Code completion database has been created for the filesystem {0}. JC_parsing_cancelled_status_displayer=Creation of the code completion database for the filesystem {0} has been cancelled. -ERR_Wrong_mounting_point=Class \"{0}\" claims to exist in package \"{1}\", yet it is mounted under package \"{2}\". The package \"{2}\" will not be updated." +ERR_Wrong_mounting_point=Class \"{0}\" claims to exist in package \"{1}\", yet it is mounted under package \"{2}\". The package \"{2}\" will not be updated. ACSD_CTL_JC_level_package= ACSD_CTL_JC_level_private= ACSD_CTL_JC_level_protected= Index: JCUpdater.java =================================================================== RCS file: /cvs/editor/src/org/netbeans/modules/editor/java/JCUpdater.java,v retrieving revision 1.61 diff -u -r1.61 JCUpdater.java --- JCUpdater.java 2 Jul 2003 12:00:18 -0000 1.61 +++ JCUpdater.java 14 Jul 2003 18:55:02 -0000 @@ -70,7 +70,7 @@ = Boolean.getBoolean("netbeans.debug.editor.updater"); // NOI18N - private static final String BUNDLE_TITLE = "JC_title"; // NOI18N + private static final String BUNDLE_TITLE = "JC_title_fmt"; // NOI18N private static final String BUNDLE_INSPECTING = "JC_inspecting"; // NOI18N private static final String BUNDLE_BUILDING_CLASS = "JC_building_class"; // NOI18N private static final String BUNDLE_INIT_PARSER = "JC_init_parser"; // NOI18N @@ -245,7 +245,7 @@ QueueEnumeration qe = new QueueEnumeration(); int cnt = 0; boolean root = false; - String fsName = null; + String fsName = null, fsDisplayName = null; DataFolder df = (DataFolder)n.getCookie(DataFolder.class); if (getFS(n)!=null && processedNodes.contains(getFS(n))){ if (debug) System.err.println("FS is already updating:"+getFS(n).getSystemName()); @@ -261,7 +261,9 @@ cnt = doneCnt; doneCnt = 0; FileObject fo = df.getPrimaryFile(); - fsName = fo.getFileSystem().getSystemName(); + FileSystem fs = fo.getFileSystem(); + fsName = fs.getSystemName(); + fsDisplayName = fs.getDisplayName(); root = fo.isRoot(); } else { @@ -271,19 +273,21 @@ // Updating has been invoked on Java source object. // This happens mainly during automatic parsing of modified sources qe.put(sc); - fsName = ((DataObject)n.getCookie(DataObject.class)).getPrimaryFile( - ).getFileSystem().getSystemName(); + FileSystem fs = ((DataObject)n.getCookie(DataObject.class)).getPrimaryFile( + ).getFileSystem(); + fsName = fs.getSystemName(); + fsDisplayName = fs.getDisplayName(); } } } catch (FileStateInvalidException e) { - // fsName will be null + // fsName, fsDisplayName will be null } // process queue if (cnt > 0 && fsName != null) { if (progress!=null){ if (displayProviderPanel){ - return progress.cancelled ? false : updateProvider(qe, cnt, fsName, root, progress); + return progress.cancelled ? false : updateProvider(qe, cnt, fsName, fsDisplayName, root, progress); }else{ return updateProviderOnBackground(qe, cnt, fsName, root); } @@ -516,8 +520,8 @@ return sb.toString(); } - boolean updateProvider(final QueueEnumeration qe, final int classCnt, - String fsName, boolean isRoot, final ProgressPanel progress) { + private boolean updateProvider(final QueueEnumeration qe, final int classCnt, + String fsName, String fsDisplayName, boolean isRoot, final ProgressPanel progress) { // Get provider @@ -544,7 +548,7 @@ do{ overwrite = true; DialogDescriptor dd = new DialogDescriptor(pp, - getBundleString(BUNDLE_TITLE) + ' ' + fsName); + MessageFormat.format(getBundleString(BUNDLE_TITLE), new Object[] {fsDisplayName})); final Dialog d = org.openide.DialogDisplayer.getDefault().createDialog(dd); @@ -687,7 +691,7 @@ } /** Update memory and Code Completion Database after save document event */ - boolean updateProviderOnBackground(final QueueEnumeration qe, final int classCnt, + private boolean updateProviderOnBackground(final QueueEnumeration qe, final int classCnt, String fsName, boolean isRoot) { Map lookupCacheBkg = new HashMap(89);