Changeset 1182 for trunk/org.modelica.mdt.ui/src/org/modelica/mdt/ui/view

Timestamp:

12/06/11 21:40:11 (13 years ago)

Author:

masberg

Message:

Fix so that the hide protected variables button in the outline view actually filters. Remember all filter settings. Add missing override annotations. Avoid unnecessary casts. Formatting fixes.

File:

• trunk/org.modelica.mdt.ui/src/org/modelica/mdt/ui/view/ModelicaContentOutlinePage.java (modified) (34 diffs)

trunk/org.modelica.mdt.ui/src/org/modelica/mdt/ui/view/ModelicaContentOutlinePage.java

@@ -25 +25 @@
 package org.modelica.mdt.ui.view;
 
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Hashtable;
@@ -90 +91 @@
 import org.modelica.mdt.ui.ModelicaElementChangeListener;
 
-public class ModelicaContentOutlinePage extends ContentOutlinePage
-{
+public class ModelicaContentOutlinePage extends ContentOutlinePage {
     static Object[] NO_CHILDREN= new Object[0];
+    static IPreferenceStore prefStore = UIPlugin.getDefault().getPreferenceStore();
 
     ModelicaEditor fEditor = null;  
@@ -110 +111 @@
 
     private CompositeActionGroup fActionGroups;
-    
+
     private IPreferenceStore fCorePreferenceStore = CorePlugin.getDefault().getPreferenceStore();
 
@@ -168 +169 @@
         }
 
+        @Override
         public Object[] getChildren(Object parent) {
+            // TODO: Use a better name for this property and don't hard-code it here. Use modern-style enum.
+            String filterProtectedProperty = "MemberFilterActionGroup.org.modelica.mdt.ui.ModelicaContentOutlinePage.1";
+            boolean shouldFilterProtected = false;
+
+            if (prefStore.contains(filterProtectedProperty)) {
+                shouldFilterProtected = prefStore.getBoolean(filterProtectedProperty);
+            }
+            else {
+                // We are not storing a preference for this filter, so we disable it, i.e., no filtering.
+            }
+
+            Object[] result = NO_CHILDREN;
+
             if (parent instanceof IParent) {
-                IParent c= (IParent) parent;
-                try 
-                {
-                    Collection<? extends IModelicaElement> z = c.getChildren();
-                    IModelicaElement[] arr = new IModelicaElement[z.size()];
-                    int i = 0;
-                    for (IModelicaElement el : z)
-                    {
-                        arr[i++] = el;
+                try {
+                    Collection<? extends IModelicaElement> children = ((IParent)parent).getChildren();
+                    List<IModelicaElement> filteredChildren = new ArrayList<IModelicaElement>();
+                    for (IModelicaElement el : children) {
+                        if (shouldFilterProtected && el.getVisibility() == IModelicaElement.Visibility.PROTECTED) {
+                            // Filter out this protected item.
+                        }
+                        else {
+                            filteredChildren.add(el);
+                        }
                     }
-                    return arr; //filter(arr);
+
+                    result = filteredChildren.toArray();
                 } 
-                catch (Exception x) 
-                {
+                catch (Exception x) {
                     x.printStackTrace();
                 }
             }
-            return NO_CHILDREN;
-        }
-
+
+            return result;
+        }
+
+        @Override
         public Object[] getElements(Object parent) {
             return getChildren(parent);
         }
 
+        @Override
         public Object getParent(Object child) {
             if (child instanceof IModelicaElement) {
@@ -202 +221 @@
         }
 
+        @Override
         public boolean hasChildren(Object parent) {
             if (parent instanceof IParent) {
@@ -221 +241 @@
         }
 
+        @Override
         public void dispose() 
         {
@@ -231 +252 @@
          * @see IContentProvider#inputChanged(Viewer, Object, Object)
          */
+        @Override
         public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
             boolean isMO= (newInput instanceof IModelicaFile);
@@ -296 +318 @@
          * @see TreeViewer#internalExpandToLevel
          */
+        @Override
         protected void internalExpandToLevel(Widget node, int level) {
             if (node instanceof Item) {
@@ -348 +371 @@
          * @see org.eclipse.jface.viewers.AbstractTreeViewer#isExpandable(java.lang.Object)
          */
+        @Override
         public boolean isExpandable(Object element) {
             if (hasFilters()) {
@@ -416 +440 @@
         }
 
+        @Override
         public void run() {
             valueChanged(isChecked(), true);
@@ -423 +448 @@
             setChecked(on);
             BusyIndicator.showWhile(fOutlineViewer.getControl().getDisplay(), new Runnable() {
+                @Override
                 public void run() {
                     if (on)
@@ -430 +456 @@
                 }
             });
-            
+
             if (store) fCorePreferenceStore.setValue("ModeilcaEditor.Outline.LexicalSortingAction.isChecked", on); //$NON-NLS-1$
-            
+
         }
     }
@@ -461 +487 @@
          * Runs the action.
          */
+        @Override
         public void run() 
         {
@@ -498 +525 @@
         fEditor= editor;
         fPropertyChangeListener= new IPropertyChangeListener() {
+            @Override
             public void propertyChange(PropertyChangeEvent event) {
                 doPropertyChange(event);
@@ -508 +536 @@
         if (fOutlineViewer != null) {
             // TODO! FIXME! update only if is a sort action! if (event.getProperty() ) {
-                fOutlineViewer.refresh(false);
+            fOutlineViewer.refresh(false);
             //}
         }
     }
-    
+
     /* (non-Modelicadoc)
      * Method declared on Page
      */
+    @Override
     public void init(IPageSite pageSite) {
         super.init(pageSite);
@@ -523 +552 @@
      * @see ISelectionProvider#addSelectionChangedListener(ISelectionChangedListener)
      */
+    @Override
     public void addSelectionChangedListener(ISelectionChangedListener listener) {
         if (fOutlineViewer != null)
@@ -533 +563 @@
      * @see ISelectionProvider#removeSelectionChangedListener(ISelectionChangedListener)
      */
+    @Override
     public void removeSelectionChangedListener(ISelectionChangedListener listener) {
         if (fOutlineViewer != null)
@@ -543 +574 @@
      * @see ISelectionProvider#setSelection(ISelection)
      */
+    @Override
     public void setSelection(ISelection selection) {
         if (fOutlineViewer != null)
@@ -551 +583 @@
      * @see ISelectionProvider#getSelection()
      */
+    @Override
     public ISelection getSelection() {
         if (fOutlineViewer == null)
@@ -596 +629 @@
      * @see IPage#createControl
      */
+    @Override
     public void createControl(Composite parent) {
 
@@ -604 +638 @@
         // use a non decorating label provider for outline!
         // fOutlineViewer.setLabelProvider(new DecoratingLabelProvider(
-        //        new WorkbenchLabelProvider(), UIPlugin.getDefault().getWorkbench()
-        //        .getDecoratorManager().getLabelDecorator()));
+        //        new WorkbenchLabelProvider(), UIPlugin.getDefault().getWorkbench()
+        //        .getDecoratorManager().getLabelDecorator()));
         fOutlineViewer.setLabelProvider(new WorkbenchLabelProvider());
 
@@ -623 +657 @@
         manager.setRemoveAllWhenShown(true);
         manager.addMenuListener(new IMenuListener() {
+            @Override
             public void menuAboutToShow(IMenuManager m) {
                 contextMenuAboutToShow(m);
@@ -635 +670 @@
         updateSelectionProvider(site);
 
-//      we must create the groups after we have set the selection provider to the site
+        //      we must create the groups after we have set the selection provider to the site
         fActionGroups= new CompositeActionGroup(new ActionGroup[] {});
 
-//      register global actions
+        //      register global actions
         IActionBars actionBars= site.getActionBars();
         actionBars.setGlobalActionHandler(ITextEditorActionConstants.UNDO, fEditor.getAction(ITextEditorActionConstants.UNDO));
@@ -652 +687 @@
         fActionGroups.fillActionBars(actionBars);
 
-//      Custom filter group
+        //      Custom filter group
         fCustomFiltersActionGroup= new CustomFiltersActionGroup("org.modelica.mdt.ui.ModelicaContentOutlinePage", fOutlineViewer); //$NON-NLS-1$
 
@@ -671 +706 @@
     }
 
+    @Override
     public void dispose() {
 
@@ -708 +744 @@
     }
 
+    @Override
     public Control getControl() {
         if (fOutlineViewer != null)
@@ -739 +776 @@
     public IAction getAction(String actionID) {
         Assert.isNotNull(actionID);
-        return (IAction) fActions.get(actionID);
+        return fActions.get(actionID);
     }
 
@@ -751 +788 @@
         if (key == IModelicaElement.class) {
             return new IShowInTargetList() {
+                @Override
                 public String[] getShowInTargetIds() {
                     return new String[] { UIPlugin.ID_PROJECTSVIEW };
@@ -800 +838 @@
      * @see Page#setFocus()
      */
+    @Override
     public void setFocus() {
         if (fOutlineViewer != null)
@@ -817 +856 @@
             if (element != null && element instanceof IModelicaClass)
                 if(((IModelicaClass)element).getRestriction() == IModelicaClass.Restriction.TYPE ||
-                   ((IModelicaClass)element).getRestriction() == IModelicaClass.Restriction.UNIONTYPE) 
-                       return true;
+                ((IModelicaClass)element).getRestriction() == IModelicaClass.Restriction.UNIONTYPE) 
+                    return true;
         } 
         catch (Exception e) {
@@ -833 +872 @@
     protected IShowInSource getShowInSource() {
         return new IShowInSource() {
+            @Override
             public ShowInContext getShowInContext() {
                 return new ShowInContext(null, getSite().getSelectionProvider().getSelection());
@@ -846 +886 @@
     protected IShowInTarget getShowInTarget() {
         return new IShowInTarget() {
+            @Override
             public boolean show(ShowInContext context) {
                 ISelection sel= context.getSelection();
@@ -864 +905 @@
         };
     }
-    
-    
+
+
     protected void handleOpen(OpenEvent event)
     {
@@ -887 +928 @@
         }
     }
-    
+
 
 }