Merge "Remove static DEBUG flags and use slf4j.Logger.trace()" into release/1.43.0

[simantics/3d.git] / org.simantics.g3d / src / org / simantics / g3d / property / AnnotatedPropertyTabContributorFactory.java

diff --git a/org.simantics.g3d/src/org/simantics/g3d/property/AnnotatedPropertyTabContributorFactory.java b/org.simantics.g3d/src/org/simantics/g3d/property/AnnotatedPropertyTabContributorFactory.java
index 15b787d6d91781b8177e5b824c71eb4860cd611d..36da53ab504ec4989339fc51dbf6f2daf4b3074e 100644 (file)
--- a/org.simantics.g3d/src/org/simantics/g3d/property/AnnotatedPropertyTabContributorFactory.java
+++ b/org.simantics.g3d/src/org/simantics/g3d/property/AnnotatedPropertyTabContributorFactory.java
@@ -86,10 +86,12 @@ import org.simantics.g3d.tools.AdaptationUtils;
 import org.simantics.selectionview.IPropertyTab;
 import org.simantics.selectionview.IPropertyTab2;
 import org.simantics.utils.datastructures.MapList;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class AnnotatedPropertyTabContributorFactory implements PropertyTabContributorFactory {
 
-       private static final boolean DEBUG = false;
+       private static final Logger LOGGER = LoggerFactory.getLogger(AnnotatedPropertyTabContributorFactory.class);
        
        @SuppressWarnings("unchecked")
        @Override
@@ -599,23 +601,12 @@ public class AnnotatedPropertyTabContributorFactory implements PropertyTabContri
                        }
                        ColumnViewerEditorActivationStrategy actSupport = new ColumnViewerEditorActivationStrategy(
                                        viewer) {
-                               Object lastSource = null;
-                               int clickCount = 0;
-                               
                                protected boolean isEditorActivationEvent(
                                                ColumnViewerEditorActivationEvent event) {
-                                       if (!event.getSource().equals(lastSource))
-                                               clickCount = 0;
-                                       
-                                       lastSource = event.getSource();
-                                       
-                                       if (event.eventType == ColumnViewerEditorActivationEvent.MOUSE_CLICK_SELECTION)
-                                               clickCount += 1;
-                                               
                                        return event.eventType == ColumnViewerEditorActivationEvent.TRAVERSAL
+                                                       || event.eventType == ColumnViewerEditorActivationEvent.MOUSE_CLICK_SELECTION
                                                        || event.eventType == ColumnViewerEditorActivationEvent.MOUSE_DOUBLE_CLICK_SELECTION
-                                                       || event.eventType == ColumnViewerEditorActivationEvent.MOUSE_CLICK_SELECTION && clickCount >= 2
-                                                       || (event.eventType == ColumnViewerEditorActivationEvent.KEY_PRESSED && event.keyCode == SWT.CR)
+                                                       || (event.eventType == ColumnViewerEditorActivationEvent.KEY_PRESSED && (event.keyCode == SWT.CR || event.keyCode == SWT.F2))
                                                        || event.eventType == ColumnViewerEditorActivationEvent.PROGRAMMATIC;
                                }
                        };
@@ -810,7 +801,7 @@ public class AnnotatedPropertyTabContributorFactory implements PropertyTabContri
                        if (Thread.currentThread() == Display.getDefault().getThread()) {
                                if (viewer.getTable().isDisposed())
                                        return;
-                               if (DEBUG)System.out.println("Viewer refresh " + id);
+                               if (LOGGER.isTraceEnabled()) LOGGER.trace("Viewer refresh " + id);
                                for (IPropertyItem item : resolvedItems)
                                        if (!item.equals(selectedItem))
                                                viewer.refresh(item);
@@ -826,7 +817,7 @@ public class AnnotatedPropertyTabContributorFactory implements PropertyTabContri
                                                                AnnotatedPropertyTab.this.node.removeListener(AnnotatedPropertyTab.this);
                                                        return;
                                                }
-                                               if (DEBUG) System.out.println("Viewer threaded refresh " + id);
+                                               if (LOGGER.isTraceEnabled()) LOGGER.trace("Viewer threaded refresh " + id);
                                                for (IPropertyItem item : resolvedItems)
                                                        if (!item.equals(selectedItem))
                                                                viewer.refresh(item);
@@ -914,7 +905,7 @@ public class AnnotatedPropertyTabContributorFactory implements PropertyTabContri
                                };
                                }
                                
-                               if (DEBUG) System.err.println("CELL EDITOR: " + element);
+                               if (LOGGER.isTraceEnabled()) LOGGER.trace("CELL EDITOR: " + element);
                                return propertyItemEditor;
                        }
                        else if (item instanceof ComboPropertyItem) {
@@ -938,7 +929,7 @@ public class AnnotatedPropertyTabContributorFactory implements PropertyTabContri
                                    comboEditors.put(comboPropertyItem, editor);
                            }
                            
-                           if (DEBUG) System.err.println("CELL EDITOR: " + element);
+                           if (LOGGER.isTraceEnabled()) LOGGER.trace("CELL EDITOR: " + element);
                            return editor;
                        }
                        else {
@@ -966,7 +957,7 @@ public class AnnotatedPropertyTabContributorFactory implements PropertyTabContri
                        PropertyManipulator manipulator = tab.getManipulator(item);//createManipulator(item, obj);
                        if (manipulator.getValueCount() <= index)
                                throw new IllegalAccessError("Editing value in index " + index + " is not allowed.");
-                       if (DEBUG)System.err.println("CELL SET VALUE: " + element + " " + value);
+                       if (LOGGER.isTraceEnabled()) LOGGER.trace("CELL SET VALUE: " + element + " " + value);
                        manipulator.setValue(value.toString(),index);
                        viewer.refresh(item);
                        nodeMap.commit("Set " + item.getId() + " value to " + value);
@@ -1206,7 +1197,7 @@ public class AnnotatedPropertyTabContributorFactory implements PropertyTabContri
                                        || event.eventType == ColumnViewerEditorActivationEvent.TRAVERSAL) {
                                if (focusCellManager != null) {
                                        try {
-                                               if (DEBUG)System.err.println("FOCUS CELL: " + focusCell);
+                                               if (LOGGER.isTraceEnabled()) LOGGER.trace("FOCUS CELL: " + focusCell);
                                                
                                                Method m = AbstractTableViewer.class.getDeclaredMethod(
                                                                "getSelectionFromWidget");
@@ -1268,7 +1259,7 @@ public class AnnotatedPropertyTabContributorFactory implements PropertyTabContri
                                                        row.getCell(columnIndex), getViewer());
                                }
                        }
-                       if (DEBUG) System.err.println("NEXT CELL: " + cell2edit);
+                       if (LOGGER.isTraceEnabled()) LOGGER.trace("NEXT CELL: " + cell2edit);
                        if (cell2edit != null) {
                                getViewer().getControl().setRedraw(false);
                                ColumnViewerEditorActivationEvent acEvent = new ColumnViewerEditorActivationEvent(