diff --git a/modules/AppearanceAPI/src/main/java/org/gephi/appearance/api/Interpolator.java b/modules/AppearanceAPI/src/main/java/org/gephi/appearance/api/Interpolator.java
index 89e418ae648891878ebb95562f852698daf6fbf1..16c2d88c9d7e84ee71ead899b2aba43ac53177c6 100644
--- a/modules/AppearanceAPI/src/main/java/org/gephi/appearance/api/Interpolator.java
+++ b/modules/AppearanceAPI/src/main/java/org/gephi/appearance/api/Interpolator.java
@@ -211,15 +211,12 @@ public abstract class Interpolator {
* use Bernstein basis to evaluate 1D cubic Bezier curve (quicker and
* more numerically stable than power basis) -- 1D control coordinates
* are (0, p1, p2, 1), where p1 and p2 are in range [0,1], and there is
- * no ordering constraint on p1 and p2, i.e., p1 <= p2 does not have to
- * be true @param t is the pa
- *
- * ramaterized value in range [0,1] @param p1 is 1st control point
- * coordinate in range [0,1] @param p2 is 2nd control point coor
- *
- * d
- * inate in range [0,1] @return the value of the Bezier curve at
- * parameter t
+ * no ordering constraint on p1 and p2, i.e., p1 <= p2 does not have to
+ * be true
+ * @param t is the paramaterized value in range [0,1]
+ * @param p1 is 1st control point coordinate in range [0,1]
+ * @param p2 is 2nd control point coordinate in range [0,1]
+ * @return the value of the Bezier curve at parameter t
*/
private float eval(float t, float p1, float p2) {
// Use optimzied version of the normal Bernstein basis form of Bezier:
@@ -233,15 +230,12 @@ public abstract class Interpolator {
/**
* evaluate Bernstein basis derivative of 1D cubic Bezier curve, where
* 1D control points are (0, p1, p2, 1), where p1 and p2 are in range
- * [0,1], and there is no ordering constraint on p1 and p2, i.e., p1 <=
- * p2 does not have to be true @param t is the paramaterized
- *
- * value in range [0,1] @param p1 is 1st control point coordinate in
- * range [0,1] @param p2 is 2nd control point coo
- *
- * r
- * dinate in range [0,1] @return the value of the Bezier curve at
- * parameter t
+ * [0,1], and there is no ordering constraint on p1 and p2, i.e., p1 <=
+ * p2 does not have to be true
+ * @param t is the paramaterized value in range [0,1]
+ * @param p1 is 1st control point coordinate in range [0,1]
+ * @param p2 is 2nd control point coordinate in range [0,1]
+ * @return the value of the Bezier curve at parameter t
*/
private float evalDerivative(float t, float p1, float p2) {
// use optimzed version of Berstein basis Bezier derivative:
@@ -258,8 +252,7 @@ public abstract class Interpolator {
* x-value sample array that was created on construction
*
* @param x is x-value of cubic bezier curve, in range [0,1]
- * @return a good initial guess for parameter t (in range [0,1]) that
- * gives x
+ * @return a good initial guess for parameter t (in range [0,1]) that gives x
*/
private float getInitialGuessForT(float x) {
// find which places in the array that x would be sandwiched between,
diff --git a/modules/DataLaboratoryAPI/src/main/java/org/gephi/datalab/api/AttributeColumnsController.java b/modules/DataLaboratoryAPI/src/main/java/org/gephi/datalab/api/AttributeColumnsController.java
index e566d85e30573783e307d4ac6643f952850c3677..082c6ecb4f13b8853be404c0add4db78001cde51 100644
--- a/modules/DataLaboratoryAPI/src/main/java/org/gephi/datalab/api/AttributeColumnsController.java
+++ b/modules/DataLaboratoryAPI/src/main/java/org/gephi/datalab/api/AttributeColumnsController.java
@@ -362,7 +362,7 @@ public interface AttributeColumnsController {
/**
* Calculates all statistics at once from a number/number list column using MathUtils class.
- * Returns an array of length=8 of BigDecimal numbers with the results in the following order:
+ * Returns an array of length=8 of BigDecimal numbers with the results in the following order:
*
* - average
* - first quartile (Q1)
@@ -373,7 +373,6 @@ public interface AttributeColumnsController {
* - minimumValue
* - maximumValue
*
- *
* The column can only be a number/number list column.
* Otherwise, a IllegalArgumentException will be thrown.
* @param table Table of the column
diff --git a/modules/DataLaboratoryAPI/src/main/java/org/gephi/datalab/api/AttributeColumnsMergeStrategiesController.java b/modules/DataLaboratoryAPI/src/main/java/org/gephi/datalab/api/AttributeColumnsMergeStrategiesController.java
index 6628b82ad74b8ae889fcd9d8609350151818cef4..3c18c3afeb03610604a15be743f1ea8dc57beb63 100644
--- a/modules/DataLaboratoryAPI/src/main/java/org/gephi/datalab/api/AttributeColumnsMergeStrategiesController.java
+++ b/modules/DataLaboratoryAPI/src/main/java/org/gephi/datalab/api/AttributeColumnsMergeStrategiesController.java
@@ -80,12 +80,11 @@ public interface AttributeColumnsMergeStrategiesController {
* Only one of the 2 column could be null, and its corresponding start/end default will be used.
* Columns can be of any type. If not numeric, their values will be parsed.
* Default start and end values will be used when the columns don't have a value or it can't be parsed to a double.
- * When start > end for any reason:
+ * When start > end for any reason:
*
* - If both columns were provided: A infinite time interval will be set
* - If only one column was provided: The value for the provided column will be kept and the other will be infinite
*
- *
* @param table Table of the columns, can't be null or wrong
* @param startColumn Column to use as start value
* @param endColumn Column to use as end value
@@ -101,12 +100,11 @@ public interface AttributeColumnsMergeStrategiesController {
* Columns can be of any type.
* Default start and end values will be used when the columns don't have a value or it can't be parsed to a date.
* If a default value can't be parsed to a date, infinity will be used as default instead.
- * When start > end for any reason:
+ * When start > end for any reason:
*
* - If both columns were provided: A infinite time interval will be set
* - If only one column was provided: The value for the provided column will be kept and the other will be infinite
*
- *
* @param table Table of the columns, can't be null or wrong
* @param startColumn Column to use as start value
* @param endColumn Column to use as end value
diff --git a/modules/Gleem/src/main/java/org/gephi/lib/gleem/linalg/Rotf.java b/modules/Gleem/src/main/java/org/gephi/lib/gleem/linalg/Rotf.java
index 5f5da115ce13d95a38ac9f8cbe1eaa6bd43c6a94..c91577143b54982a39c4668a61098d86b4f8eb8e 100644
--- a/modules/Gleem/src/main/java/org/gephi/lib/gleem/linalg/Rotf.java
+++ b/modules/Gleem/src/main/java/org/gephi/lib/gleem/linalg/Rotf.java
@@ -239,7 +239,7 @@ public class Rotf {
/** Turns the upper left 3x3 of the passed matrix into a rotation.
Implementation from Watt and Watt, Advanced Animation and
Rendering Techniques.
- @see gleem.linalg.Mat4f#getRotation */
+ @see org.gephi.lib.gleem.linalg.Mat4f#getRotation */
public void fromMatrix(Mat4f mat) {
// FIXME: Should reimplement to follow Horn's advice of using
// eigenvector decomposition to handle roundoff error in given
diff --git a/modules/Gleem/src/main/java/org/gephi/lib/gleem/linalg/Vec2f.java b/modules/Gleem/src/main/java/org/gephi/lib/gleem/linalg/Vec2f.java
index 33ebcdf9942d661e7f30f80a1a9288ecbb21b715..0578800af60d5b4cb9fef92cf4f8098c825f5799 100644
--- a/modules/Gleem/src/main/java/org/gephi/lib/gleem/linalg/Vec2f.java
+++ b/modules/Gleem/src/main/java/org/gephi/lib/gleem/linalg/Vec2f.java
@@ -68,7 +68,7 @@ public class Vec2f {
this.y = y;
}
- /** Sets the ith component, 0 <= i < 2 */
+ /** Sets the ith component, 0 <= i < 2 */
public void set(int i, float val) {
switch (i) {
case 0: x = val; break;
@@ -77,7 +77,7 @@ public class Vec2f {
}
}
- /** Gets the ith component, 0 <= i < 2 */
+ /** Gets the ith component, 0 <= i < 2 */
public float get(int i) {
switch (i) {
case 0: return x;
diff --git a/modules/Gleem/src/main/java/org/gephi/lib/gleem/linalg/Vec3d.java b/modules/Gleem/src/main/java/org/gephi/lib/gleem/linalg/Vec3d.java
index 7c86d0621269981e98aafd334591e539baafdd8a..83f8b9271bb1c5367192033762d0267ece47d857 100644
--- a/modules/Gleem/src/main/java/org/gephi/lib/gleem/linalg/Vec3d.java
+++ b/modules/Gleem/src/main/java/org/gephi/lib/gleem/linalg/Vec3d.java
@@ -42,7 +42,7 @@ public class Vec3d {
this.z = z;
}
- /** Sets the ith component, 0 <= i < 3 */
+ /** Sets the ith component, 0 <= i < 3 */
public void set(int i, double val) {
switch (i) {
case 0: x = val; break;
@@ -52,7 +52,7 @@ public class Vec3d {
}
}
- /** Gets the ith component, 0 <= i < 3 */
+ /** Gets the ith component, 0 <= i < 3 */
public double get(int i) {
switch (i) {
case 0: return x;
diff --git a/modules/Gleem/src/main/java/org/gephi/lib/gleem/linalg/Vec3f.java b/modules/Gleem/src/main/java/org/gephi/lib/gleem/linalg/Vec3f.java
index 513c6e62b395eab124bb2a026f5d0ebd4305f6bf..dbb61f9baa7b7291377a37eaebf8d795c16b6052 100644
--- a/modules/Gleem/src/main/java/org/gephi/lib/gleem/linalg/Vec3f.java
+++ b/modules/Gleem/src/main/java/org/gephi/lib/gleem/linalg/Vec3f.java
@@ -82,7 +82,7 @@ public class Vec3f {
this.z = z;
}
- /** Sets the ith component, 0 <= i < 3 */
+ /** Sets the ith component, 0 <= i < 3 */
public void set(int i, float val) {
switch (i) {
case 0: x = val; break;
@@ -92,7 +92,7 @@ public class Vec3f {
}
}
- /** Gets the ith component, 0 <= i < 3 */
+ /** Gets the ith component, 0 <= i < 3 */
public float get(int i) {
switch (i) {
case 0: return x;
diff --git a/modules/Gleem/src/main/java/org/gephi/lib/gleem/linalg/Vec4f.java b/modules/Gleem/src/main/java/org/gephi/lib/gleem/linalg/Vec4f.java
index d6df434ca64e826314b6788047eb6978bcb27722..c345cab471cad34eeffa9ab9e6df4d8a3fb412d7 100644
--- a/modules/Gleem/src/main/java/org/gephi/lib/gleem/linalg/Vec4f.java
+++ b/modules/Gleem/src/main/java/org/gephi/lib/gleem/linalg/Vec4f.java
@@ -72,7 +72,7 @@ public class Vec4f {
this.w = w;
}
- /** Sets the ith component, 0 <= i < 4 */
+ /** Sets the ith component, 0 <= i < 4 */
public void set(int i, float val) {
switch (i) {
case 0: x = val; break;
@@ -83,7 +83,7 @@ public class Vec4f {
}
}
- /** Gets the ith component, 0 <= i < 4 */
+ /** Gets the ith component, 0 <= i < 4 */
public float get(int i) {
switch (i) {
case 0: return x;
diff --git a/modules/StatisticsPlugin/src/main/java/org/gephi/statistics/plugin/ClusteringCoefficient.java b/modules/StatisticsPlugin/src/main/java/org/gephi/statistics/plugin/ClusteringCoefficient.java
index ae53a64a5f450d3f5766a1f405bdfbbb8bd985f0..1870487e2159e9de3240d35c8d903b89764dd869 100644
--- a/modules/StatisticsPlugin/src/main/java/org/gephi/statistics/plugin/ClusteringCoefficient.java
+++ b/modules/StatisticsPlugin/src/main/java/org/gephi/statistics/plugin/ClusteringCoefficient.java
@@ -141,7 +141,7 @@ class ArrayWrapper implements Comparable {
/**
*
- * @param pArray
+ * @param array
*/
ArrayWrapper(int ID, EdgeWrapper[] array) {
this.array = array;
@@ -154,7 +154,7 @@ class ArrayWrapper implements Comparable {
/**
*
- * @param pIndex
+ * @param index
* @return
*/
public int get(int index) {
diff --git a/modules/TimelineAPI/src/main/java/org/gephi/timeline/api/TimelineChart.java b/modules/TimelineAPI/src/main/java/org/gephi/timeline/api/TimelineChart.java
index d0a89c5298fbd2da986322584af9f83819bd898f..3719a4047873288f5d7c578ef1e233f5d8d7a0a4 100644
--- a/modules/TimelineAPI/src/main/java/org/gephi/timeline/api/TimelineChart.java
+++ b/modules/TimelineAPI/src/main/java/org/gephi/timeline/api/TimelineChart.java
@@ -41,19 +41,19 @@ Portions Copyrighted 2011 Gephi Consortium.
*/
package org.gephi.timeline.api;
-import org.gephi.graph.api.Graph;
+import org.gephi.graph.api.GraphModel;
/**
* Sparkline type chart visible in the timeline, for instance the number of
* nodes over time.
*
* Charts are usually created from the Statistics module and data are saved
- * within {@link Graph#getAttributes()}. Columns can be accessed from the graph
- * table in the {@link AttributeModel#getGraphTable() }.
+ * within {@link GraphModel}. Columns can be accessed from the graph
+ * table in the {@link GraphModel}.
+ *
*
* @author Mathieu Bastian
- * @see
- * TimelineController#selectColumn(org.gephi.data.attributes.api.AttributeColumn)
+ * @see TimelineController#selectColumn(java.lang.String)
*/
public interface TimelineChart {
diff --git a/modules/TimelineAPI/src/main/java/org/gephi/timeline/api/TimelineController.java b/modules/TimelineAPI/src/main/java/org/gephi/timeline/api/TimelineController.java
index 7d0880a699ef8349d1ca3095cbad4e2e94724bf9..10fcbc05a9c0a927a1f9a3af5c93593385025965 100644
--- a/modules/TimelineAPI/src/main/java/org/gephi/timeline/api/TimelineController.java
+++ b/modules/TimelineAPI/src/main/java/org/gephi/timeline/api/TimelineController.java
@@ -49,15 +49,18 @@ import org.gephi.project.api.Workspace;
*
* By default the timeline is disabled and can be enabled with the
* setEnabled() method. Once enabled, the controller is setting its
- * interval value to the {@link DynamicModel}.
+ * interval value to the DynamicModel.
+ *
*
* The interval can be animated using the startPlay() and
* stopPlay() methods. Configuration parameters are also available.
+ *
*
* This controller also allows to lookup graph attribute columns that can be
* used as sparklines (e.g. node count, average degree...). Use the
* selectColumn() to create a {@link TimelineChart} accessible from
* the TimelineModel.
+ *
*
* @author Julian Bilcke, Mathieu Bastian
* @see TimelineModel
@@ -86,7 +89,7 @@ public interface TimelineController {
*
* @param min the lower bound
* @param max the upper bound
- * @throws IllegalArgumentException if min is superior or equal than
+ * @throws IllegalArgumentException if min is superior or equal than
* max or out of bounds
*/
public void setCustomBounds(double min, double max);
@@ -105,7 +108,7 @@ public interface TimelineController {
*
* @param from the lower bound
* @param to the upper bound
- * @throws IllegalArgumentException if min is superior or equal than
+ * @throws IllegalArgumentException if min is superior or equal than
* max or out of bounds
*/
public void setInterval(double from, double to);
diff --git a/modules/UIComponents/src/main/java/org/gephi/ui/components/JRangeSlider.java b/modules/UIComponents/src/main/java/org/gephi/ui/components/JRangeSlider.java
index a64840010237855734ccac503dd32c3e4c05aea1..cd7565e2ada922a8f102603b5c69c597b91c8a0d 100644
--- a/modules/UIComponents/src/main/java/org/gephi/ui/components/JRangeSlider.java
+++ b/modules/UIComponents/src/main/java/org/gephi/ui/components/JRangeSlider.java
@@ -186,7 +186,7 @@ public class JRangeSlider extends JSlider {
/**
* Constructs a RangeSliderUI for the specified slider component.
- * @param b RangeSlider
+ * @param slider RangeSlider
*/
public JRangeSliderWindowsUI(JSlider slider) {
super(slider);
@@ -754,7 +754,7 @@ public class JRangeSlider extends JSlider {
/**
* Constructs a RangeSliderUI for the specified slider component.
- * @param b RangeSlider
+ * @param slider RangeSlider
*/
public JRangeSliderBasicUI(JSlider slider) {
super(slider);
diff --git a/modules/UIComponents/src/main/java/org/gephi/ui/components/richtooltip/JRichTooltipPanel.java b/modules/UIComponents/src/main/java/org/gephi/ui/components/richtooltip/JRichTooltipPanel.java
index c0da1b72433ab42caa150f53b0e52dbe4266d0f9..40ef77e94789ee47e81e44436f367384dd45f216 100644
--- a/modules/UIComponents/src/main/java/org/gephi/ui/components/richtooltip/JRichTooltipPanel.java
+++ b/modules/UIComponents/src/main/java/org/gephi/ui/components/richtooltip/JRichTooltipPanel.java
@@ -71,7 +71,7 @@ class JRichTooltipPanel extends JPanel {
}
/**
- * Sets the look and feel (L&F) object that renders this component.
+ * Sets the look and feel (L&F) object that renders this component.
*
* @param ui
* The UI delegate.
diff --git a/modules/UIComponents/src/main/java/org/gephi/ui/components/splineeditor/SplineEditor.java b/modules/UIComponents/src/main/java/org/gephi/ui/components/splineeditor/SplineEditor.java
index 5fd7392022bd46f61f5fc8e4f687d6f33323ebab..408773a17f87a9bd24bd8970423f852805bd1ab8 100644
--- a/modules/UIComponents/src/main/java/org/gephi/ui/components/splineeditor/SplineEditor.java
+++ b/modules/UIComponents/src/main/java/org/gephi/ui/components/splineeditor/SplineEditor.java
@@ -52,9 +52,7 @@ import org.openide.util.NbBundle;
import org.openide.windows.WindowManager;
/**
- * Adaptation of the SwingX demo SplineEditor. Used to get a
- * {@link Interpolator} for computing.
- *
+ * Adaptation of the SwingX demo SplineEditor. Used to get a Interpolator for computing.
* Romain Guy's article
*
* @author Mathieu Bastian
diff --git a/modules/UIUtils/src/main/java/org/gephi/ui/utils/IntervalBoundValidator.java b/modules/UIUtils/src/main/java/org/gephi/ui/utils/IntervalBoundValidator.java
index 1901addaf9e1ca461019c6316926770fab20a064..e7ac6579d491fdc2efa706a1c0b212a4fc906e99 100644
--- a/modules/UIUtils/src/main/java/org/gephi/ui/utils/IntervalBoundValidator.java
+++ b/modules/UIUtils/src/main/java/org/gephi/ui/utils/IntervalBoundValidator.java
@@ -55,7 +55,7 @@ import org.openide.util.NbBundle;
public class IntervalBoundValidator implements Validator {
/**
- * If not null, interval start <= end is also validated.
+ * If not null, interval start <= end is also validated.
*/
private JTextComponent intervalStartTextField = null;
diff --git a/modules/Utils/src/main/java/org/gephi/utils/CharsetToolkit.java b/modules/Utils/src/main/java/org/gephi/utils/CharsetToolkit.java
index 28bdae7dd6aac33f696d50a737beae7d7702f70c..499805b1fb26db63838afd71ccf0ba93b8c1b91b 100644
--- a/modules/Utils/src/main/java/org/gephi/utils/CharsetToolkit.java
+++ b/modules/Utils/src/main/java/org/gephi/utils/CharsetToolkit.java
@@ -141,7 +141,7 @@ public class CharsetToolkit {
/**
* Guess the encoding of the provided buffer.
- * If Byte Order Markers are encountered at the beginning of the buffer, we immidiately
+ * If Byte Order Markers are encountered at the beginning of the buffer, we immidiately
* return the charset implied by this BOM. Otherwise, the file would not be a human
* readable text file.
*
diff --git a/pom.xml b/pom.xml
index f9425e45b953b866accb4818be447aa73f0d9a78..0ef9f84417cc349d4695873932838fb5f190b9bf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -220,15 +220,15 @@
3.1.0
- 1.4
+ 3.0.0
- 2.10.4
+ 3.0.1
1.9.0
2.5.3
- 3.0.2
+ 3.1.0
3.7.1