diff --git a/FiltersPlugin/manifest.mf b/FiltersPlugin/manifest.mf index d7b4c7c49..7af43194c 100644 --- a/FiltersPlugin/manifest.mf +++ b/FiltersPlugin/manifest.mf @@ -2,5 +2,5 @@ Manifest-Version: 1.0 AutoUpdate-Essential-Module: true OpenIDE-Module: org.gephi.filters.plugin OpenIDE-Module-Localizing-Bundle: org/gephi/filters/plugin/Bundle.properties -OpenIDE-Module-Specification-Version: 0.8.0.3 +OpenIDE-Module-Specification-Version: 0.8.0.4 diff --git a/FiltersPlugin/src/org/gephi/filters/plugin/attribute/AttributeRangeBuilder.java b/FiltersPlugin/src/org/gephi/filters/plugin/attribute/AttributeRangeBuilder.java index 375f53d42..cd2c1811a 100644 --- a/FiltersPlugin/src/org/gephi/filters/plugin/attribute/AttributeRangeBuilder.java +++ b/FiltersPlugin/src/org/gephi/filters/plugin/attribute/AttributeRangeBuilder.java @@ -173,7 +173,7 @@ public static class AttributeRangeFilter implements RangeFilter, Filter { private AttributeColumn column; private DynamicAttributesHelper dynamicHelper = new DynamicAttributesHelper(this, null); //States - private Comparable[] values; + private Comparable[] values = new Comparable[0]; public AttributeRangeFilter(AttributeColumn column) { this.column = column; @@ -283,7 +283,7 @@ public Range getRange() { } public void setRange(Range range) { - if (range.getMinimum() == null && range.getMaximum() == null) { + if (range.getMinimum() == null && range.getMaximum() == null && this.range != null) { //Opening project this.range = new Range(range.getLowerBound(), range.getUpperBound(), this.range.getMinimum(), this.range.getMaximum()); } else { diff --git a/FiltersPlugin/src/org/gephi/filters/plugin/edge/EdgeWeightBuilder.java b/FiltersPlugin/src/org/gephi/filters/plugin/edge/EdgeWeightBuilder.java index 3051a3485..66d013361 100644 --- a/FiltersPlugin/src/org/gephi/filters/plugin/edge/EdgeWeightBuilder.java +++ b/FiltersPlugin/src/org/gephi/filters/plugin/edge/EdgeWeightBuilder.java @@ -106,7 +106,7 @@ public static class EdgeWeightFilter implements RangeFilter, EdgeFilter { private Range range; private DynamicAttributesHelper dynamicHelper = new DynamicAttributesHelper(this, null); //States - private List values; + private List values = new ArrayList(); public String getName() { return NbBundle.getMessage(EdgeWeightBuilder.class, "EdgeWeightBuilder.name"); @@ -172,7 +172,7 @@ public Range getRange() { } public void setRange(Range range) { - if (range.getMinimum() == null && range.getMaximum() == null) { + if (range.getMinimum() == null && range.getMaximum() == null && this.range != null) { //Opening project this.range = new Range(range.getLowerBound(), range.getUpperBound(), this.range.getMinimum(), this.range.getMaximum()); } else { diff --git a/FiltersPlugin/src/org/gephi/filters/plugin/graph/DegreeRangeBuilder.java b/FiltersPlugin/src/org/gephi/filters/plugin/graph/DegreeRangeBuilder.java index 643263c44..bd716a7ec 100644 --- a/FiltersPlugin/src/org/gephi/filters/plugin/graph/DegreeRangeBuilder.java +++ b/FiltersPlugin/src/org/gephi/filters/plugin/graph/DegreeRangeBuilder.java @@ -103,7 +103,7 @@ public static class DegreeRangeFilter implements RangeFilter, NodeFilter { private Range range; //States - private List values; + private List values = new ArrayList(); public String getName() { return NbBundle.getMessage(DegreeRangeBuilder.class, "DegreeRangeBuilder.name"); @@ -169,7 +169,7 @@ public Range getRange() { } public void setRange(Range range) { - if (range.getMinimum() == null && range.getMaximum() == null) { + if (range.getMinimum() == null && range.getMaximum() == null && this.range != null) { //Opening project this.range = new Range(range.getLowerBound(), range.getUpperBound(), this.range.getMinimum(), this.range.getMaximum()); } else { diff --git a/FiltersPlugin/src/org/gephi/filters/plugin/graph/InDegreeRangeBuilder.java b/FiltersPlugin/src/org/gephi/filters/plugin/graph/InDegreeRangeBuilder.java index 09298961e..21ba1b7d3 100644 --- a/FiltersPlugin/src/org/gephi/filters/plugin/graph/InDegreeRangeBuilder.java +++ b/FiltersPlugin/src/org/gephi/filters/plugin/graph/InDegreeRangeBuilder.java @@ -105,7 +105,7 @@ public static class InDegreeRangeFilter implements RangeFilter, NodeFilter { private Range range; //States - private List values; + private List values = new ArrayList(); public String getName() { return NbBundle.getMessage(InDegreeRangeBuilder.class, "InDegreeRangeBuilder.name"); @@ -171,7 +171,7 @@ public Range getRange() { } public void setRange(Range range) { - if (range.getMinimum() == null && range.getMaximum() == null) { + if (range.getMinimum() == null && range.getMaximum() == null && this.range != null) { //Opening project this.range = new Range(range.getLowerBound(), range.getUpperBound(), this.range.getMinimum(), this.range.getMaximum()); } else { diff --git a/FiltersPlugin/src/org/gephi/filters/plugin/graph/MutualDegreeRangeBuilder.java b/FiltersPlugin/src/org/gephi/filters/plugin/graph/MutualDegreeRangeBuilder.java index 4737e2f9b..4cd161ea7 100644 --- a/FiltersPlugin/src/org/gephi/filters/plugin/graph/MutualDegreeRangeBuilder.java +++ b/FiltersPlugin/src/org/gephi/filters/plugin/graph/MutualDegreeRangeBuilder.java @@ -105,7 +105,7 @@ public static class MutualDegreeRangeFilter implements RangeFilter, NodeFilter { private Range range; //States - private List values; + private List values = new ArrayList(); public String getName() { return NbBundle.getMessage(MutualDegreeRangeFilter.class, "MutualDegreeRangeBuilder.name"); @@ -171,7 +171,7 @@ public Range getRange() { } public void setRange(Range range) { - if (range.getMinimum() == null && range.getMaximum() == null) { + if (range.getMinimum() == null && range.getMaximum() == null && this.range != null) { //Opening project this.range = new Range(range.getLowerBound(), range.getUpperBound(), this.range.getMinimum(), this.range.getMaximum()); } else { diff --git a/FiltersPlugin/src/org/gephi/filters/plugin/graph/OutDegreeRangeBuilder.java b/FiltersPlugin/src/org/gephi/filters/plugin/graph/OutDegreeRangeBuilder.java index 4edc7d063..067a77cc8 100644 --- a/FiltersPlugin/src/org/gephi/filters/plugin/graph/OutDegreeRangeBuilder.java +++ b/FiltersPlugin/src/org/gephi/filters/plugin/graph/OutDegreeRangeBuilder.java @@ -107,7 +107,7 @@ public static class OutDegreeRangeFilter implements RangeFilter, NodeFilter { private Range range; //States - private List values; + private List values = new ArrayList(); public String getName() { return NbBundle.getMessage(OutDegreeRangeBuilder.class, "OutDegreeRangeBuilder.name"); @@ -173,7 +173,7 @@ public Range getRange() { } public void setRange(Range range) { - if (range.getMinimum() == null && range.getMaximum() == null) { + if (range.getMinimum() == null && range.getMaximum() == null && this.range != null) { //Opening project this.range = new Range(range.getLowerBound(), range.getUpperBound(), this.range.getMinimum(), this.range.getMaximum()); } else {