Use GrapherSidePanel generic

Author: Stefan Hahmann

src/main/java/org/mastodon/mamut/views/grapher/GrapherGuiState.java

@@ -114,14 +114,7 @@ private GrapherGuiState()
 
 	public static < V extends Vertex< E > & HasTimepoint & HasLabel & Ref< V >, E extends Edge< V > & Ref< E > > void
 			loadGuiState( final Map< String, Object > guiState, final ScreenTransformState screenTransformState,
-					final GrapherSidePanel sidePanel, final FeatureGraphConfig defaultConfig )
-	{
-		loadGuiState( guiState, screenTransformState, sidePanel, defaultConfig, null );
-	}
-
-	public static < V extends Vertex< E > & HasTimepoint & HasLabel & Ref< V >, E extends Edge< V > & Ref< E > > void
-			loadGuiState( final Map< String, Object > guiState, final ScreenTransformState screenTransformState,
-					final GrapherSidePanel sidePanel, final FeatureGraphConfig defaultConfig,
+					final GrapherSidePanel<V, E> sidePanel, final FeatureGraphConfig defaultConfig,
 					final Plotable plotable )
 	{
 		// Read Screen Transform.
@@ -159,7 +152,7 @@ private GrapherGuiState()
 
 	public static < V extends Vertex< E > & HasTimepoint & HasLabel & Ref< V >, E extends Edge< V > & Ref< E > > FeatureGraphConfig
 			loadFeatureGraphConfig(
-					final GrapherSidePanel sidePanel, final Map< String, Object > guiState,
+					final GrapherSidePanel<V, E> sidePanel, final Map< String, Object > guiState,
 					final FeatureGraphConfig defaultConfig
 			)
 	{
@@ -173,7 +166,7 @@ private GrapherGuiState()
 		return new FeatureGraphConfig( featureSpecPairX, featureSpecPairY, FeatureGraphConfig.GraphDataItemsSource.CONTEXT, showEdges );
 	}
 
-	private static FeatureSpecPair loadFeatureSpecPair( final Map< String, Object > guiState, final GrapherSidePanel sidePanel,
+	private static < V extends Vertex< E >,  E extends Edge< V > > FeatureSpecPair loadFeatureSpecPair( final Map< String, Object > guiState, final GrapherSidePanel<V, E> sidePanel,
 			final String edgeKey, final String featureSpecKey, final String projectionKey, final String incomingEdgeKey )
 	{
 		Boolean isEdgeFeature = ( Boolean ) guiState.get( edgeKey );

src/main/java/org/mastodon/views/grapher/display/DataDisplayFrame.java

@@ -69,7 +69,7 @@ public class DataDisplayFrame< V extends Vertex< E > & HasTimepoint & HasLabel,
 
 	private final DataDisplayPanel< V, E > dataDisplayPanel;
 
-	private final GrapherSidePanel sidePanel;
+	private final GrapherSidePanel<V, E> sidePanel;
 
 	private final FeatureModel featureModel;
 
@@ -116,7 +116,7 @@ public DataDisplayFrame(
 		 * Side panel.
 		 */
 
-		sidePanel = new GrapherSidePanel( nSources, contextChooser );
+		sidePanel = new GrapherSidePanel<>( nSources, contextChooser );
 		sidePanel.getBtnPlot().addActionListener( e -> plot( false ) );
 
 		final FeatureModelListener featureModelListener = () -> sidePanel.setFeatures(
@@ -183,7 +183,7 @@ public DataDisplayPanel< V, E > getDataDisplayPanel()
 		return dataDisplayPanel;
 	}
 
-	public GrapherSidePanel getVertexSidePanel()
+	public GrapherSidePanel<V, E> getVertexSidePanel()
 	{
 		return sidePanel;
 	}
@@ -194,8 +194,10 @@ public GrapherSidePanel getVertexSidePanel()
 	 */
 	public void plot( boolean keepCurrentScreenTransform )
 	{
-		dataDisplayPanel.plot( sidePanel.getGraphConfig(), featureModel,
-				keepCurrentScreenTransform ? dataDisplayPanel.getScreenTransform().get() : null );
+		if ( keepCurrentScreenTransform )
+			plot( dataDisplayPanel.getScreenTransform().get() );
+		else
+			plot( null );
 	}
 
 	public void plot( final ScreenTransform transform )

src/main/java/org/mastodon/views/grapher/display/GrapherSidePanel.java

@@ -58,6 +58,8 @@
 import org.mastodon.feature.FeatureProjectionSpec;
 import org.mastodon.feature.FeatureSpec;
 import org.mastodon.feature.Multiplicity;
+import org.mastodon.graph.Edge;
+import org.mastodon.graph.Vertex;
 import org.mastodon.graph.io.RawGraphIO.FileIdToGraphMap;
 import org.mastodon.mamut.feature.MamutRawFeatureModelIO;
 import org.mastodon.mamut.io.project.MamutProject;
@@ -79,7 +81,7 @@
  *
  * @author Jean-Yves Tinevez
  */
-public class GrapherSidePanel extends JPanel
+public class GrapherSidePanel< V extends Vertex< E >, E extends Edge< V > > extends JPanel
 {
 
 	private static final long serialVersionUID = 1L;
@@ -104,9 +106,9 @@ public class GrapherSidePanel extends JPanel
 
 	private final JButton btnPlot;
 
-	private final ContextChooser< ? > contextChooser;
+	private final ContextChooser< V > contextChooser;
 
-	public GrapherSidePanel( final int nSources, final ContextChooser< ? > contextChooser )
+	public GrapherSidePanel( final int nSources, final ContextChooser< V > contextChooser )
 	{
 		this.nSources = nSources;
 		this.specs = new ArrayList<>();
@@ -435,9 +437,9 @@ public FeatureProjectionSpec getFeatureProjectionSpec( final String projectionKe
 		return null;
 	}
 
-	public ContextChooser< Spot > getContextChooser()
+	public ContextChooser< V > getContextChooser()
 	{
-		return Cast.unchecked( this.contextChooser );
+		return this.contextChooser;
 	}
 
 	private static final FeatureModel demoFM()
@@ -473,7 +475,7 @@ public static void main( final String[] args ) throws ClassNotFoundException, In
 				FeatureUtils.collectFeatureMap( fm, Spot.class );
 		final Map< FeatureSpec< ?, Link >, Feature< Link > > linkFeatures =
 				FeatureUtils.collectFeatureMap( fm, Link.class );
-		final GrapherSidePanel gsp = new GrapherSidePanel( 2, new ContextChooser<>( null ) );
+		final GrapherSidePanel<Spot, Link> gsp = new GrapherSidePanel<Spot, Link>( 2, new ContextChooser<>( null ) );
 		gsp.setFeatures( spotFeatures, linkFeatures );
 
 		final JFrame frame = new JFrame( "Grapher side panel" );

src/main/java/org/mastodon/views/grapher/display/Plotable.java

@@ -5,4 +5,6 @@
 public interface Plotable
 {
 	void plot( final ScreenTransform screenTransform );
+
+	void plot( final boolean keepCurrentScreenTransform );
 }