Merge pull request #47 from marcphilipp/source_folder_filter

Source folder filter

Author: NicoleRauch

org.projectusus.ui.dependencygraph/icons/source_folder_filter.xcf

@@ -2,12 +2,12 @@
 <?eclipse version="3.4"?>
 <plugin>
    <extension point="org.eclipse.ui.views">
-       <view class="org.projectusus.ui.dependencygraph.ClassGraphView"
+       <view class="org.projectusus.ui.dependencygraph.views.ClassGraphView"
             icon="icons/graph-class.gif"
             id="org.projectusus.ui.dependencygraph.ClassGraphView"
             category="org.projectusus.ui.viewCategory"
             name="Usus Class Graph"/>
-       <view class="org.projectusus.ui.dependencygraph.PackageGraphView"
+       <view class="org.projectusus.ui.dependencygraph.views.PackageGraphView"
             icon="icons/graph-package.gif"
             id="org.projectusus.ui.dependencygraph.PackageGraphView"
             category="org.projectusus.ui.viewCategory"

org.projectusus.ui.dependencygraph/icons/source_folder_filter_active.png

@@ -1,4 +1,4 @@
-package org.projectusus.ui.dependencygraph.handlers;
+package org.projectusus.ui.dependencygraph.common;
 
 import static org.projectusus.ui.dependencygraph.DependencyGraphPlugin.plugin;
 

org.projectusus.ui.dependencygraph/icons/source_folder_filter_inactive.png

@@ -1,6 +1,9 @@
 package org.projectusus.ui.dependencygraph.common;
 
+import static java.util.Collections.emptyList;
+
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
@@ -28,6 +31,7 @@
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.ui.IActionBars;
 import org.eclipse.ui.IEditorPart;
@@ -48,10 +52,9 @@
 import org.projectusus.ui.dependencygraph.filters.LimitNodeFilter;
 import org.projectusus.ui.dependencygraph.filters.NodeAndEdgeFilter;
 import org.projectusus.ui.dependencygraph.filters.PackagenameNodeFilter;
-import org.projectusus.ui.dependencygraph.handlers.ChangeZoom;
 import org.projectusus.ui.dependencygraph.nodes.GraphNode;
 
-public abstract class DependencyGraphView extends ViewPart implements IRestrictNodesFilterProvider, IShowInTarget, IZoomableWorkbenchPart, IMenuListener {
+public abstract class DependencyGraphView extends ViewPart implements IRestrictNodesFilterProvider, IShowInTarget, IZoomableWorkbenchPart, IMenuListener, IRefreshable {
 
     private final DependencyGraphModel model;
     private DependencyGraphViewer graphViewer;
@@ -135,9 +138,10 @@ private Composite createFilterArea( Composite composite ) {
         layout.marginTop = 5;
         filterArea.setLayout( layout );
 
-        createAdditionalWidget( filterArea );
+        Control additionalWidgets = createAdditionalWidgets( filterArea );
         createLayoutComboViewer( filterArea );
 
+        additionalWidgets.setLayoutData( new GridData( SWT.LEFT, SWT.CENTER, true, true ) );
         filterArea.setLayoutData( new GridData( SWT.FILL, SWT.CENTER, false, false ) );
 
         return filterArea;
@@ -156,9 +160,12 @@ public void run() {
         } );
     }
 
-    protected void createAdditionalWidget( Composite filterArea ) {
-        final Button checkbox = new Button( filterArea, SWT.CHECK );
-        checkbox.setLayoutData( new GridData( SWT.LEFT, SWT.CENTER, true, true ) );
+    protected Control createAdditionalWidgets( Composite filterArea ) {
+        return createRestrictingCheckBox( filterArea );
+    }
+
+    protected final Button createRestrictingCheckBox( Composite parent ) {
+        final Button checkbox = new Button( parent, SWT.CHECK );
         checkbox.setText( getCheckboxLabelName() );
         checkbox.addSelectionListener( new SelectionAdapter() {
             @Override
@@ -173,6 +180,7 @@ public void run() {
             }
         } );
         setRestricting( false );
+        return checkbox;
     }
 
     private static Composite createGraphArea( Composite composite ) {
@@ -184,7 +192,15 @@ private static Composite createGraphArea( Composite composite ) {
 
     private void createGraphViewer( DependencyGraphViewer dependencyGraphViewer ) {
         graphViewer = dependencyGraphViewer;
-        graphViewer.setFilters( new ViewerFilter[] { new LimitNodeFilter( this ), hideNodesFilter } );
+        List<ViewerFilter> filters = new ArrayList<ViewerFilter>();
+        filters.add( new LimitNodeFilter( this ) );
+        filters.add( hideNodesFilter );
+        filters.addAll( createAdditionalFilters() );
+        graphViewer.setFilters( filters.toArray( new ViewerFilter[filters.size()] ) );
+    }
+
+    protected Collection<? extends ViewerFilter> createAdditionalFilters() {
+        return emptyList();
     }
 
     // hier kommt man an, wenn man in den Hotspots einen Package Cycle doppelklickt:

org.projectusus.ui.dependencygraph/plugin.xml

@@ -0,0 +1,7 @@
+package org.projectusus.ui.dependencygraph.common;
+
+public interface IRefreshable {
+
+    void refresh();
+
+}

org.projectusus.ui.dependencygraph/src/org/projectusus/ui/dependencygraph/ClassGraphView.java

@@ -9,8 +9,8 @@
 import org.eclipse.ui.PlatformUI;
 import org.projectusus.core.basis.SinglePackageHotspot;
 import org.projectusus.core.filerelations.model.ClassDescriptor;
-import org.projectusus.ui.dependencygraph.ClassGraphView;
 import org.projectusus.ui.dependencygraph.filters.ClassDescriptorNodeFilter;
+import org.projectusus.ui.dependencygraph.views.ClassGraphView;
 import org.projectusus.ui.internal.DisplayHotspot;
 import org.projectusus.ui.internal.hotspots.commands.AbstractOpenHotspotHandler;
 

…dependencygraph/handlers/ChangeZoom.java …i/dependencygraph/common/ChangeZoom.javaorg.projectusus.ui.dependencygraph/src/org/projectusus/ui/dependencygraph/handlers/ChangeZoom.java renamed to org.projectusus.ui.dependencygraph/src/org/projectusus/ui/dependencygraph/common/ChangeZoom.java org.projectusus.ui.dependencygraph/src/org/projectusus/ui/dependencygraph/handlers/ChangeZoom.java renamed to org.projectusus.ui.dependencygraph/src/org/projectusus/ui/dependencygraph/common/ChangeZoom.java

@@ -11,8 +11,8 @@
 import org.eclipse.zest.core.viewers.EntityConnectionData;
 import org.projectusus.core.basis.PackageHotspot;
 import org.projectusus.core.filerelations.model.Packagename;
-import org.projectusus.ui.dependencygraph.PackageGraphView;
 import org.projectusus.ui.dependencygraph.filters.PackagenameNodeFilter;
+import org.projectusus.ui.dependencygraph.views.PackageGraphView;
 import org.projectusus.ui.internal.DisplayHotspot;
 import org.projectusus.ui.internal.hotspots.commands.AbstractOpenHotspotHandler;