@@ -42,6 +42,8 @@ Development and Distribution License("CDDL") (collectively, the
42
42
package org .gephi .filters ;
43
43
44
44
import java .beans .PropertyEditorManager ;
45
+ import java .util .ArrayList ;
46
+ import java .util .List ;
45
47
import java .util .Set ;
46
48
import org .gephi .filters .FilterThread .PropertyModifier ;
47
49
import org .gephi .filters .api .FilterController ;
@@ -312,11 +314,11 @@ public void exportToColumn(String title, Query query) {
312
314
}
313
315
Column nodeCol = result .getModel ().getNodeTable ().getColumn ("filter_" + title );
314
316
if (nodeCol == null ) {
315
- nodeCol = result .getModel ().getNodeTable ().addColumn ("filter_" + title , title , Boolean .class , Origin .DATA , Boolean .FALSE , false );
317
+ nodeCol = result .getModel ().getNodeTable ().addColumn ("filter_" + title , title , Boolean .class , Origin .DATA , Boolean .FALSE , true );
316
318
}
317
319
Column edgeCol = result .getModel ().getEdgeTable ().getColumn ("filter_" + title );
318
320
if (edgeCol == null ) {
319
- edgeCol = result .getModel ().getEdgeTable ().addColumn ("filter_" + title , title , Boolean .class , Origin .DATA , Boolean .FALSE , false );
321
+ edgeCol = result .getModel ().getEdgeTable ().addColumn ("filter_" + title , title , Boolean .class , Origin .DATA , Boolean .FALSE , true );
320
322
}
321
323
322
324
result .writeLock ();
@@ -365,6 +367,17 @@ public void run() {
365
367
Workspace newWorkspace = pc .newWorkspace (pc .getCurrentProject ());
366
368
GraphModel graphModel = Lookup .getDefault ().lookup (GraphController .class ).getGraphModel (newWorkspace );
367
369
graphModel .bridge ().copyNodes (graphView .getNodes ().toArray ());
370
+ Graph graph = graphModel .getGraph ();
371
+ List <Edge > edgesToRemove = new ArrayList <>();
372
+ for (Edge edge : graph .getEdges ()) {
373
+ if (!graphView .hasEdge (edge .getId ())){
374
+ edgesToRemove .add (edge );
375
+ }
376
+ }
377
+ if (!edgesToRemove .isEmpty ()){
378
+ graph .removeAllEdges (edgesToRemove );
379
+ }
380
+
368
381
Progress .finish (ticket );
369
382
String workspaceName = newWorkspace .getLookup ().lookup (WorkspaceInformation .class ).getName ();
370
383
//StatusDisplayer.getDefault().setStatusText(NbBundle.getMessage(FilterControllerImpl.class, "FilterController.exportToNewWorkspace.status", workspaceName));
0 commit comments