Improvements in notebook usability

- Added opening notebooks in context of a project
    - Also added change project context button in the notebook toolbar
    - Added few more tests
- Added localization in notebooks
- Fixed jshell flow and updated open jshell label
- Other cleanup and fixes
    - updated netbeans patch
    - cleanup of some unused code and added license header to missing files
    - formatted files and removed unused imports
    - updated ajv to latest version: 8.17.1
    - updated artifactory urls
    - fixed the execution status issue
    - removed console.log and replaced with standard extension logger

Author: Achal1607

build.xml

@@ -79,7 +79,6 @@
             patches/dev-dependency-licenses.diff
             patches/nb-telemetry.diff
             patches/change-method-parameters-refactoring-qualified-names.diff
-            patches/javavscode-375.diff
 	        patches/upgrade-lsp4j.diff
 	        patches/java-notebooks.diff
         </string>

nbcode/notebooks/src/org/netbeans/modules/nbcode/java/notebook/CellState.java

@@ -144,8 +144,8 @@ protected CompletableFuture<CellStateResponse> requestLatestCellState() {
         }
         return client.getNotebookCellState(new NotebookCellStateParams(notebookUri, cellUri));
     }
-    
-    protected VersionAwareContent getVersionAwareContent(){
+
+    protected VersionAwareContent getVersionAwareContent() {
         return this.content.get();
     }
 

nbcode/notebooks/src/org/netbeans/modules/nbcode/java/notebook/JshellStreamsHandler.java

@@ -15,7 +15,6 @@
  */
 package org.netbeans.modules.nbcode.java.notebook;
 
-import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.PrintStream;
@@ -26,65 +25,66 @@
 
 /**
  * Handles JShell output and error streams for notebook execution.
- * 
+ *
  * @author atalati
  */
 public class JshellStreamsHandler implements AutoCloseable {
+
     private static final Logger LOG = Logger.getLogger(JshellStreamsHandler.class.getName());
     private final String notebookId;
     private final StreamingOutputStream outStream;
     private final StreamingOutputStream errStream;
     private final PrintStream printOutStream;
     private final PrintStream printErrStream;
     private final InputStream inputStream;
-    
+
     public JshellStreamsHandler(String notebookId, BiConsumer<String, byte[]> streamCallback) {
         this(notebookId, streamCallback, streamCallback);
     }
-    
-    public JshellStreamsHandler(String notebookId, 
-                               BiConsumer<String, byte[]> outStreamCallback,
-                               BiConsumer<String, byte[]> errStreamCallback) {
+
+    public JshellStreamsHandler(String notebookId,
+            BiConsumer<String, byte[]> outStreamCallback,
+            BiConsumer<String, byte[]> errStreamCallback) {
         if (notebookId == null || notebookId.trim().isEmpty()) {
             throw new IllegalArgumentException("Notebook Id cannot be null or empty");
         }
-        
+
         this.notebookId = notebookId;
         this.outStream = new StreamingOutputStream(createCallback(outStreamCallback));
         this.errStream = new StreamingOutputStream(createCallback(errStreamCallback));
         this.printOutStream = new PrintStream(outStream);
         this.printErrStream = new PrintStream(errStream);
         this.inputStream = new CustomInputStream(LanguageClientInstance.getInstance().getClient());
     }
-    
+
     private Consumer<byte[]> createCallback(BiConsumer<String, byte[]> callback) {
         return callback != null ? output -> callback.accept(notebookId, output) : null;
     }
-    
+
     public void setOutStreamCallback(BiConsumer<String, byte[]> callback) {
         outStream.setCallback(createCallback(callback));
     }
-    
+
     public void setErrStreamCallback(BiConsumer<String, byte[]> callback) {
         errStream.setCallback(createCallback(callback));
     }
-    
+
     public PrintStream getPrintOutStream() {
         return printOutStream;
     }
-    
+
     public PrintStream getPrintErrStream() {
         return printErrStream;
     }
-    
+
     public InputStream getInputStream() {
         return inputStream;
     }
-    
+
     public String getNotebookId() {
         return notebookId;
     }
-    
+
     public void flushOutputStreams() {
         try {
             outStream.flush();
@@ -93,7 +93,7 @@ public void flushOutputStreams() {
             // nothing can be done
         }
     }
-    
+
     @Override
     public void close() {
         try {
@@ -106,4 +106,4 @@ public void close() {
             LOG.log(Level.WARNING, "IOException occurred while closing the streams {0}", ex.getMessage());
         }
     }
-}
+}

nbcode/notebooks/src/org/netbeans/modules/nbcode/java/notebook/LanguageClientInstance.java

@@ -23,6 +23,7 @@
  * @author atalati
  */
 public class LanguageClientInstance {
+
     private WeakReference<NbCodeLanguageClient> client = null;
 
     private LanguageClientInstance() {
@@ -31,17 +32,17 @@ private LanguageClientInstance() {
     public static LanguageClientInstance getInstance() {
         return LanguageClientInstance.Singleton.instance;
     }
-    
+
     private static class Singleton {
 
         private static final LanguageClientInstance instance = new LanguageClientInstance();
     }
-    
-    public NbCodeLanguageClient getClient(){
-        return this.client == null ? null: this.client.get();
+
+    public NbCodeLanguageClient getClient() {
+        return this.client == null ? null : this.client.get();
     }
-    
-    public void setClient(NbCodeLanguageClient client){
+
+    public void setClient(NbCodeLanguageClient client) {
         this.client = new WeakReference<>(client);
     }
 }

nbcode/notebooks/src/org/netbeans/modules/nbcode/java/notebook/NotebookCommandsHandler.java

@@ -34,7 +34,8 @@ public class NotebookCommandsHandler implements CommandProvider {
     private static final String NBLS_JSHELL_EXEC = "nbls.jshell.execute.cell";
     private static final String NBLS_JSHELL_INTERRUPT = "nbls.jshell.interrupt.cell";
     private static final String NBLS_OPEN_PROJECT_JSHELL = "nbls.jshell.project.open";
-    private static final Set<String> COMMANDS = new HashSet<>(Arrays.asList(NBLS_JSHELL_EXEC, NBLS_OPEN_PROJECT_JSHELL, NBLS_JSHELL_INTERRUPT));
+    private static final String NBLS_NOTEBOOK_PROJECT_MAPPING = "nbls.notebook.project.context";
+    private static final Set<String> COMMANDS = new HashSet<>(Arrays.asList(NBLS_JSHELL_EXEC, NBLS_OPEN_PROJECT_JSHELL, NBLS_JSHELL_INTERRUPT, NBLS_NOTEBOOK_PROJECT_MAPPING));
 
     @Override
     public Set<String> getCommands() {
@@ -47,11 +48,13 @@ public CompletableFuture<Object> runCommand(String command, List<Object> argumen
 
             switch (command) {
                 case NBLS_JSHELL_EXEC:
-                    return CodeEval.getInstance().evaluate(arguments).thenApply(list -> (Object)list);
+                    return CodeEval.getInstance().evaluate(arguments).thenApply(list -> (Object) list);
                 case NBLS_JSHELL_INTERRUPT:
                     return CompletableFuture.completedFuture(CodeEval.getInstance().interrupt(arguments));
                 case NBLS_OPEN_PROJECT_JSHELL:
                     return CommandHandler.openJshellInProjectContext(arguments).thenApply(list -> (Object) list);
+                case NBLS_NOTEBOOK_PROJECT_MAPPING:
+                    return CommandHandler.getNotebookProjectMappingPath(arguments).thenApply(prj -> (Object) prj);
                 default:
                     return CompletableFuture.failedFuture(new UnsupportedOperationException("Command not supported: " + command));
             }

nbcode/notebooks/src/org/netbeans/modules/nbcode/java/notebook/NotebookConfigs.java

@@ -33,11 +33,17 @@
  */
 public class NotebookConfigs {
 
-    private static final String[] NOTEBOOK_CONFIG_LABELS = {"notebook.classpath", "notebook.modulepath", "notebook.addmodules", "notebook.enablePreview", "notebook.implicitImports"};
+    private static final String[] NOTEBOOK_CONFIG_LABELS = {"notebook.classpath",
+        "notebook.modulepath",
+        "notebook.addmodules",
+        "notebook.enablePreview",
+        "notebook.implicitImports",
+        "notebook.projects.mapping"};
     private String classPath = null;
     private String modulePath = null;
     private String addModules = null;
     private boolean enablePreview = false;
+    private JsonObject notebookProjectMapping = new JsonObject();
     private List<String> implicitImports = null;
     private CompletableFuture<Void> initialized;
 
@@ -65,6 +71,10 @@ public List<String> getImplicitImports() {
         return implicitImports;
     }
 
+    public JsonObject getNotebookProjectMapping() {
+        return notebookProjectMapping;
+    }
+
     private NotebookConfigs() {
 
     }
@@ -121,6 +131,10 @@ private CompletableFuture<Void> initializeConfigs() throws InterruptedException,
                         implicitImports = ((JsonArray) c.get(4)).asList().stream().map((elem) -> elem.getAsString()).toList();
 
                     }
+                    if (c.get(5) != null) {
+                        notebookProjectMapping = (JsonObject) c.get(5);
+
+                    }
                 }
             });
 

nbcode/notebooks/src/org/netbeans/modules/nbcode/java/notebook/NotebookDocumentServiceHandlerImpl.java

@@ -85,16 +85,16 @@ public class NotebookDocumentServiceHandlerImpl implements NotebookDocumentServi
     public void didOpen(DidOpenNotebookDocumentParams params) {
         try {
             NbCodeLanguageClient client = LanguageClientInstance.getInstance().getClient();
-            if(client == null){
+            if (client == null) {
                 return;
             }
-            client.showStatusBarMessage(new ShowStatusMessageParams(MessageType.Info,"Intializing Java kernel for notebook."));
-            NotebookSessionManager.getInstance().createSession(params.getNotebookDocument()).whenComplete((JShell jshell,Throwable t) -> {
+            client.showStatusBarMessage(new ShowStatusMessageParams(MessageType.Info, "Intializing Java kernel for notebook."));
+            NotebookSessionManager.getInstance().createSession(params.getNotebookDocument()).whenComplete((JShell jshell, Throwable t) -> {
                 if (t == null) {
                     client.showStatusBarMessage(new ShowStatusMessageParams(MessageType.Info, "Java kernel initialized successfully"));
                 } else {
                     // if package import fails user is not informed ?
-                    client.showMessage(new MessageParams(MessageType.Error,"Error could not initialize Java kernel for the notebook."));
+                    client.showMessage(new MessageParams(MessageType.Error, "Error could not initialize Java kernel for the notebook."));
                     LOG.log(Level.SEVERE, "Error could not initialize Java kernel for the notebook. : {0}", t.getMessage());
                 }
             });

nbcode/notebooks/src/org/netbeans/modules/nbcode/java/notebook/NotebookDocumentStateManager.java

@@ -150,7 +150,7 @@ private void updateNotebookCellContent(NotebookDocumentChangeEventCellTextConten
         }
         int newVersion = contentChange.getDocument().getVersion();
         String currentContent = cellState.getContent();
-        
+
         try {
             String updatedContent = applyContentChanges(currentContent, contentChange.getChanges());
             cellState.setContent(updatedContent, newVersion);
@@ -220,6 +220,7 @@ private String applyRangeChange(String content, TextDocumentContentChangeEvent c
 
         return result.toString();
     }
+
     // protected methods for ease of unit testing
     protected void addNewCellState(NotebookCell cell, TextDocumentItem item) {
         if (cell == null || item == null) {
@@ -236,8 +237,8 @@ protected void addNewCellState(NotebookCell cell, TextDocumentItem item) {
             throw new RuntimeException("Failed to create cell state", e);
         }
     }
-    
-    protected Map<String, CellState> getCellsMap(){
+
+    protected Map<String, CellState> getCellsMap() {
         return cellsMap;
     }
 }