fix: java.lang.NullPointerException: Cannot invoke "java.util.List.add(Object)" because "this.myUncommittedActions" is null

Author: SeeSharpSoft

CHANGELOG

@@ -2,6 +2,7 @@
 Nov 11, 2022
 
 FIX: cannot init component state (componentName=CsvFileAttributes) #359
+FIX: cannot invoke "java.util.List.add(Object)" because "this.myUncommittedActions" is null #361
 FIX: image in plugin description
 FIX: plugin update restart
 

build.gradle

@@ -110,6 +110,7 @@ PS: The previous versions are still available on the project page.
 Update 3.0.1
 
 FIX: cannot init component state (componentName=CsvFileAttributes) #359
+FIX: cannot invoke "java.util.List.add(Object)" because "this.myUncommittedActions" is null #361
 FIX: image in plugin description
 FIX: plugin update restart
 

src/main/java/net/seesharpsoft/intellij/plugins/csv/editor/table/CsvTableModelBase.java

@@ -25,10 +25,8 @@ public class CsvTableModelBase<T extends PsiFileHolder> implements CsvTableModel
     private int myCachedColumnCount = -1;
     private CsvEscapeCharacter myCachedEscapeCharacter;
     private Boolean myCachedHasErrors = null;
-
     private int myPointedRow = -1;
     private PsiElement myPointedRecord = null;
-
     private final CsvPsiTreeUpdater myPsiTreeUpdater;
 
     private final PsiTreeChangeListener myPsiTreeChangeListener = new PsiTreeAnyChangeAbstractAdapter() {
@@ -52,8 +50,8 @@ public T getPsiFileHolder() {
     @Override
     public void dispose() {
         CsvTableModel.super.dispose();
-        getPsiFile().getManager().removePsiTreeChangeListener(myPsiTreeChangeListener);
         myPsiTreeUpdater.dispose();
+        getPsiFile().getManager().removePsiTreeChangeListener(myPsiTreeChangeListener);
     }
 
     private void onPsiTreeChanged(@Nullable PsiFile file) {

src/main/java/net/seesharpsoft/intellij/plugins/csv/editor/table/swing/CsvTableEditorSwing.java

@@ -34,7 +34,6 @@ public class CsvTableEditorSwing extends CsvTableEditor {
     private JComponent panelInfo;
     private JScrollPane tableScrollPane;
     private JPanel panelTop;
-
     private JTable rowHeadersTable;
 
     private int baseFontHeight;
@@ -44,7 +43,6 @@ public class CsvTableEditorSwing extends CsvTableEditor {
     protected final CsvTableEditorMouseListener tableEditorMouseListener;
     protected final CsvTableEditorKeyListener tableEditorKeyListener;
     protected final CsvTableEditorMouseWheelListener tableEditorMouseWheelListener;
-
     private boolean listenerApplied = false;
 
 
@@ -236,7 +234,7 @@ public void selectColumn(int currentColumn, boolean append) {
 
     @NotNull
     @Override
-    public CsvTableActions getActions() {
+    public CsvTableActions<CsvTableEditorSwing> getActions() {
         return this.tableEditorActions;
     }
 

src/main/java/net/seesharpsoft/intellij/plugins/csv/psi/CsvPsiTreeUpdater.java

@@ -30,7 +30,7 @@ public class CsvPsiTreeUpdater implements PsiFileHolder, Suspendable {
 
     private final CsvPsiParserFileType myFileType;
 
-    protected final EventListenerList listenerList = new EventListenerList();
+    protected final EventListenerList myEventListenerList = new EventListenerList();
 
     private List<PsiAction> myUncommittedActions = new ArrayList<>();
 
@@ -83,7 +83,6 @@ public PsiFile getPsiFile() {
     @Override
     public void dispose() {
         Suspendable.super.dispose();
-        myUncommittedActions = null;
     }
 
     public @Nullable PsiElement createValueSeparator() {
@@ -95,7 +94,7 @@ public void dispose() {
     }
 
     public void doAction(PsiAction action) {
-        myUncommittedActions.add(action);
+        if (myUncommittedActions != null) myUncommittedActions.add(action);
     }
 
     public void appendEmptyFields(@NotNull PsiElement anchor, int no) {
@@ -325,7 +324,6 @@ public synchronized void commit() {
             try {
                 actionsToCommit.forEach(PsiAction::execute);
             } finally {
-                PsiDocumentManager.getInstance(getPsiFile().getProject()).doPostponedOperationsAndUnblockDocument(getDocument());
                 resume();
                 fireCommitted();
             }
@@ -354,16 +352,16 @@ private boolean doCommit(@NotNull Runnable runnable) {
     }
 
     public void addCommitListener(CommitListener l) {
-        listenerList.add(CommitListener.class, l);
+        myEventListenerList.add(CommitListener.class, l);
     }
 
     public void removeCommitListener(CommitListener l) {
-        listenerList.remove(CommitListener.class, l);
+        myEventListenerList.remove(CommitListener.class, l);
     }
 
     protected void fireCommitted() {
         // Guaranteed to return a non-null array
-        Object[] listeners = listenerList.getListenerList();
+        Object[] listeners = myEventListenerList.getListenerList();
         // Process the listeners last to first, notifying
         // those that are interested in this event
         for (int i = listeners.length - 2; i >= 0; i -= 2) {

src/main/java/net/seesharpsoft/intellij/util/CheckedDisposableAwareRunnable.java

@@ -4,6 +4,7 @@
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 
 public interface Suspendable extends Disposable {
     SuspensionMonitor MONITOR = new SuspensionMonitor();
@@ -25,14 +26,14 @@ default void dispose() {
     }
 
     class SuspensionMonitor {
-        private final Map<Suspendable, Integer> suspendableCounterMap = new HashMap<>();
+        private final Map<Suspendable, Integer> suspendableCounterMap = new ConcurrentHashMap<>();
 
         private Integer getSuspendableCounter(Suspendable suspendable) {
             if (suspendableCounterMap.containsKey(suspendable)) return suspendableCounterMap.get(suspendable);
             return null;
         }
 
-        void suspend(Suspendable suspendable) {
+        synchronized void suspend(Suspendable suspendable) {
             Integer suspendableCounter = getSuspendableCounter(suspendable);
             if (suspendableCounter == null) {
                 suspendableCounterMap.put(suspendable, 1);
@@ -41,7 +42,7 @@ void suspend(Suspendable suspendable) {
             }
         }
 
-        void resume(Suspendable suspendable) {
+        synchronized void resume(Suspendable suspendable) {
             Integer suspendableCounter = getSuspendableCounter(suspendable);
             // this usually shouldn't happen but doesn't hurt, so fail gracefully
             if (suspendableCounter == null) return;
@@ -55,7 +56,7 @@ boolean isSuspended(Suspendable suspendable) {
             return suspendableCounter != null;
         }
 
-        void unwatch(Suspendable suspendable) {
+        synchronized void unwatch(Suspendable suspendable) {
             suspendableCounterMap.remove(suspendable);
         }
     }