Project

General

Profile

« Previous | Next » 

Revision 06699fe1

Added by Katja Luther over 6 years ago

avoid NPE in namedetails preference and specimen preference page

View differences:

eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/wizard/DatabasePreferencesPage.java
196 196

  
197 197
        final Button showCollectingAreaInGeneralSectionButton = new Button(composite, SWT.CHECK);
198 198
        CdmPreference isShowCollectingAreaInGeneralSection = PreferencesUtil.getPreferenceFromDB(PreferencePredicate.ShowCollectingAreasInGeneralSection);
199

  
199
        if (isShowCollectingAreaInGeneralSection == null){
200
            isShowCollectingAreaInGeneralSection = CdmPreference.NewDatabaseInstance(PreferencePredicate.ShowCollectingAreasInGeneralSection, Boolean.toString(false));
201
        }
200 202
        showCollectingAreaInGeneralSectionButton.setText(Messages.DatabasePreferncesPage_Show_Collecting_Areas_in_general_section);
201 203

  
202 204
        showCollectingAreaInGeneralSectionButton.setSelection(Boolean.valueOf(isShowCollectingAreaInGeneralSection.getValue()));
......
211 213
        final Button determinationOnlyForFieldUnitsButton = new Button(composite, SWT.CHECK);
212 214
//        boolean isDeterminationOnlyForFieldUnits = PreferencesUtil.getPreferenceStore().getBoolean(IPreferenceKeys.DETERMINATION_ONLY_FOR_FIELD_UNITS);
213 215
        CdmPreference isDeterminationOnlyForFieldUnits = PreferencesUtil.getPreferenceFromDB(PreferencePredicate.DeterminationOnlyForFieldUnits);
214

  
216
        if (isDeterminationOnlyForFieldUnits == null){
217
            isDeterminationOnlyForFieldUnits = CdmPreference.NewDatabaseInstance(PreferencePredicate.DeterminationOnlyForFieldUnits, Boolean.toString(false));
218
        }
215 219
        determinationOnlyForFieldUnitsButton.setText(Messages.DatabasePreferncesPage_Determination_only_for_field_unnits);
216 220

  
217 221
        determinationOnlyForFieldUnitsButton.setSelection(Boolean.valueOf(isDeterminationOnlyForFieldUnits.getValue()));
......
225 229

  
226 230
        final Button showTaxonAssociationButton = new Button(composite, SWT.CHECK);
227 231
        CdmPreference isShowTaxonAssociation = PreferencesUtil.getPreferenceFromDB(PreferencePredicate.ShowTaxonAssociations);
232
        if (isShowTaxonAssociation == null){
233
            isShowTaxonAssociation = CdmPreference.NewDatabaseInstance(PreferencePredicate.ShowTaxonAssociations, Boolean.toString(false));
234
        }
228 235
        showTaxonAssociationButton.setText(Messages.DatabasePreferncesPage_Taxon_Associations);
229 236

  
230 237
        showTaxonAssociationButton.setSelection(Boolean.valueOf(isShowTaxonAssociation.getValue()));
......
237 244
         });
238 245

  
239 246
        final Button showLifeFormButton = new Button(composite, SWT.CHECK);
240
        boolean isShowLifeForm = PreferencesUtil.getPreferenceStore().getBoolean(IPreferenceKeys.SHOW_LIFE_FORM);
247
        CdmPreference  isShowLifeForm = PreferencesUtil.getPreferenceFromDB(PreferencePredicate.ShowLifeForm);
248
        if (isShowLifeForm == null){
249
            isShowLifeForm = CdmPreference.NewDatabaseInstance(PreferencePredicate.ShowLifeForm, Boolean.toString(false));
250
        }
251

  
241 252
        showLifeFormButton.setText(Messages.DatabasePreferncesPage_Life_Form);
242
        showLifeFormButton.setSelection(isShowLifeForm);
253
        showLifeFormButton.setSelection(Boolean.valueOf(isShowLifeForm.getValue()));
243 254
        showLifeFormButton.addSelectionListener(new SelectionAdapter(){
244 255
             @Override
245 256
             public void widgetSelected(SelectionEvent e) {
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/NameDetailsViewConfiguration.java
13 13
import org.eclipse.ui.IWorkbench;
14 14
import org.eclipse.ui.IWorkbenchPreferencePage;
15 15

  
16
import eu.etaxonomy.cdm.model.metadata.CdmPreference;
16 17
import eu.etaxonomy.cdm.model.metadata.PreferencePredicate;
17 18
import eu.etaxonomy.taxeditor.l10n.Messages;
18 19

  
......
39 40

  
40 41
    	Composite composite = new Composite(parent, SWT.NULL);
41 42
        composite.setLayout(new GridLayout());
42

  
43
        boolean isAllowOverride = PreferencesUtil.getPreferenceFromDB(PreferencePredicate.NameDetailsView).isAllowOverride();
43
        CdmPreference nameDetailsPref = PreferencesUtil.getPreferenceFromDB(PreferencePredicate.NameDetailsView);
44
        boolean isAllowOverride = false;
45
        if (nameDetailsPref != null){
46
            isAllowOverride = nameDetailsPref.isAllowOverride();
47
        }
44 48

  
45 49

  
46 50
        if (isAllowOverride){
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/SpecimenOrObservationPreferences.java
31 31
 */
32 32
public class SpecimenOrObservationPreferences extends FieldEditorPreferencePage implements IWorkbenchPreferencePage {
33 33

  
34
    public SpecimenOrObservationPreferences(){
35
        super();
36
        setPreferenceStore(PreferencesUtil.getPreferenceStore());
37
        if (getPreferenceStore().getBoolean(IPreferenceKeys.ALLOW_OVERRIDE_NOMENCLATURAL_CODE_KEY)){
38
            setDescription("Set the preferences for the display of specimen and obeservations.");
39
        }else{
40
            setDescription("The CDM settings don't allow to set the preferences for the display of specimen and obeservations locally. If you need to make local settings, please ask an administrator.");
41
        }
42
    }
43

  
44

  
34 45
    @Override
35 46
    public void init(IWorkbench workbench) {
36
        setPreferenceStore(PreferencesUtil.getPreferenceStore());
47
//        setPreferenceStore(PreferencesUtil.getPreferenceStore());
37 48
        ICdmRepository controller = CdmStore.getCurrentApplicationConfiguration();
38 49
        if (controller != null){
39 50
            IPreferenceService service = controller.getPreferenceService();

Also available in: Unified diff