Merge "(refs #7613) Removed some module sources as declarative services"

diff --git a/bundles/org.simantics.message.ui/src/org/simantics/message/ui/LogView.java b/bundles/org.simantics.message.ui/src/org/simantics/message/ui/LogView.java
index e1d075aa80e1736325f8ec1357ec3fb82ef2972d..b71cb3cded05f7de514060b789014186e9bb71d7 100644 (file)
--- a/bundles/org.simantics.message.ui/src/org/simantics/message/ui/LogView.java
+++ b/bundles/org.simantics.message.ui/src/org/simantics/message/ui/LogView.java
@@ -803,8 +803,8 @@ public class LogView extends ViewPart implements ILogListener {
                });
                fFilteredTree.setInitialText(Messages.LogView_show_filter_initialText);
                fTree = fFilteredTree.getViewer().getTree();
-               fTree.setLinesVisible(true);
                createColumns(fTree);
+               fTree.setLinesVisible(true);
                fFilteredTree.getViewer().setAutoExpandLevel(fMemento.getInteger(P_EXPAND_LEVEL).intValue());
                fFilteredTree.getViewer().setContentProvider(new LogViewContentProvider(this));
                fFilteredTree.getViewer().setLabelProvider(fLabelProvider = new LogViewLabelProvider(this));

diff --git a/bundles/org.simantics.scl.ui/src/org/simantics/scl/ui/editor2/SCLModuleEditor2.java b/bundles/org.simantics.scl.ui/src/org/simantics/scl/ui/editor2/SCLModuleEditor2.java
index 0e068d69bd3568387a8ba73fbbe1599d741e15a3..b7ab0f170ab92ae8c6572733c04a7d0c956e14d9 100644 (file)
--- a/bundles/org.simantics.scl.ui/src/org/simantics/scl/ui/editor2/SCLModuleEditor2.java
+++ b/bundles/org.simantics.scl.ui/src/org/simantics/scl/ui/editor2/SCLModuleEditor2.java
@@ -121,7 +121,7 @@ public class SCLModuleEditor2 extends TextEditor {
         disposed = true;
         super.dispose();
         resourceManager.dispose();
-        matcher.dispose();
+        if (matcher != null) matcher.dispose();
     }
 
     public boolean isDisposed() {