ref #8818: remove predicate from distribution status table in preferences

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/DistributionStatusPreferencePage.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/DistributionStatusPreferencePage.java
index 34a523dff81f9a9ca89ceebfebe79753c89befb9..d2d7062e63e6194f4baa128772eeefca7b76081c 100755 (executable)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/DistributionStatusPreferencePage.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/DistributionStatusPreferencePage.java
@@ -153,10 +153,10 @@ public class DistributionStatusPreferencePage extends AbstractVocabularySelectio
         Iterator<CdmPreference> prefIterator = prefStatus.iterator();
         CdmPreference pref;
         TableColumn column = new TableColumn(table, SWT.NONE);
-        column.setText("Predicate");
-        column.setWidth(100);
-        column = new TableColumn(table, SWT.NONE);
-        column.setText("Subject");
+//        column.setText("Predicate");
+//        column.setWidth(100);
+//        column = new TableColumn(table, SWT.NONE);
+        column.setText("Area");
         column.setWidth(100);
         column = new TableColumn(table, SWT.NONE);
         column.setText("Values");
@@ -195,105 +195,101 @@ public class DistributionStatusPreferencePage extends AbstractVocabularySelectio
                 // no UUID
             }
         }
-        for (int col = 0; col < 6; col ++) {
+        for (int col = 0; col < 5; col ++) {
             if (col == 0){
-              item.setText(col, pref.getPredicate());
-            }else if (col == 1){
-                if (namedAreaString != null){
+               if (namedAreaString != null){
                     String subjectString = pref.getSubjectString().replace(pref.getSubject().getLastPart(), namedAreaString);
                     subjectString = subjectString.replace("/", "");
                     item.setText(col, subjectString);
                 }else{
                     item.setText(col, "Default");
                 }
+            }else if (col == 1){
+               List<UUID> uuidList = null;
+                if ((isAdminPreference || !override)&& pref.getValue() == null){
+                    item.setText(col, "All status");
+                }else{
 
-
-            }else if (col == 2){
-               List<UUID> uuidList = null;
-               if ((isAdminPreference || !override)&& pref.getValue() == null){
-                   item.setText(col, "All status");
-               }else{
-
-                   if (!isAdminPreference && override && ((pref != null && pref.isAllowOverride()) || pref == null)){
-                       uuidList = PreferencesUtil.createUUIDListFromStringPref(PreferencePredicate.AvailableDistributionStatus.getKey(), true);
-                   }else{
-                       if (pref != null && pref.getValue() != null){
-                           uuidList = PreferencesUtil.createUuidList(pref.getValue());
-                       }else{
-                           item.setText(col, "All status");
-                       }
-                   }
-                   if (uuidList != null){
-                       List<PresenceAbsenceTerm> terms = CdmStore.getTermManager().getTerms(uuidList, PresenceAbsenceTerm.class);
-                       String status = "";
-                       int index = 1;
-                       for (PresenceAbsenceTerm term: terms){
-                           status = status.concat(term.getLabel());
-                           if (index < terms.size()){
-                               status = status.concat(", ");
-                           }
-                           index ++;
-
-                       }
-                       item.setText(col, status);
-                   }
-               }
-
-
-             }else if (col == 3 ){
-                Button allowOverrideButton = new Button(table, SWT.CHECK);
-                allowOverrideButton.setData(pref);
-                TableEditor editor = new TableEditor(table);
-                editor.horizontalAlignment = SWT.LEFT;
-                editor.grabHorizontal = true;
-                editor.setEditor(allowOverrideButton, item, col);
-                allowOverrideButton.setSelection(pref.isAllowOverride());
-                if (isAdminPreference){
-
-                allowOverrideButton.addSelectionListener(new SelectionAdapter(){
-                    @Override
-                    public void widgetSelected(SelectionEvent e){
-                        setApply(true);
-                        Button thisButton= (Button) e.widget;
-                        CdmPreference preference=(CdmPreference)thisButton.getData();
-                        preference = PreferenceResolver.resolve(prefStatus, preference.getKey());
-                        if (isAdminPreference){
-                            preference.setAllowOverride(!preference.isAllowOverride());
+                    if (!isAdminPreference && override && ((pref != null && pref.isAllowOverride()) || pref == null)){
+                        uuidList = PreferencesUtil.createUUIDListFromStringPref(PreferencePredicate.AvailableDistributionStatus.getKey(), true);
+                    }else{
+                        if (pref != null && pref.getValue() != null){
+                            uuidList = PreferencesUtil.createUuidList(pref.getValue());
                         }else{
+                            item.setText(col, "All status");
+                        }
+                    }
+                    if (uuidList != null){
+                        List<PresenceAbsenceTerm> terms = CdmStore.getTermManager().getTerms(uuidList, PresenceAbsenceTerm.class);
+                        String status = "";
+                        int index = 1;
+                        for (PresenceAbsenceTerm term: terms){
+                            status = status.concat(term.getLabel());
+                            if (index < terms.size()){
+                                status = status.concat(", ");
+                            }
+                            index ++;
 
                         }
+                        item.setText(col, status);
                     }
-                  });
-                }else{
-                    allowOverrideButton.setEnabled(false);
                 }
-            } else if (col == 4 && isAdminPreference){
-                Button delButton = new Button(table, SWT.PUSH);
-                delButton.setImage(ImageResources
-                        .getImage(ImageResources.TRASH_ICON));
-                delButton.setData(pref);
-                delButton.pack();
-                delButton.addSelectionListener(new SelectionAdapter(){
-                    @Override
-                    public void widgetSelected(SelectionEvent e){
-                        Button thisButton= (Button) e.widget;
-                        CdmPreference preference=(CdmPreference)thisButton.getData();
-                        int index = prefStatus.indexOf(preference);
-                        table.getItem(index).setText("Deleted");
-                        //prefStatus.remove(preference);
-                        prefStatusToDelete.add(preference);
-                        setApply(true);
 
-                    }
-                  });
-                TableEditor editor = new TableEditor(table);
-                editor.horizontalAlignment = SWT.LEFT;
-                editor.grabHorizontal = true;
-                editor.setEditor(delButton, item, col);
 
-            }
-            else if (col == 5 && isAdminPreference){
-                Button listButton = new Button(table, SWT.PUSH);
+
+            }else if (col == 2){
+                Button allowOverrideButton = new Button(table, SWT.CHECK);
+                 allowOverrideButton.setData(pref);
+                 TableEditor editor = new TableEditor(table);
+                 editor.horizontalAlignment = SWT.LEFT;
+                 editor.grabHorizontal = true;
+                 editor.setEditor(allowOverrideButton, item, col);
+                 allowOverrideButton.setSelection(pref.isAllowOverride());
+                 if (isAdminPreference){
+
+                 allowOverrideButton.addSelectionListener(new SelectionAdapter(){
+                     @Override
+                     public void widgetSelected(SelectionEvent e){
+                         setApply(true);
+                         Button thisButton= (Button) e.widget;
+                         CdmPreference preference=(CdmPreference)thisButton.getData();
+                         preference = PreferenceResolver.resolve(prefStatus, preference.getKey());
+                         if (isAdminPreference){
+                             preference.setAllowOverride(!preference.isAllowOverride());
+                         }else{
+
+                         }
+                     }
+                   });
+                 }else{
+                     allowOverrideButton.setEnabled(false);
+                 }
+
+             }else if (col == 3 && isAdminPreference){
+                Button delButton = new Button(table, SWT.PUSH);
+                 delButton.setImage(ImageResources
+                         .getImage(ImageResources.TRASH_ICON));
+                 delButton.setData(pref);
+                 delButton.pack();
+                 delButton.addSelectionListener(new SelectionAdapter(){
+                     @Override
+                     public void widgetSelected(SelectionEvent e){
+                         Button thisButton= (Button) e.widget;
+                         CdmPreference preference=(CdmPreference)thisButton.getData();
+                         int index = prefStatus.indexOf(preference);
+                         table.getItem(index).setText("Deleted");
+                         //prefStatus.remove(preference);
+                         prefStatusToDelete.add(preference);
+                         setApply(true);
+
+                     }
+                   });
+                 TableEditor editor = new TableEditor(table);
+                 editor.horizontalAlignment = SWT.LEFT;
+                 editor.grabHorizontal = true;
+                 editor.setEditor(delButton, item, col);
+            } else if (col == 4 && isAdminPreference){
+               Button listButton = new Button(table, SWT.PUSH);
                 listButton.setImage(ImageResources
                         .getImage(ImageResources.EDIT_ICON));
                 listButton.setData(pref);
@@ -335,6 +331,10 @@ public class DistributionStatusPreferencePage extends AbstractVocabularySelectio
                 editor.setEditor(listButton, item, col);
 
             }
+//            else if (col == 5 && isAdminPreference){
+//                
+//
+//            }
         }
     }