/ - Diff - EDIT - EDIT Project Management

« Previous | Next »

Revision e3ec8207

ref #7268 Fix potential NPE

     		tableViewer.setAllChecked(true);
+    	}
     	public CheckboxTableViewer getTableViewer() {
     		return tableViewer;
+    	}
     	/** {@inheritDoc} */
     	@Override
     	public boolean performOk() {
-...
     		getConversationHolder().commit(true);
     		List<T> preferredTerms = new ArrayList<T>();
     		for (Object element : getTableViewer().getCheckedElements()){
     			preferredTerms.add((T) element);
+    		}
     		CdmStore.getTermManager().setPreferredTerms(preferredTerms, getTerms());
     		if(tableViewer!=null){
     		    List<T> preferredTerms = new ArrayList<T>();
     		    for (Object element : tableViewer.getCheckedElements()){
     		        preferredTerms.add((T) element);
+    		    }
     		refresh(getTerms());
     		    CdmStore.getTermManager().setPreferredTerms(preferredTerms, getTerms());
     		PreferencesUtil.firePreferencesChanged(this.getClass());
     		    refresh(getTerms());
     		    PreferencesUtil.firePreferencesChanged(this.getClass());
+    		}
     		return super.performOk();
+    	}

     	@Override
     	public Control createContents(Composite parent) {
     		Control container = super.createContents(parent);
     		getTableViewer().setLabelProvider(new NameRelationLabelProvider());
     		tableViewer.setLabelProvider(new NameRelationLabelProvider());
     		return container;
+    	}

Also available in: Unified diff