Fixed regression NPEs on workbench when no input sources were present.

mt3 · Feb 7, 2012 · cc249b1 · cc249b1
1 parent a6fe0a8
commit cc249b1
Showing 1 changed file with 18 additions and 9 deletions.
diff --git a/workbench/org.carrot2.workbench.core/src/org/carrot2/workbench/core/ui/SearchInputView.java b/workbench/org.carrot2.workbench.core/src/org/carrot2/workbench/core/ui/SearchInputView.java
@@ -628,15 +628,21 @@ private void createComponents(Composite parent)
         displayEditorSet();
 
         // Restore initial expansion state for groups.
-        if (state != null)
-        {
-            this.attributeGroups.setExpanded(state.sectionsExpansionState);            
-        }
-        else
+        if (attributeGroups != null)
         {
-            // Set the default expansion state.
-            this.attributeGroups.setExpanded(false);
-            this.attributeGroups.setExpanded(AttributeLevel.BASIC.toString(), true);
+	        if (state != null)
+	        {
+	        	if (state.sectionsExpansionState != null)
+	        	{
+	        		this.attributeGroups.setExpanded(state.sectionsExpansionState);
+	        	}
+	        }
+	        else
+	        {
+	            // Set the default expansion state.
+	            this.attributeGroups.setExpanded(false);
+	            this.attributeGroups.setExpanded(AttributeLevel.BASIC.toString(), true);
+	        }
         }
     }
 
@@ -984,7 +990,10 @@ public void saveState(IMemento memento)
         state.algorithmId = getAlgorithmId();
         state.linkWithEditor = linkWithEditor;
         state.attributes = attributes;
-        state.sectionsExpansionState = attributeGroups.getExpansionStates();
+
+        if (attributeGroups != null) {
+        	state.sectionsExpansionState = attributeGroups.getExpansionStates();
+        }
 
         try
         {