Skip to content

G
Gephi

Christnowx / Gephi

通知 1
Star 0
Fork 0
G
Gephi

体验新版 GitCode，发现更多精彩内容 >>

提交 1fba8c1a 编写于 作者: E Eduardo Ramos
浏览文件
操作

Additional changes with #1371 (Set default Java version to 1.7): 

* Use diamond inference where possible
* Reorganize imports
* Changed occurrences of String .indexOf() != -1 to .contains()
* Changed occurrences of List .size() == 0 to .isEmpty()

Done with Netbeans inspect and transform feature
上级 fcaa8d33
展开全部 隐藏空白更改
内联 并排
Showing with 738 addition and 825 deletion
modules/AlgorithmsPlugin/src/main/java/org/gephi/algorithms/shortestpath/AbstractShortestPathAlgorithm.java
浏览文件 @ 1fba8c1a
......@@ -44,7 +44,6 @@ package org.gephi.algorithms.shortestpath;
import java.awt.Color;
import java.util.HashMap;
import java.util.Map;
import org.gephi.graph.api.Edge;
import org.gephi.graph.api.Node;
......@@ -61,8 +60,8 @@ public abstract class AbstractShortestPathAlgorithm {
public AbstractShortestPathAlgorithm(Node sourceNode) {
this.sourceNode = sourceNode;
colors = new HashMap<Node, Color>();
distances = new HashMap<Node, Double>();
colors = new HashMap<>();
distances = new HashMap<>();
}
protected boolean relax(Edge edge) {
......
modules/AlgorithmsPlugin/src/main/java/org/gephi/algorithms/shortestpath/BellmanFordShortestPathAlgorithm.java
浏览文件 @ 1fba8c1a
......@@ -43,7 +43,6 @@ package org.gephi.algorithms.shortestpath;
import java.util.HashMap;
import java.util.Map;
import org.gephi.graph.api.DirectedGraph;
import org.gephi.graph.api.Edge;
import org.gephi.graph.api.Node;
......@@ -60,7 +59,7 @@ public class BellmanFordShortestPathAlgorithm extends AbstractShortestPathAlgori
public BellmanFordShortestPathAlgorithm(DirectedGraph graph, Node sourceNode) {
super(sourceNode);
this.graph = graph;
predecessors = new HashMap<Node, Edge>();
predecessors = new HashMap<>();
}
@Override
......
modules/AlgorithmsPlugin/src/main/java/org/gephi/algorithms/shortestpath/DijkstraShortestPathAlgorithm.java
浏览文件 @ 1fba8c1a
......@@ -61,15 +61,15 @@ public class DijkstraShortestPathAlgorithm extends AbstractShortestPathAlgorithm
public DijkstraShortestPathAlgorithm(Graph graph, Node sourceNode) {
super(sourceNode);
this.graph = graph;
predecessors = new HashMap<Node, Edge>();
predecessors = new HashMap<>();
}
@Override
public void compute() {
graph.readLock();
Set<Node> unsettledNodes = new HashSet<Node>();
Set<Node> settledNodes = new HashSet<Node>();
Set<Node> unsettledNodes = new HashSet<>();
Set<Node> settledNodes = new HashSet<>();
//Initialize
for (Node node : graph.getNodes()) {
......
modules/AppearanceAPI/src/main/java/org/gephi/appearance/AppearanceModelImpl.java
浏览文件 @ 1fba8c1a
......@@ -66,10 +66,10 @@ import org.gephi.graph.api.Edge;
import org.gephi.graph.api.Element;
import org.gephi.graph.api.ElementIterable;
import org.gephi.graph.api.Graph;
import org.gephi.graph.api.Index;
import org.gephi.graph.api.GraphController;
import org.gephi.graph.api.GraphModel;
import org.gephi.graph.api.GraphObserver;
import org.gephi.graph.api.Index;
import org.gephi.graph.api.Node;
import org.gephi.graph.api.Table;
import org.gephi.graph.api.types.TimeMap;
......@@ -96,7 +96,7 @@ public class AppearanceModelImpl implements AppearanceModel {
private final Object functionLock;
//
private final FunctionsModel functionsMain;
private final Map<Graph, FunctionsModel> functions = new HashMap<Graph, FunctionsModel>();
private final Map<Graph, FunctionsModel> functions = new HashMap<>();
//Forced
private final Set<String> forcedRanking;
private final Set<String> forcedPartition;
......@@ -110,9 +110,9 @@ public class AppearanceModelImpl implements AppearanceModel {
this.transformerUIs = initTransformerUIs();
this.nodeTransformers = initNodeTransformers();
this.edgeTransformers = initEdgeTransformers();
this.forcedPartition = new HashSet<String>();
this.forcedRanking = new HashSet<String>();
this.forcedColumnsRefresh = new ArrayList<Column>();
this.forcedPartition = new HashSet<>();
this.forcedRanking = new HashSet<>();
this.forcedColumnsRefresh = new ArrayList<>();
//Functions
functionsMain = new FunctionsModel(graphModel.getGraph());
......@@ -444,7 +444,7 @@ public class AppearanceModelImpl implements AppearanceModel {
private List<Function> getFunctions(ElementFunctionsModel model) {
model.refreshFunctions();
List<Function> functions = new ArrayList<Function>();
List<Function> functions = new ArrayList<>();
functions.addAll(model.simpleFunctions.values());
functions.addAll(model.graphFunctions.values());
functions.addAll(model.attributeFunctions.values());
......@@ -465,13 +465,13 @@ public class AppearanceModelImpl implements AppearanceModel {
protected ElementFunctionsModel(Graph graph) {
this.graph = graph;
simpleFunctions = new HashMap<String, SimpleFunctionImpl>();
graphFunctions = new HashMap<String, GraphFunctionImpl>();
attributeFunctions = new HashMap<String, AttributeFunctionImpl>();
columnObservers = new HashMap<Column, ColumnObserver>();
simpleFunctions = new HashMap<>();
graphFunctions = new HashMap<>();
attributeFunctions = new HashMap<>();
columnObservers = new HashMap<>();
graphObserver = graph.getModel().createGraphObserver(graph, false);
partitions = new HashMap<String, PartitionImpl>();
rankings = new HashMap<String, RankingImpl>();
partitions = new HashMap<>();
rankings = new HashMap<>();
// Init simple
initSimpleFunctions();
......@@ -509,7 +509,7 @@ public class AppearanceModelImpl implements AppearanceModel {
}
private void refreshAttributeFunctions(boolean graphHasChanged) {
Set<Column> columns = new HashSet<Column>();
Set<Column> columns = new HashSet<>();
for (Column column : getTable()) {
if (!column.isProperty()) {
columns.add(column);
......@@ -533,7 +533,7 @@ public class AppearanceModelImpl implements AppearanceModel {
}
//Get columns to be refreshed
Set<Column> toRefreshColumns = new HashSet<Column>(forcedColumnsRefresh);
Set<Column> toRefreshColumns = new HashSet<>(forcedColumnsRefresh);
for (Column column : columns) {
if (!columnObservers.containsKey(column)) {
columnObservers.put(column, column.createColumnObserver(false));
......@@ -615,7 +615,7 @@ public class AppearanceModelImpl implements AppearanceModel {
}
protected List<Transformer> getRankingTransformers() {
List<Transformer> res = new ArrayList<Transformer>();
List<Transformer> res = new ArrayList<>();
for (Transformer t : getTransformers()) {
if (t instanceof RankingTransformer) {
res.add(t);
......@@ -625,7 +625,7 @@ public class AppearanceModelImpl implements AppearanceModel {
}
protected List<Transformer> getPartitionTransformers() {
List<Transformer> res = new ArrayList<Transformer>();
List<Transformer> res = new ArrayList<>();
for (Transformer t : getTransformers()) {
if (t instanceof PartitionTransformer) {
res.add(t);
......@@ -665,7 +665,7 @@ public class AppearanceModelImpl implements AppearanceModel {
if (!column.isNumber()) {
return true;
}
Set<Object> set = new HashSet<Object>();
Set<Object> set = new HashSet<>();
boolean hasNullValue = false;
int elements = 0;
ElementIterable<? extends Element> iterable = AttributeUtils.isNodeColumn(column) ? graph.getNodes() : graph.getEdges();
......@@ -741,7 +741,7 @@ public class AppearanceModelImpl implements AppearanceModel {
private Map<Class, TransformerUI> initTransformerUIs() {
//Index UIs
Map<Class, TransformerUI> uis = new HashMap<Class, TransformerUI>();
Map<Class, TransformerUI> uis = new HashMap<>();
for (TransformerUI ui : Lookup.getDefault().lookupAll(TransformerUI.class)) {
Class transformerClass = ui.getTransformerClass();
......@@ -757,7 +757,7 @@ public class AppearanceModelImpl implements AppearanceModel {
}
private List<Transformer> initNodeTransformers() {
List<Transformer> res = new ArrayList<Transformer>();
List<Transformer> res = new ArrayList<>();
for (Transformer transformer : Lookup.getDefault().lookupAll(Transformer.class)) {
if (transformer.isNode()) {
res.add(transformer);
......@@ -767,7 +767,7 @@ public class AppearanceModelImpl implements AppearanceModel {
}
private List<Transformer> initEdgeTransformers() {
List<Transformer> res = new ArrayList<Transformer>();
List<Transformer> res = new ArrayList<>();
for (Transformer transformer : Lookup.getDefault().lookupAll(Transformer.class)) {
if (transformer.isEdge()) {
res.add(transformer);
......
modules/AppearanceAPI/src/main/java/org/gephi/appearance/AttributePartitionImpl.java
浏览文件 @ 1fba8c1a
......@@ -78,7 +78,7 @@ public class AttributePartitionImpl extends PartitionImpl {
this.column = column;
this.index = null;
this.graph = graph;
this.parts = new HashMap<Object, Integer>();
this.parts = new HashMap<>();
}
@Override
......
modules/AppearanceAPI/src/main/java/org/gephi/appearance/EdgeTypePartitionImpl.java
浏览文件 @ 1fba8c1a
......@@ -71,7 +71,7 @@ public class EdgeTypePartitionImpl extends PartitionImpl {
@Override
public Collection getValues() {
Object[] labels = model.getEdgeTypeLabels();
ArrayList<Object> col = new ArrayList<Object>(labels.length);
ArrayList<Object> col = new ArrayList<>(labels.length);
for (Object l : labels) {
if (!(l == null && graph.getEdgeCount(0) == 0)) {
col.add(l);
......
modules/AppearanceAPI/src/main/java/org/gephi/appearance/PartitionImpl.java
浏览文件 @ 1fba8c1a
......@@ -49,7 +49,6 @@ import java.util.Comparator;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Random;
import org.gephi.appearance.api.Partition;
/**
......@@ -61,7 +60,7 @@ public abstract class PartitionImpl implements Partition {
protected final Map<Object, Color> colorMap;
protected PartitionImpl() {
this.colorMap = new HashMap<Object, Color>();
this.colorMap = new HashMap<>();
}
@Override
......
modules/AppearancePlugin/src/main/java/org/gephi/appearance/plugin/palette/PaletteGenerator.java
浏览文件 @ 1fba8c1a
......@@ -78,7 +78,7 @@ public class PaletteGenerator {
double[][] kMeans = generateRandomKmeans(colorsCount, random, filter);
List<double[]> colorSamples = new ArrayList<double[]>();
List<double[]> colorSamples = new ArrayList<>();
if (ultraPrecision) {
for (double l = 0; l <= 1; l += 0.01) {
for (double a = -1; a <= 1; a += 0.05) {
......@@ -168,7 +168,7 @@ public class PaletteGenerator {
}
kMeans[j] = colorSamples.get(closest);
}
List<double[]> newFreeColorSamples = new ArrayList<double[]>();
List<double[]> newFreeColorSamples = new ArrayList<>();
for (double[] color : freeColorSamples) {
double[] kMean = kMeans[j];
if (color[0] != kMean[0]
......@@ -203,8 +203,8 @@ public class PaletteGenerator {
}
private static double[][] sortColors(double[][] colors) {
LinkedList<double[]> colorsToSort = new LinkedList<double[]>(Arrays.asList(colors));
List<double[]> diffColors = new ArrayList<double[]>();
LinkedList<double[]> colorsToSort = new LinkedList<>(Arrays.asList(colors));
List<double[]> diffColors = new ArrayList<>();
diffColors.add(colorsToSort.pop());
while (colorsToSort.size() > 0) {
int index = -1;
......
modules/AppearancePlugin/src/main/java/org/gephi/appearance/plugin/palette/PaletteManager.java
浏览文件 @ 1fba8c1a
......@@ -88,12 +88,12 @@ public class PaletteManager {
nodeName = "recentpartitionpalettes";
presets = loadPresets();
defaultPalettes = loadDefaultPalettes();
recentPalette = new LinkedList<Palette>();
recentPalette = new LinkedList<>();
retrieve();
}
public Palette randomPalette(int colorCount) {
List<Color> colors = new ArrayList<Color>();
List<Color> colors = new ArrayList<>();
Random random = new Random();
float B = random.nextFloat() * 2 / 5f + 0.6f;
......@@ -134,7 +134,7 @@ public class PaletteManager {
}
public Collection<Palette> getDefaultPalette(int colorCount) {
List<Palette> palettes = new ArrayList<Palette>();
List<Palette> palettes = new ArrayList<>();
for (Palette p : defaultPalettes) {
if (p.size() == colorCount) {
palettes.add(p);
......@@ -164,7 +164,7 @@ public class PaletteManager {
}
private List<Preset> loadPresets() {
List<Preset> presetList = new ArrayList<Preset>();
List<Preset> presetList = new ArrayList<>();
try {
LineNumberReader reader = new LineNumberReader(new InputStreamReader(PaletteManager.class.getResourceAsStream("palette_presets.csv")));
reader.readLine();
......@@ -200,9 +200,9 @@ public class PaletteManager {
private static Collection<Palette> loadPalettes(String fileName) throws IOException {
LineNumberReader reader = new LineNumberReader(new InputStreamReader(PaletteManager.class.getResourceAsStream(fileName)));
String line;
List<List<Color>> palettes = new ArrayList<List<Color>>();
List<List<Color>> palettes = new ArrayList<>();
while ((line = reader.readLine()) != null) {
List<Color> palette = new ArrayList<Color>();
List<Color> palette = new ArrayList<>();
String[] split = line.split(",");
for (String colorStr : split) {
if (!colorStr.isEmpty()) {
......@@ -213,7 +213,7 @@ public class PaletteManager {
palettes.add(palette);
}
}
List<Palette> result = new ArrayList<Palette>();
List<Palette> result = new ArrayList<>();
for (List<Color> cls : palettes) {
Palette plt = new Palette(cls.toArray(new Color[0]));
result.add(plt);
......
modules/AppearancePlugin/src/test/java/org/gephi/appearance/StandardTest.java
浏览文件 @ 1fba8c1a
......@@ -42,7 +42,6 @@
package org.gephi.appearance;
import java.util.Arrays;
import org.gephi.appearance.AppearanceModelImpl;
import org.gephi.appearance.api.Function;
import org.gephi.graph.api.Column;
import org.gephi.graph.api.Graph;
......
modules/AppearancePluginUI/src/main/java/org/gephi/ui/appearance/plugin/PartitionColorTransformerPanel.java
浏览文件 @ 1fba8c1a
......@@ -112,7 +112,7 @@ public class PartitionColorTransformerPanel extends javax.swing.JPanel {
values = partition.getSortedValues();
List<Object> nullColors = new ArrayList<Object>();
List<Object> nullColors = new ArrayList<>();
Color defaultColor = Color.LIGHT_GRAY;
for (Object val : values) {
Color c = partition.getColor(val);
......
modules/AppearancePluginUI/src/main/java/org/gephi/ui/appearance/plugin/RecentPalettes.java
浏览文件 @ 1fba8c1a
......@@ -68,7 +68,7 @@ public class RecentPalettes {
public RecentPalettes() {
nodeName = "recentrankingpalettes";
maxSize = 14;
gradients = new LinkedList<LinearGradient>();
gradients = new LinkedList<>();
retrieve();
}
......
modules/AppearancePluginUI/src/main/java/org/gephi/ui/appearance/plugin/UniqueColorTransformerPanel.java
浏览文件 @ 1fba8c1a
......@@ -47,7 +47,6 @@ import java.beans.PropertyChangeListener;
import net.java.dev.colorchooser.ColorChooser;
import org.gephi.appearance.api.SimpleFunction;
import org.gephi.appearance.plugin.AbstractUniqueColorTransformer;
import org.gephi.appearance.plugin.UniqueElementColorTransformer;
/**
*
......
modules/DataLaboratoryAPI/src/main/java/org/gephi/datalab/api/DataLaboratoryHelper.java
浏览文件 @ 1fba8c1a
......@@ -55,8 +55,6 @@ import javax.swing.JButton;
import javax.swing.JComponent;
import javax.swing.JPanel;
import javax.swing.SwingUtilities;
import org.gephi.graph.api.Column;
import org.gephi.graph.api.Table;
import org.gephi.datalab.spi.DialogControls;
import org.gephi.datalab.spi.Manipulator;
import org.gephi.datalab.spi.ManipulatorUI;
......@@ -74,7 +72,9 @@ import org.gephi.datalab.spi.rows.merge.AttributeRowsMergeStrategy;
import org.gephi.datalab.spi.rows.merge.AttributeRowsMergeStrategyBuilder;
import org.gephi.datalab.spi.values.AttributeValueManipulator;
import org.gephi.datalab.spi.values.AttributeValueManipulatorBuilder;
import org.gephi.graph.api.Column;
import org.gephi.graph.api.GraphModel;
import org.gephi.graph.api.Table;
import org.openide.DialogDescriptor;
import org.openide.DialogDisplayer;
import org.openide.util.Lookup;
......@@ -94,7 +94,7 @@ public class DataLaboratoryHelper {
* @return Array of all NodesManipulator implementations
*/
public NodesManipulator[] getNodesManipulators() {
ArrayList<NodesManipulator> nodesManipulators = new ArrayList<NodesManipulator>();
ArrayList<NodesManipulator> nodesManipulators = new ArrayList<>();
for (NodesManipulatorBuilder nm : Lookup.getDefault().lookupAll(NodesManipulatorBuilder.class)) {
nodesManipulators.add(nm.getNodesManipulator());
}
......@@ -109,7 +109,7 @@ public class DataLaboratoryHelper {
* @return Array of all EdgesManipulator implementations
*/
public EdgesManipulator[] getEdgesManipulators() {
ArrayList<EdgesManipulator> edgesManipulators = new ArrayList<EdgesManipulator>();
ArrayList<EdgesManipulator> edgesManipulators = new ArrayList<>();
for (EdgesManipulatorBuilder em : Lookup.getDefault().lookupAll(EdgesManipulatorBuilder.class)) {
edgesManipulators.add(em.getEdgesManipulator());
}
......@@ -123,7 +123,7 @@ public class DataLaboratoryHelper {
* @return Array of all GeneralActionsManipulator implementations
*/
public GeneralActionsManipulator[] getGeneralActionsManipulators() {
ArrayList<GeneralActionsManipulator> generalActionsManipulators = new ArrayList<GeneralActionsManipulator>();
ArrayList<GeneralActionsManipulator> generalActionsManipulators = new ArrayList<>();
generalActionsManipulators.addAll(Lookup.getDefault().lookupAll(GeneralActionsManipulator.class));
sortManipulators(generalActionsManipulators);
return generalActionsManipulators.toArray(new GeneralActionsManipulator[0]);
......@@ -135,7 +135,7 @@ public class DataLaboratoryHelper {
* @return Array of all PluginGeneralActionsManipulator implementations
*/
public PluginGeneralActionsManipulator[] getPluginGeneralActionsManipulators() {
ArrayList<PluginGeneralActionsManipulator> pluginGeneralActionsManipulators = new ArrayList<PluginGeneralActionsManipulator>();
ArrayList<PluginGeneralActionsManipulator> pluginGeneralActionsManipulators = new ArrayList<>();
pluginGeneralActionsManipulators.addAll(Lookup.getDefault().lookupAll(PluginGeneralActionsManipulator.class));
sortManipulators(pluginGeneralActionsManipulators);
return pluginGeneralActionsManipulators.toArray(new PluginGeneralActionsManipulator[0]);
......@@ -148,7 +148,7 @@ public class DataLaboratoryHelper {
* @return Array of all AttributeColumnsManipulator implementations
*/
public AttributeColumnsManipulator[] getAttributeColumnsManipulators() {
ArrayList<AttributeColumnsManipulator> attributeColumnsManipulators = new ArrayList<AttributeColumnsManipulator>();
ArrayList<AttributeColumnsManipulator> attributeColumnsManipulators = new ArrayList<>();
attributeColumnsManipulators.addAll(Lookup.getDefault().lookupAll(AttributeColumnsManipulator.class));
sortAttributeColumnsManipulators(attributeColumnsManipulators);
return attributeColumnsManipulators.toArray(new AttributeColumnsManipulator[0]);
......@@ -161,7 +161,7 @@ public class DataLaboratoryHelper {
* @return Array of all AttributeValueManipulator implementations
*/
public AttributeValueManipulator[] getAttributeValueManipulators() {
ArrayList<AttributeValueManipulator> attributeValueManipulators = new ArrayList<AttributeValueManipulator>();
ArrayList<AttributeValueManipulator> attributeValueManipulators = new ArrayList<>();
for (AttributeValueManipulatorBuilder am : Lookup.getDefault().lookupAll(AttributeValueManipulatorBuilder.class)) {
attributeValueManipulators.add(am.getAttributeValueManipulator());
}
......@@ -175,7 +175,7 @@ public class DataLaboratoryHelper {
* @return Array of all AttributeColumnsMergeStrategy implementations
*/
public AttributeColumnsMergeStrategy[] getAttributeColumnsMergeStrategies() {
ArrayList<AttributeColumnsMergeStrategy> strategies = new ArrayList<AttributeColumnsMergeStrategy>();
ArrayList<AttributeColumnsMergeStrategy> strategies = new ArrayList<>();
for (AttributeColumnsMergeStrategyBuilder cs : Lookup.getDefault().lookupAll(AttributeColumnsMergeStrategyBuilder.class)) {
strategies.add(cs.getAttributeColumnsMergeStrategy());
}
......@@ -189,7 +189,7 @@ public class DataLaboratoryHelper {
* @return Array of all AttributeRowsMergeStrategy implementations
*/
public AttributeRowsMergeStrategy[] getAttributeRowsMergeStrategies() {
ArrayList<AttributeRowsMergeStrategy> strategies = new ArrayList<AttributeRowsMergeStrategy>();
ArrayList<AttributeRowsMergeStrategy> strategies = new ArrayList<>();
for (AttributeRowsMergeStrategyBuilder cs : Lookup.getDefault().lookupAll(AttributeRowsMergeStrategyBuilder.class)) {
strategies.add(cs.getAttributeRowsMergeStrategy());
}
......
modules/DataLaboratoryAPI/src/main/java/org/gephi/datalab/api/SearchReplaceController.java
浏览文件 @ 1fba8c1a
......@@ -44,8 +44,8 @@ package org.gephi.datalab.api;
import java.util.HashSet;
import java.util.Set;
import java.util.regex.Pattern;
import org.gephi.graph.api.Column;
import org.gephi.datalab.api.datatables.DataTablesController;
import org.gephi.graph.api.Column;
import org.gephi.graph.api.Edge;
import org.gephi.graph.api.Graph;
import org.gephi.graph.api.GraphController;
......@@ -114,7 +114,7 @@ public interface SearchReplaceController {
private Node[] nodesToSearch;
private Edge[] edgesToSearch;
private Integer startingRow = null, startingColumn = null;
private HashSet<Integer> columnsToSearch = new HashSet<Integer>();
private HashSet<Integer> columnsToSearch = new HashSet<>();
private boolean loopToBeginning = true;
private Pattern regexPattern;
private boolean useRegexReplaceMode = false;
......
modules/DataLaboratoryAPI/src/main/java/org/gephi/datalab/api/datatables/AttributeTableCSVExporter.java
浏览文件 @ 1fba8c1a
......@@ -51,10 +51,10 @@ import java.util.ArrayList;
import java.util.List;
import org.gephi.datalab.api.AttributeColumnsController;
import org.gephi.graph.api.Column;
import org.gephi.graph.api.Table;
import org.gephi.graph.api.Edge;
import org.gephi.graph.api.Element;
import org.gephi.graph.api.Graph;
import org.gephi.graph.api.Table;
import org.gephi.graph.api.TimeFormat;
import org.gephi.graph.api.types.IntervalMap;
import org.gephi.graph.api.types.IntervalSet;
......@@ -157,7 +157,7 @@ public class AttributeTableCSVExporter {
DateTimeZone timeZone = graph.getModel().getTimeZone();
if (columnIndexesToExport == null) {
List<Integer> columnIndexesToExportList = new ArrayList<Integer>();
List<Integer> columnIndexesToExportList = new ArrayList<>();
//Add special columns for edges table:
if(isEdgeTable){
......
modules/DataLaboratoryAPI/src/main/java/org/gephi/datalab/impl/AttributeColumnsControllerImpl.java
浏览文件 @ 1fba8c1a
......@@ -59,19 +59,19 @@ import java.util.logging.Level;
import java.util.logging.Logger;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.gephi.graph.api.AttributeUtils;
import org.gephi.graph.api.Column;
import org.gephi.graph.api.Origin;
import org.gephi.graph.api.Table;
import org.gephi.datalab.api.AttributeColumnsController;
import org.gephi.datalab.api.GraphElementsController;
import org.gephi.datalab.spi.rows.merge.AttributeRowsMergeStrategy;
import org.gephi.graph.api.AttributeUtils;
import org.gephi.graph.api.Column;
import org.gephi.graph.api.Edge;
import org.gephi.graph.api.Element;
import org.gephi.graph.api.Graph;
import org.gephi.graph.api.GraphController;
import org.gephi.graph.api.Interval;
import org.gephi.graph.api.Node;
import org.gephi.graph.api.Origin;
import org.gephi.graph.api.Table;
import org.gephi.graph.api.TimeRepresentation;
import org.gephi.graph.api.types.IntervalMap;
import org.gephi.graph.api.types.TimestampMap;
......@@ -280,7 +280,7 @@ public class AttributeColumnsControllerImpl implements AttributeColumnsControlle
@Override
public Map<Object, Integer> calculateColumnValuesFrequencies(Table table, Column column) {
Map<Object, Integer> valuesFrequencies = new HashMap<Object, Integer>();
Map<Object, Integer> valuesFrequencies = new HashMap<>();
Object value;
for (Element row : getTableAttributeRows(table)) {
value = row.getAttribute(column);
......@@ -338,7 +338,7 @@ public class AttributeColumnsControllerImpl implements AttributeColumnsControlle
}
Matcher matcher;
Object value;
ArrayList<String> foundGroups = new ArrayList<String>();
ArrayList<String> foundGroups = new ArrayList<>();
for (Element row : getTableAttributeRows(table)) {
value = row.getAttribute(column);
if (value != null) {
......@@ -555,7 +555,7 @@ public class AttributeColumnsControllerImpl implements AttributeColumnsControlle
boolean isDynamic = AttributeUtils.isDynamicType(type);
boolean isArray = type.isArray();
ArrayList<Number> numbers = new ArrayList<Number>();
ArrayList<Number> numbers = new ArrayList<>();
Number number;
for (Element row : rows) {
Object value = row.getAttribute(column);
......@@ -581,7 +581,7 @@ public class AttributeColumnsControllerImpl implements AttributeColumnsControlle
@Override
public Number[] getRowNumbers(Element row, Column[] columns) {
ArrayList<Number> numbers = new ArrayList<Number>();
ArrayList<Number> numbers = new ArrayList<>();
Number number;
for (Column column : columns) {
Class type = column.getTypeClass();
......@@ -626,7 +626,7 @@ public class AttributeColumnsControllerImpl implements AttributeColumnsControlle
//Prepare attribute columns for the column names, creating the not already existing columns:
Table nodesTable = graph.getModel().getNodeTable();
String idColumn = null;
HashMap<Column, String> columnHeaders = new HashMap<Column, String>();//Necessary because of column name case insensitivity, to map columns to its corresponding csv header.
HashMap<Column, String> columnHeaders = new HashMap<>();//Necessary because of column name case insensitivity, to map columns to its corresponding csv header.
for (int i = 0; i < columnNames.length; i++) {
//Separate first id column found from the list to use as id. If more are found later, the will not be in the list and be ignored.
if (columnNames[i].equalsIgnoreCase("id")) {
......@@ -712,7 +712,7 @@ public class AttributeColumnsControllerImpl implements AttributeColumnsControlle
String targetColumnHeader = null;
String typeColumnHeader = null;
String weightColumnHeader = null;
HashMap<Column, String> columnHeaders = new HashMap<Column, String>();//Necessary because of column name case insensitivity, to map columns to its corresponding csv header.
HashMap<Column, String> columnHeaders = new HashMap<>();//Necessary because of column name case insensitivity, to map columns to its corresponding csv header.
for (int i = 0; i < columnNames.length; i++) {
//Separate first id column found from the list to use as id. If more are found later, the will not be in the list and be ignored.
if (columnNames[i].equalsIgnoreCase("id")) {
......@@ -905,7 +905,7 @@ public class AttributeColumnsControllerImpl implements AttributeColumnsControlle
@Override
public List<List<Node>> detectNodeDuplicatesByColumn(Column column, boolean caseSensitive) {
final HashMap<String, List<Node>> valuesMap = new HashMap<String, List<Node>>();
final HashMap<String, List<Node>> valuesMap = new HashMap<>();
Graph graph = Lookup.getDefault().lookup(GraphController.class).getGraphModel().getGraph();
Object value;
......@@ -920,14 +920,14 @@ public class AttributeColumnsControllerImpl implements AttributeColumnsControlle
if (valuesMap.containsKey(strValue)) {
valuesMap.get(strValue).add(node);
} else {
ArrayList<Node> newGroup = new ArrayList<Node>();
ArrayList<Node> newGroup = new ArrayList<>();
newGroup.add(node);
valuesMap.put(strValue, newGroup);
}
}
}
final List<List<Node>> groupsList = new ArrayList<List<Node>>();
final List<List<Node>> groupsList = new ArrayList<>();
for (List<Node> group : valuesMap.values()) {
if (group.size() > 1) {
groupsList.add(group);
......@@ -1007,14 +1007,14 @@ public class AttributeColumnsControllerImpl implements AttributeColumnsControlle
if (TimestampMap.class.isAssignableFrom(type)) {//Timestamp type:
TimestampMap timestampMap = (TimestampMap) row.getAttribute(column);
if (timestampMap == null) {
return new ArrayList<Number>();
return new ArrayList<>();
}
Number[] dynamicNumbers = (Number[]) timestampMap.toValuesArray();
return Arrays.asList(dynamicNumbers);
} else if (IntervalMap.class.isAssignableFrom(type)) {//Interval type:
IntervalMap intervalMap = (IntervalMap) row.getAttribute(column);
if (intervalMap == null) {
return new ArrayList<Number>();
return new ArrayList<>();
}
Number[] dynamicNumbers = (Number[]) intervalMap.toValuesArray();
return Arrays.asList(dynamicNumbers);
......@@ -1031,7 +1031,7 @@ public class AttributeColumnsControllerImpl implements AttributeColumnsControlle
*/
private List<Number> getArrayNumbers(Object arr) {
int length = Array.getLength(arr);
List<Number> result = new ArrayList<Number>();
List<Number> result = new ArrayList<>();
for (int i = 0; i < length; i++) {
result.add((Number) Array.get(arr, i));
......
modules/DataLaboratoryAPI/src/main/java/org/gephi/datalab/impl/AttributeColumnsMergeStrategiesControllerImpl.java
浏览文件 @ 1fba8c1a
......@@ -45,15 +45,14 @@ import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Date;
import org.gephi.datalab.api.AttributeColumnsController;
import org.gephi.datalab.api.AttributeColumnsMergeStrategiesController;
import org.gephi.graph.api.AttributeUtils;
import org.gephi.graph.api.Column;
import org.gephi.graph.api.Element;
import org.gephi.graph.api.Origin;
import org.gephi.graph.api.Table;
import org.gephi.datalab.api.AttributeColumnsController;
import org.gephi.datalab.api.AttributeColumnsMergeStrategiesController;
import org.gephi.graph.api.Element;
import org.gephi.graph.api.types.IntervalSet;
import org.gephi.graph.api.types.TimestampMap;
import org.gephi.utils.StatisticsUtils;
import org.openide.util.Lookup;
import org.openide.util.lookup.ServiceProvider;
......
modules/DataLaboratoryAPI/src/main/java/org/gephi/datalab/impl/DataTablesControllerImpl.java
浏览文件 @ 1fba8c1a
......@@ -41,13 +41,13 @@
*/
package org.gephi.datalab.impl;
import org.gephi.graph.api.Table;
import org.gephi.datalab.api.AttributeColumnsController;
import org.gephi.datalab.api.datatables.DataTablesController;
import org.gephi.datalab.api.datatables.DataTablesEventListener;
import org.gephi.datalab.api.datatables.DataTablesEventListenerBuilder;
import org.gephi.graph.api.Edge;
import org.gephi.graph.api.Node;
import org.gephi.graph.api.Table;
import org.openide.util.Lookup;
import org.openide.util.lookup.ServiceProvider;
......
modules/DataLaboratoryAPI/src/main/java/org/gephi/datalab/impl/GraphElementsControllerImpl.java
浏览文件 @ 1fba8c1a
......@@ -44,15 +44,15 @@ package org.gephi.datalab.impl;
import java.util.Arrays;
import java.util.HashSet;
import java.util.Set;
import org.gephi.graph.api.Column;
import org.gephi.graph.api.Table;
import org.gephi.datalab.api.AttributeColumnsController;
import org.gephi.datalab.api.GraphElementsController;
import org.gephi.datalab.spi.rows.merge.AttributeRowsMergeStrategy;
import org.gephi.graph.api.Column;
import org.gephi.graph.api.Edge;
import org.gephi.graph.api.Graph;
import org.gephi.graph.api.GraphController;
import org.gephi.graph.api.Node;
import org.gephi.graph.api.Table;
import org.openide.util.Lookup;
import org.openide.util.lookup.ServiceProvider;
......@@ -245,7 +245,7 @@ public class GraphElementsControllerImpl implements GraphElementsController {
AttributeColumnsController ac = Lookup.getDefault().lookup(AttributeColumnsController.class);
ac.mergeRowsValues(columns, mergeStrategies, nodes, selectedNode, newNode);
Set<Node> nodesSet = new HashSet<Node>();
Set<Node> nodesSet = new HashSet<>();
nodesSet.addAll(Arrays.asList(nodes));
//Assign edges to the new node:
......
modules/DataLaboratoryAPI/src/main/java/org/gephi/datalab/impl/SearchReplaceControllerImpl.java
浏览文件 @ 1fba8c1a
......@@ -43,16 +43,16 @@ package org.gephi.datalab.impl;
import java.util.Set;
import java.util.regex.Matcher;
import org.gephi.graph.api.Column;
import org.gephi.graph.api.Table;
import org.gephi.datalab.api.AttributeColumnsController;
import org.gephi.datalab.api.GraphElementsController;
import org.gephi.datalab.api.SearchReplaceController;
import org.gephi.datalab.api.SearchReplaceController.SearchResult;
import org.gephi.graph.api.Column;
import org.gephi.graph.api.Edge;
import org.gephi.graph.api.Element;
import org.gephi.graph.api.GraphController;
import org.gephi.graph.api.Node;
import org.gephi.graph.api.Table;
import org.openide.util.Lookup;
import org.openide.util.lookup.ServiceProvider;
......
modules/DataLaboratoryAPI/src/main/java/org/gephi/datalab/spi/columns/AttributeColumnsManipulatorUI.java
浏览文件 @ 1fba8c1a
......@@ -43,11 +43,10 @@ Portions Copyrighted 2011 Gephi Consortium.
package org.gephi.datalab.spi.columns;
import javax.swing.JPanel;
import org.gephi.graph.api.Column;
import org.gephi.graph.api.Table;
import org.gephi.datalab.spi.DialogControls;
import org.gephi.graph.api.Graph;
import org.gephi.graph.api.Column;
import org.gephi.graph.api.GraphModel;
import org.gephi.graph.api.Table;
/**
* <p>UI AttributeColumnsManipulators can provide.</p>
......
modules/DataLaboratoryAPI/src/main/java/org/gephi/datalab/spi/columns/merge/AttributeColumnsMergeStrategy.java
浏览文件 @ 1fba8c1a
......@@ -41,9 +41,9 @@ Portions Copyrighted 2011 Gephi Consortium.
*/
package org.gephi.datalab.spi.columns.merge;
import org.gephi.datalab.spi.Manipulator;
import org.gephi.graph.api.Column;
import org.gephi.graph.api.Table;
import org.gephi.datalab.spi.Manipulator;
/**
* <p>Service for defining strategies for merging attribute columns of a table.</p>
......
modules/DataLaboratoryAPI/src/main/java/org/gephi/datalab/spi/rows/merge/AttributeRowsMergeStrategy.java
浏览文件 @ 1fba8c1a
......@@ -41,8 +41,8 @@ Portions Copyrighted 2011 Gephi Consortium.
*/
package org.gephi.datalab.spi.rows.merge;
import org.gephi.graph.api.Column;
import org.gephi.datalab.spi.Manipulator;
import org.gephi.graph.api.Column;
import org.gephi.graph.api.Element;
/**
......
modules/DataLaboratoryAPI/src/main/java/org/gephi/datalab/spi/values/AttributeValueManipulator.java
浏览文件 @ 1fba8c1a
......@@ -42,8 +42,8 @@ Portions Copyrighted 2011 Gephi Consortium.
*/
package org.gephi.datalab.spi.values;
import org.gephi.graph.api.Column;
import org.gephi.datalab.spi.Manipulator;
import org.gephi.graph.api.Column;
import org.gephi.graph.api.Element;
/**
......
modules/DataLaboratoryAPI/src/main/java/org/gephi/datalab/utils/SupportedColumnTypeWrapper.java
浏览文件 @ 1fba8c1a
......@@ -142,7 +142,7 @@ public class SupportedColumnTypeWrapper implements Comparable<SupportedColumnTyp
* @return Ordered column type wrappers list
*/
public static List<SupportedColumnTypeWrapper> buildOrderedSupportedTypesList(GraphModel graphModel) {
List<SupportedColumnTypeWrapper> supportedTypesWrappers = new ArrayList<SupportedColumnTypeWrapper>();
List<SupportedColumnTypeWrapper> supportedTypesWrappers = new ArrayList<>();
TimeRepresentation timeRepresentation = graphModel.getConfiguration().getTimeRepresentation();
for (Class<?> type : AttributeUtils.getSupportedTypes()) {
......
modules/DataLaboratoryPlugin/src/main/java/org/gephi/datalab/plugin/manipulators/GeneralColumnsChooser.java
浏览文件 @ 1fba8c1a
......@@ -41,8 +41,8 @@ Portions Copyrighted 2011 Gephi Consortium.
*/
package org.gephi.datalab.plugin.manipulators;
import org.gephi.graph.api.Column;
import org.gephi.datalab.plugin.manipulators.nodes.ClearNodesData;
import org.gephi.graph.api.Column;
/**
* Interface in common for choosing columns to manipulate.
......
modules/DataLaboratoryPlugin/src/main/java/org/gephi/datalab/plugin/manipulators/columns/ClearColumnData.java
浏览文件 @ 1fba8c1a
......@@ -43,12 +43,12 @@ package org.gephi.datalab.plugin.manipulators.columns;
import java.awt.Image;
import javax.swing.JOptionPane;
import org.gephi.graph.api.Column;
import org.gephi.graph.api.Table;
import org.gephi.datalab.api.AttributeColumnsController;
import org.gephi.datalab.api.datatables.DataTablesController;
import org.gephi.datalab.spi.columns.AttributeColumnsManipulator;
import org.gephi.datalab.spi.columns.AttributeColumnsManipulatorUI;
import org.gephi.graph.api.Column;
import org.gephi.graph.api.Table;
import org.openide.util.ImageUtilities;
import org.openide.util.Lookup;
import org.openide.util.NbBundle;
......
modules/DataLaboratoryPlugin/src/main/java/org/gephi/datalab/plugin/manipulators/columns/ColumnValuesFrequency.java
浏览文件 @ 1fba8c1a
......@@ -49,12 +49,12 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.Map;
import org.gephi.graph.api.Column;
import org.gephi.graph.api.Table;
import org.gephi.datalab.api.AttributeColumnsController;
import org.gephi.datalab.plugin.manipulators.columns.ui.ColumnValuesFrequencyUI;
import org.gephi.datalab.spi.columns.AttributeColumnsManipulator;
import org.gephi.datalab.spi.columns.AttributeColumnsManipulatorUI;
import org.gephi.graph.api.Column;
import org.gephi.graph.api.Table;
import org.gephi.utils.HTMLEscape;
import org.gephi.utils.TempDirUtils;
import org.gephi.utils.TempDirUtils.TempDir;
......@@ -119,7 +119,7 @@ public class ColumnValuesFrequency implements AttributeColumnsManipulator {
public String getReportHTML(Table table, Column column, Map<Object, Integer> valuesFrequencies, JFreeChart pieChart, Dimension dimension) {
AttributeColumnsController ac = Lookup.getDefault().lookup(AttributeColumnsController.class);
int totalValuesCount = ac.getTableRowsCount(table);
ArrayList<Object> values = new ArrayList<Object>(valuesFrequencies.keySet());
ArrayList<Object> values = new ArrayList<>(valuesFrequencies.keySet());
//Try to sort the values when they are comparable. (All objects of the set will have the same type) and not null:
if (!values.isEmpty() && values.get(0) instanceof Comparable) {
......@@ -201,7 +201,7 @@ public class ColumnValuesFrequency implements AttributeColumnsManipulator {
}
public JFreeChart buildPieChart(final Map<Object, Integer> valuesFrequencies) {
final ArrayList<Object> values= new ArrayList<Object>(valuesFrequencies.keySet());
final ArrayList<Object> values= new ArrayList<>(valuesFrequencies.keySet());
DefaultPieDataset pieDataset = new DefaultPieDataset();
for (Object value : values) {
......
modules/DataLaboratoryPlugin/src/main/java/org/gephi/datalab/plugin/manipulators/columns/ConvertColumnToDynamic.java
浏览文件 @ 1fba8c1a
......@@ -42,14 +42,14 @@
package org.gephi.datalab.plugin.manipulators.columns;
import java.awt.Image;
import org.gephi.graph.api.Column;
import org.gephi.graph.api.Table;
import org.gephi.datalab.api.AttributeColumnsController;
import org.gephi.datalab.plugin.manipulators.columns.ui.ConvertColumnToDynamicTimestampsUI;
import org.gephi.datalab.plugin.manipulators.columns.ui.ConvertColumnToDynamicUI;
import org.gephi.datalab.spi.columns.AttributeColumnsManipulator;
import org.gephi.datalab.spi.columns.AttributeColumnsManipulatorUI;
import org.gephi.graph.api.Column;
import org.gephi.graph.api.GraphController;
import org.gephi.graph.api.Table;
import org.gephi.graph.api.TimeRepresentation;
import org.openide.util.ImageUtilities;
import org.openide.util.Lookup;
......
modules/DataLaboratoryPlugin/src/main/java/org/gephi/datalab/plugin/manipulators/columns/CopyDataToOtherColumn.java
浏览文件 @ 1fba8c1a
......@@ -42,13 +42,13 @@ Portions Copyrighted 2011 Gephi Consortium.
package org.gephi.datalab.plugin.manipulators.columns;
import java.awt.Image;
import org.gephi.graph.api.Column;
import org.gephi.graph.api.Table;
import org.gephi.datalab.api.AttributeColumnsController;
import org.gephi.datalab.api.datatables.DataTablesController;
import org.gephi.datalab.plugin.manipulators.columns.ui.CopyDataToOtherColumnUI;
import org.gephi.datalab.spi.columns.AttributeColumnsManipulator;
import org.gephi.datalab.spi.columns.AttributeColumnsManipulatorUI;
import org.gephi.graph.api.Column;
import org.gephi.graph.api.Table;
import org.openide.util.ImageUtilities;
import org.openide.util.Lookup;
import org.openide.util.NbBundle;
......
modules/DataLaboratoryPlugin/src/main/java/org/gephi/datalab/plugin/manipulators/columns/CreateBooleanMatchesColumn.java
浏览文件 @ 1fba8c1a
......@@ -42,12 +42,12 @@ Portions Copyrighted 2011 Gephi Consortium.
package org.gephi.datalab.plugin.manipulators.columns;
import java.awt.Image;
import org.gephi.graph.api.Column;
import org.gephi.graph.api.Table;
import org.gephi.datalab.api.AttributeColumnsController;
import org.gephi.datalab.plugin.manipulators.columns.ui.GeneralCreateColumnFromRegexUI;
import org.gephi.datalab.spi.columns.AttributeColumnsManipulator;
import org.gephi.datalab.spi.columns.AttributeColumnsManipulatorUI;
import org.gephi.graph.api.Column;
import org.gephi.graph.api.Table;
import org.openide.util.ImageUtilities;
import org.openide.util.Lookup;
import org.openide.util.NbBundle;
......
modules/DataLaboratoryPlugin/src/main/java/org/gephi/datalab/plugin/manipulators/columns/CreateFoundGroupsListColumn.java
浏览文件 @ 1fba8c1a
......@@ -42,12 +42,12 @@ Portions Copyrighted 2011 Gephi Consortium.
package org.gephi.datalab.plugin.manipulators.columns;
import java.awt.Image;
import org.gephi.graph.api.Column;
import org.gephi.graph.api.Table;
import org.gephi.datalab.api.AttributeColumnsController;
import org.gephi.datalab.plugin.manipulators.columns.ui.GeneralCreateColumnFromRegexUI;
import org.gephi.datalab.spi.columns.AttributeColumnsManipulator;
import org.gephi.datalab.spi.columns.AttributeColumnsManipulatorUI;
import org.gephi.graph.api.Column;
import org.gephi.graph.api.Table;
import org.openide.util.ImageUtilities;
import org.openide.util.Lookup;
import org.openide.util.NbBundle;
......
modules/DataLaboratoryPlugin/src/main/java/org/gephi/datalab/plugin/manipulators/columns/DeleteColumn.java
浏览文件 @ 1fba8c1a
......@@ -43,12 +43,12 @@ package org.gephi.datalab.plugin.manipulators.columns;
import java.awt.Image;
import javax.swing.JOptionPane;
import org.gephi.graph.api.Column;
import org.gephi.graph.api.Table;
import org.gephi.datalab.api.AttributeColumnsController;
import org.gephi.datalab.api.datatables.DataTablesController;
import org.gephi.datalab.spi.columns.AttributeColumnsManipulator;
import org.gephi.datalab.spi.columns.AttributeColumnsManipulatorUI;
import org.gephi.graph.api.Column;
import org.gephi.graph.api.Table;
import org.openide.util.ImageUtilities;
import org.openide.util.Lookup;
import org.openide.util.NbBundle;
......
modules/DataLaboratoryPlugin/src/main/java/org/gephi/datalab/plugin/manipulators/columns/DuplicateColumn.java
浏览文件 @ 1fba8c1a
......@@ -42,12 +42,12 @@ Portions Copyrighted 2011 Gephi Consortium.
package org.gephi.datalab.plugin.manipulators.columns;
import java.awt.Image;
import org.gephi.graph.api.Column;
import org.gephi.graph.api.Table;
import org.gephi.datalab.api.AttributeColumnsController;
import org.gephi.datalab.plugin.manipulators.columns.ui.DuplicateColumnUI;
import org.gephi.datalab.spi.columns.AttributeColumnsManipulator;
import org.gephi.datalab.spi.columns.AttributeColumnsManipulatorUI;
import org.gephi.graph.api.Column;
import org.gephi.graph.api.Table;
import org.openide.util.ImageUtilities;
import org.openide.util.Lookup;
import org.openide.util.NbBundle;
......
modules/DataLaboratoryPlugin/src/main/java/org/gephi/datalab/plugin/manipulators/columns/FillColumnWithValue.java
浏览文件 @ 1fba8c1a
......@@ -43,12 +43,12 @@ package org.gephi.datalab.plugin.manipulators.columns;
import java.awt.Image;
import javax.swing.JOptionPane;
import org.gephi.graph.api.Column;
import org.gephi.graph.api.Table;
import org.gephi.datalab.api.AttributeColumnsController;
import org.gephi.datalab.api.datatables.DataTablesController;
import org.gephi.datalab.spi.columns.AttributeColumnsManipulator;
import org.gephi.datalab.spi.columns.AttributeColumnsManipulatorUI;
import org.gephi.graph.api.Column;
import org.gephi.graph.api.Table;
import org.openide.util.ImageUtilities;
import org.openide.util.Lookup;
import org.openide.util.NbBundle;
......
modules/DataLaboratoryPlugin/src/main/java/org/gephi/datalab/plugin/manipulators/columns/NegateBooleanColumn.java
浏览文件 @ 1fba8c1a
......@@ -42,12 +42,12 @@
package org.gephi.datalab.plugin.manipulators.columns;
import java.awt.Image;
import org.gephi.graph.api.Column;
import org.gephi.graph.api.Table;
import org.gephi.datalab.api.AttributeColumnsController;
import org.gephi.datalab.api.datatables.DataTablesController;
import org.gephi.datalab.spi.columns.AttributeColumnsManipulator;
import org.gephi.datalab.spi.columns.AttributeColumnsManipulatorUI;
import org.gephi.graph.api.Column;
import org.gephi.graph.api.Table;
import org.openide.util.ImageUtilities;
import org.openide.util.Lookup;
import org.openide.util.NbBundle;
......
modules/DataLaboratoryPlugin/src/main/java/org/gephi/datalab/plugin/manipulators/columns/NumberColumnStatisticsReport.java
浏览文件 @ 1fba8c1a
......@@ -42,13 +42,13 @@ Portions Copyrighted 2011 Gephi Consortium.
package org.gephi.datalab.plugin.manipulators.columns;
import java.awt.Image;
import org.gephi.graph.api.AttributeUtils;
import org.gephi.graph.api.Column;
import org.gephi.graph.api.Table;
import org.gephi.datalab.api.AttributeColumnsController;
import org.gephi.datalab.plugin.manipulators.ui.GeneralNumberListStatisticsReportUI;
import org.gephi.datalab.spi.columns.AttributeColumnsManipulator;
import org.gephi.datalab.spi.columns.AttributeColumnsManipulatorUI;
import org.gephi.graph.api.AttributeUtils;
import org.gephi.graph.api.Column;
import org.gephi.graph.api.Table;
import org.openide.util.ImageUtilities;
import org.openide.util.Lookup;
import org.openide.util.NbBundle;
......
modules/DataLaboratoryPlugin/src/main/java/org/gephi/datalab/plugin/manipulators/columns/merge/AverageNumber.java
浏览文件 @ 1fba8c1a
......@@ -42,13 +42,13 @@ Portions Copyrighted 2011 Gephi Consortium.
package org.gephi.datalab.plugin.manipulators.columns.merge;
import javax.swing.Icon;
import org.gephi.graph.api.AttributeUtils;
import org.gephi.graph.api.Column;
import org.gephi.graph.api.Table;
import org.gephi.datalab.api.AttributeColumnsMergeStrategiesController;
import org.gephi.datalab.plugin.manipulators.columns.merge.ui.GeneralColumnTitleChooserUI;
import org.gephi.datalab.spi.ManipulatorUI;
import org.gephi.datalab.spi.columns.merge.AttributeColumnsMergeStrategy;
import org.gephi.graph.api.AttributeUtils;
import org.gephi.graph.api.Column;
import org.gephi.graph.api.Table;
import org.openide.util.ImageUtilities;
import org.openide.util.Lookup;
import org.openide.util.NbBundle;
......
modules/DataLaboratoryPlugin/src/main/java/org/gephi/datalab/plugin/manipulators/columns/merge/BooleanLogicOperations.java
浏览文件 @ 1fba8c1a
......@@ -42,13 +42,13 @@
package org.gephi.datalab.plugin.manipulators.columns.merge;
import javax.swing.Icon;
import org.gephi.graph.api.Column;
import org.gephi.graph.api.Table;
import org.gephi.datalab.api.AttributeColumnsMergeStrategiesController;
import org.gephi.datalab.api.AttributeColumnsMergeStrategiesController.BooleanOperations;
import org.gephi.datalab.plugin.manipulators.columns.merge.ui.BooleanLogicOperationsUI;
import org.gephi.datalab.spi.ManipulatorUI;
import org.gephi.datalab.spi.columns.merge.AttributeColumnsMergeStrategy;
import org.gephi.graph.api.Column;
import org.gephi.graph.api.Table;
import org.openide.util.ImageUtilities;
import org.openide.util.Lookup;
import org.openide.util.NbBundle;
......
modules/DataLaboratoryPlugin/src/main/java/org/gephi/datalab/plugin/manipulators/columns/merge/CreateTimeInterval.java
浏览文件 @ 1fba8c1a
......@@ -43,13 +43,13 @@ package org.gephi.datalab.plugin.manipulators.columns.merge;
import java.text.SimpleDateFormat;
import javax.swing.Icon;
import org.gephi.graph.api.Column;
import org.gephi.graph.api.Table;
import org.gephi.datalab.api.AttributeColumnsMergeStrategiesController;
import org.gephi.datalab.plugin.manipulators.columns.merge.ui.CreateTimeIntervalUI;
import org.gephi.datalab.spi.ManipulatorUI;
import org.gephi.datalab.spi.columns.merge.AttributeColumnsMergeStrategy;
import org.gephi.graph.api.Column;
import org.gephi.graph.api.GraphController;
import org.gephi.graph.api.Table;
import org.gephi.graph.api.TimeRepresentation;
import org.openide.util.ImageUtilities;
import org.openide.util.Lookup;
......
modules/DataLaboratoryPlugin/src/main/java/org/gephi/datalab/plugin/manipulators/columns/merge/FirstQuartileNumber.java
浏览文件 @ 1fba8c1a
......@@ -42,13 +42,13 @@ Portions Copyrighted 2011 Gephi Consortium.
package org.gephi.datalab.plugin.manipulators.columns.merge;
import javax.swing.Icon;
import org.gephi.graph.api.AttributeUtils;
import org.gephi.graph.api.Column;
import org.gephi.graph.api.Table;
import org.gephi.datalab.api.AttributeColumnsMergeStrategiesController;
import org.gephi.datalab.plugin.manipulators.columns.merge.ui.GeneralColumnTitleChooserUI;
import org.gephi.datalab.spi.ManipulatorUI;
import org.gephi.datalab.spi.columns.merge.AttributeColumnsMergeStrategy;
import org.gephi.graph.api.AttributeUtils;
import org.gephi.graph.api.Column;
import org.gephi.graph.api.Table;
import org.openide.util.Lookup;
import org.openide.util.NbBundle;
......
modules/DataLaboratoryPlugin/src/main/java/org/gephi/datalab/plugin/manipulators/columns/merge/InterQuartileRangeNumber.java
浏览文件 @ 1fba8c1a
......@@ -42,13 +42,13 @@ Portions Copyrighted 2011 Gephi Consortium.
package org.gephi.datalab.plugin.manipulators.columns.merge;
import javax.swing.Icon;
import org.gephi.graph.api.AttributeUtils;
import org.gephi.graph.api.Column;
import org.gephi.graph.api.Table;
import org.gephi.datalab.api.AttributeColumnsMergeStrategiesController;
import org.gephi.datalab.plugin.manipulators.columns.merge.ui.GeneralColumnTitleChooserUI;
import org.gephi.datalab.spi.ManipulatorUI;
import org.gephi.datalab.spi.columns.merge.AttributeColumnsMergeStrategy;
import org.gephi.graph.api.AttributeUtils;
import org.gephi.graph.api.Column;
import org.gephi.graph.api.Table;
import org.openide.util.Lookup;
import org.openide.util.NbBundle;
......
modules/DataLaboratoryPlugin/src/main/java/org/gephi/datalab/plugin/manipulators/columns/merge/JoinNumberColumns.java
浏览文件 @ 1fba8c1a
......@@ -41,15 +41,14 @@
*/
package org.gephi.datalab.plugin.manipulators.columns.merge;
import java.math.BigDecimal;
import javax.swing.Icon;
import org.gephi.graph.api.AttributeUtils;
import org.gephi.graph.api.Column;
import org.gephi.graph.api.Table;
import org.gephi.datalab.api.AttributeColumnsMergeStrategiesController;
import org.gephi.datalab.plugin.manipulators.columns.merge.ui.GeneralColumnTitleChooserUI;
import org.gephi.datalab.spi.ManipulatorUI;
import org.gephi.datalab.spi.columns.merge.AttributeColumnsMergeStrategy;
import org.gephi.graph.api.AttributeUtils;
import org.gephi.graph.api.Column;
import org.gephi.graph.api.Table;
import org.openide.util.ImageUtilities;
import org.openide.util.Lookup;
import org.openide.util.NbBundle;
......
modules/DataLaboratoryPlugin/src/main/java/org/gephi/datalab/plugin/manipulators/columns/merge/JoinWithSeparator.java
浏览文件 @ 1fba8c1a
......@@ -42,12 +42,12 @@ Portions Copyrighted 2011 Gephi Consortium.
package org.gephi.datalab.plugin.manipulators.columns.merge;
import javax.swing.Icon;
import org.gephi.graph.api.Column;
import org.gephi.graph.api.Table;
import org.gephi.datalab.api.AttributeColumnsMergeStrategiesController;
import org.gephi.datalab.plugin.manipulators.columns.merge.ui.JoinWithSeparatorUI;
import org.gephi.datalab.spi.ManipulatorUI;
import org.gephi.datalab.spi.columns.merge.AttributeColumnsMergeStrategy;
import org.gephi.graph.api.Column;
import org.gephi.graph.api.Table;
import org.openide.util.ImageUtilities;
import org.openide.util.Lookup;
import org.openide.util.NbBundle;
......
modules/DataLaboratoryPlugin/src/main/java/org/gephi/datalab/plugin/manipulators/columns/merge/MaximumNumber.java
浏览文件 @ 1fba8c1a
......@@ -42,13 +42,13 @@ Portions Copyrighted 2011 Gephi Consortium.
package org.gephi.datalab.plugin.manipulators.columns.merge;
import javax.swing.Icon;
import org.gephi.graph.api.AttributeUtils;
import org.gephi.graph.api.Column;
import org.gephi.graph.api.Table;
import org.gephi.datalab.api.AttributeColumnsMergeStrategiesController;
import org.gephi.datalab.plugin.manipulators.columns.merge.ui.GeneralColumnTitleChooserUI;
import org.gephi.datalab.spi.ManipulatorUI;
import org.gephi.datalab.spi.columns.merge.AttributeColumnsMergeStrategy;
import org.gephi.graph.api.AttributeUtils;
import org.gephi.graph.api.Column;
import org.gephi.graph.api.Table;
import org.openide.util.ImageUtilities;
import org.openide.util.Lookup;
import org.openide.util.NbBundle;
......
modules/DataLaboratoryPlugin/src/main/java/org/gephi/datalab/plugin/manipulators/columns/merge/MedianNumber.java
浏览文件 @ 1fba8c1a
......@@ -42,13 +42,13 @@ Portions Copyrighted 2011 Gephi Consortium.
package org.gephi.datalab.plugin.manipulators.columns.merge;
import javax.swing.Icon;
import org.gephi.graph.api.AttributeUtils;
import org.gephi.graph.api.Column;
import org.gephi.graph.api.Table;
import org.gephi.datalab.api.AttributeColumnsMergeStrategiesController;
import org.gephi.datalab.plugin.manipulators.columns.merge.ui.GeneralColumnTitleChooserUI;
import org.gephi.datalab.spi.ManipulatorUI;
import org.gephi.datalab.spi.columns.merge.AttributeColumnsMergeStrategy;
import org.gephi.graph.api.AttributeUtils;
import org.gephi.graph.api.Column;
import org.gephi.graph.api.Table;
import org.openide.util.ImageUtilities;
import org.openide.util.Lookup;
import org.openide.util.NbBundle;
......
modules/DataLaboratoryPlugin/src/main/java/org/gephi/datalab/plugin/manipulators/columns/merge/MinimumNumber.java
浏览文件 @ 1fba8c1a
......@@ -42,13 +42,13 @@
package org.gephi.datalab.plugin.manipulators.columns.merge;
import javax.swing.Icon;
import org.gephi.graph.api.AttributeUtils;
import org.gephi.graph.api.Column;
import org.gephi.graph.api.Table;
import org.gephi.datalab.api.AttributeColumnsMergeStrategiesController;
import org.gephi.datalab.plugin.manipulators.columns.merge.ui.GeneralColumnTitleChooserUI;
import org.gephi.datalab.spi.ManipulatorUI;
import org.gephi.datalab.spi.columns.merge.AttributeColumnsMergeStrategy;
import org.gephi.graph.api.AttributeUtils;
import org.gephi.graph.api.Column;
import org.gephi.graph.api.Table;
import org.openide.util.ImageUtilities;
import org.openide.util.Lookup;
import org.openide.util.NbBundle;
......
modules/DataLaboratoryPlugin/src/main/java/org/gephi/datalab/plugin/manipulators/columns/merge/SumNumbers.java
浏览文件 @ 1fba8c1a
......@@ -42,13 +42,13 @@ Portions Copyrighted 2011 Gephi Consortium.
package org.gephi.datalab.plugin.manipulators.columns.merge;
import javax.swing.Icon;
import org.gephi.graph.api.AttributeUtils;
import org.gephi.graph.api.Column;
import org.gephi.graph.api.Table;
import org.gephi.datalab.api.AttributeColumnsMergeStrategiesController;
import org.gephi.datalab.plugin.manipulators.columns.merge.ui.GeneralColumnTitleChooserUI;
import org.gephi.datalab.spi.ManipulatorUI;
import org.gephi.datalab.spi.columns.merge.AttributeColumnsMergeStrategy;
import org.gephi.graph.api.AttributeUtils;
import org.gephi.graph.api.Column;
import org.gephi.graph.api.Table;
import org.openide.util.ImageUtilities;
import org.openide.util.Lookup;
import org.openide.util.NbBundle;
......
modules/DataLaboratoryPlugin/src/main/java/org/gephi/datalab/plugin/manipulators/columns/merge/ThirdQuartileNumber.java
浏览文件 @ 1fba8c1a
......@@ -42,13 +42,13 @@ Portions Copyrighted 2011 Gephi Consortium.
package org.gephi.datalab.plugin.manipulators.columns.merge;
import javax.swing.Icon;
import org.gephi.graph.api.AttributeUtils;
import org.gephi.graph.api.Column;
import org.gephi.graph.api.Table;
import org.gephi.datalab.api.AttributeColumnsMergeStrategiesController;
import org.gephi.datalab.plugin.manipulators.columns.merge.ui.GeneralColumnTitleChooserUI;
import org.gephi.datalab.spi.ManipulatorUI;
import org.gephi.datalab.spi.columns.merge.AttributeColumnsMergeStrategy;
import org.gephi.graph.api.AttributeUtils;
import org.gephi.graph.api.Column;
import org.gephi.graph.api.Table;
import org.openide.util.Lookup;
import org.openide.util.NbBundle;
......
modules/DataLaboratoryPlugin/src/main/java/org/gephi/datalab/plugin/manipulators/columns/merge/ui/BooleanLogicOperationsUI.java
浏览文件 @ 1fba8c1a
......@@ -46,13 +46,13 @@ import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.event.DocumentEvent;
import javax.swing.event.DocumentListener;
import org.gephi.graph.api.Column;
import org.gephi.graph.api.Table;
import org.gephi.datalab.api.AttributeColumnsMergeStrategiesController.BooleanOperations;
import org.gephi.datalab.plugin.manipulators.columns.merge.BooleanLogicOperations;
import org.gephi.datalab.spi.DialogControls;
import org.gephi.datalab.spi.Manipulator;
import org.gephi.datalab.spi.ManipulatorUI;
import org.gephi.graph.api.Column;
import org.gephi.graph.api.Table;
import org.gephi.ui.utils.ColumnTitleValidator;
import org.netbeans.validation.api.ui.ValidationGroup;
import org.netbeans.validation.api.ui.ValidationPanel;
......
modules/DataLaboratoryPlugin/src/main/java/org/gephi/datalab/plugin/manipulators/columns/merge/ui/CreateTimeIntervalUI.java
浏览文件 @ 1fba8c1a
......@@ -48,11 +48,11 @@ import javax.swing.JComboBox;
import javax.swing.JPanel;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
import org.gephi.graph.api.Column;
import org.gephi.datalab.plugin.manipulators.columns.merge.CreateTimeInterval;
import org.gephi.datalab.spi.DialogControls;
import org.gephi.datalab.spi.Manipulator;
import org.gephi.datalab.spi.ManipulatorUI;
import org.gephi.graph.api.Column;
import org.netbeans.validation.api.Problems;
import org.netbeans.validation.api.Validator;
import org.netbeans.validation.api.ui.ValidationGroup;
......
modules/DataLaboratoryPlugin/src/main/java/org/gephi/datalab/plugin/manipulators/columns/merge/ui/GeneralColumnTitleChooserUI.java
浏览文件 @ 1fba8c1a
......@@ -44,11 +44,11 @@ package org.gephi.datalab.plugin.manipulators.columns.merge.ui;
import javax.swing.JPanel;
import javax.swing.event.DocumentEvent;
import javax.swing.event.DocumentListener;
import org.gephi.graph.api.Table;
import org.gephi.datalab.plugin.manipulators.columns.merge.GeneralColumnTitleChooser;
import org.gephi.datalab.spi.DialogControls;
import org.gephi.datalab.spi.Manipulator;
import org.gephi.datalab.spi.ManipulatorUI;
import org.gephi.graph.api.Table;
import org.gephi.ui.utils.ColumnTitleValidator;
import org.netbeans.validation.api.ui.ValidationGroup;
import org.netbeans.validation.api.ui.ValidationPanel;
......
modules/DataLaboratoryPlugin/src/main/java/org/gephi/datalab/plugin/manipulators/columns/merge/ui/JoinWithSeparatorUI.java
浏览文件 @ 1fba8c1a
......@@ -44,11 +44,11 @@ package org.gephi.datalab.plugin.manipulators.columns.merge.ui;
import javax.swing.JPanel;
import javax.swing.event.DocumentEvent;
import javax.swing.event.DocumentListener;
import org.gephi.graph.api.Table;
import org.gephi.datalab.plugin.manipulators.columns.merge.JoinWithSeparator;
import org.gephi.datalab.spi.DialogControls;
import org.gephi.datalab.spi.Manipulator;
import org.gephi.datalab.spi.ManipulatorUI;
import org.gephi.graph.api.Table;
import org.gephi.ui.utils.ColumnTitleValidator;
import org.netbeans.validation.api.ui.ValidationGroup;
import org.netbeans.validation.api.ui.ValidationPanel;
......
modules/DataLaboratoryPlugin/src/main/java/org/gephi/datalab/plugin/manipulators/columns/ui/ColumnValuesFrequencyUI.java
浏览文件 @ 1fba8c1a
......@@ -43,13 +43,13 @@ package org.gephi.datalab.plugin.manipulators.columns.ui;
import java.util.Map;
import javax.swing.JPanel;
import org.gephi.graph.api.Column;
import org.gephi.graph.api.Table;
import org.gephi.datalab.plugin.manipulators.columns.ColumnValuesFrequency;
import org.gephi.datalab.spi.DialogControls;
import org.gephi.datalab.spi.columns.AttributeColumnsManipulator;
import org.gephi.datalab.spi.columns.AttributeColumnsManipulatorUI;
import org.gephi.graph.api.Column;
import org.gephi.graph.api.GraphModel;
import org.gephi.graph.api.Table;
import org.gephi.ui.components.JFreeChartDialog;
import org.gephi.ui.components.SimpleHTMLReport;
import org.jfree.chart.JFreeChart;
......
modules/DataLaboratoryPlugin/src/main/java/org/gephi/datalab/plugin/manipulators/columns/ui/ConvertColumnToDynamicTimestampsUI.java
浏览文件 @ 1fba8c1a
......@@ -44,14 +44,14 @@ package org.gephi.datalab.plugin.manipulators.columns.ui;
import javax.swing.JPanel;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
import org.gephi.graph.api.Column;
import org.gephi.graph.api.Table;
import org.gephi.datalab.plugin.manipulators.columns.ConvertColumnToDynamic;
import org.gephi.datalab.spi.DialogControls;
import org.gephi.datalab.spi.columns.AttributeColumnsManipulator;
import org.gephi.datalab.spi.columns.AttributeColumnsManipulatorUI;
import org.gephi.graph.api.AttributeUtils;
import org.gephi.graph.api.Column;
import org.gephi.graph.api.GraphModel;
import org.gephi.graph.api.Table;
import org.gephi.ui.utils.ColumnTitleValidator;
import org.gephi.ui.utils.IntervalBoundValidator;
import org.netbeans.validation.api.ui.ValidationGroup;
......
modules/DataLaboratoryPlugin/src/main/java/org/gephi/datalab/plugin/manipulators/columns/ui/ConvertColumnToDynamicUI.java
浏览文件 @ 1fba8c1a
......@@ -44,14 +44,14 @@ package org.gephi.datalab.plugin.manipulators.columns.ui;
import javax.swing.JPanel;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
import org.gephi.graph.api.Column;
import org.gephi.graph.api.Table;
import org.gephi.datalab.plugin.manipulators.columns.ConvertColumnToDynamic;
import org.gephi.datalab.spi.DialogControls;
import org.gephi.datalab.spi.columns.AttributeColumnsManipulator;
import org.gephi.datalab.spi.columns.AttributeColumnsManipulatorUI;
import org.gephi.graph.api.AttributeUtils;
import org.gephi.graph.api.Column;
import org.gephi.graph.api.GraphModel;
import org.gephi.graph.api.Table;
import org.gephi.ui.utils.ColumnTitleValidator;
import org.gephi.ui.utils.IntervalBoundValidator;
import org.netbeans.validation.api.ui.ValidationGroup;
......
modules/DataLaboratoryPlugin/src/main/java/org/gephi/datalab/plugin/manipulators/columns/ui/CopyDataToOtherColumnUI.java
浏览文件 @ 1fba8c1a
......@@ -43,14 +43,14 @@ package org.gephi.datalab.plugin.manipulators.columns.ui;
import java.util.ArrayList;
import javax.swing.JPanel;
import org.gephi.graph.api.Column;
import org.gephi.graph.api.Table;
import org.gephi.datalab.api.AttributeColumnsController;
import org.gephi.datalab.plugin.manipulators.columns.CopyDataToOtherColumn;
import org.gephi.datalab.spi.DialogControls;
import org.gephi.datalab.spi.columns.AttributeColumnsManipulator;
import org.gephi.datalab.spi.columns.AttributeColumnsManipulatorUI;
import org.gephi.graph.api.Column;
import org.gephi.graph.api.GraphModel;
import org.gephi.graph.api.Table;
import org.openide.util.Lookup;
import org.openide.util.NbBundle;
......@@ -79,7 +79,7 @@ public class CopyDataToOtherColumnUI extends javax.swing.JPanel implements Attri
AttributeColumnsController ac = Lookup.getDefault().lookup(AttributeColumnsController.class);
ArrayList<Column> availableColumns = new ArrayList<Column>();
ArrayList<Column> availableColumns = new ArrayList<>();
for (Column c : table) {
if (ac.canChangeColumnData(c) && c != column) {
......
modules/DataLaboratoryPlugin/src/main/java/org/gephi/datalab/plugin/manipulators/columns/ui/DuplicateColumnUI.java
浏览文件 @ 1fba8c1a
......@@ -45,14 +45,14 @@ import java.util.List;
import javax.swing.JPanel;
import javax.swing.event.DocumentEvent;
import javax.swing.event.DocumentListener;
import org.gephi.graph.api.Column;
import org.gephi.graph.api.Table;
import org.gephi.datalab.plugin.manipulators.columns.DuplicateColumn;
import org.gephi.datalab.spi.DialogControls;
import org.gephi.datalab.spi.columns.AttributeColumnsManipulator;
import org.gephi.datalab.spi.columns.AttributeColumnsManipulatorUI;
import org.gephi.datalab.utils.SupportedColumnTypeWrapper;
import org.gephi.graph.api.Column;
import org.gephi.graph.api.GraphModel;
import org.gephi.graph.api.Table;
import org.gephi.ui.utils.ColumnTitleValidator;
import org.netbeans.validation.api.ui.ValidationGroup;
import org.netbeans.validation.api.ui.ValidationPanel;
......
modules/DataLaboratoryPlugin/src/main/java/org/gephi/datalab/plugin/manipulators/columns/ui/GeneralCreateColumnFromRegexUI.java
浏览文件 @ 1fba8c1a
......@@ -47,13 +47,13 @@ import java.util.regex.PatternSyntaxException;
import javax.swing.JPanel;
import javax.swing.event.DocumentEvent;
import javax.swing.event.DocumentListener;
import org.gephi.graph.api.Column;
import org.gephi.graph.api.Table;
import org.gephi.datalab.plugin.manipulators.columns.GeneralCreateColumnFromRegex;
import org.gephi.datalab.spi.DialogControls;
import org.gephi.datalab.spi.columns.AttributeColumnsManipulator;
import org.gephi.datalab.spi.columns.AttributeColumnsManipulatorUI;
import org.gephi.graph.api.Column;
import org.gephi.graph.api.GraphModel;
import org.gephi.graph.api.Table;
import org.gephi.ui.utils.ColumnTitleValidator;
import org.netbeans.validation.api.ui.ValidationGroup;
import org.netbeans.validation.api.ui.ValidationPanel;
......
modules/DataLaboratoryPlugin/src/main/java/org/gephi/datalab/plugin/manipulators/edges/ClearEdgesData.java
浏览文件 @ 1fba8c1a
......@@ -43,12 +43,12 @@ package org.gephi.datalab.plugin.manipulators.edges;
import java.util.ArrayList;
import javax.swing.Icon;
import org.gephi.graph.api.Column;
import org.gephi.datalab.api.AttributeColumnsController;
import org.gephi.datalab.api.datatables.DataTablesController;
import org.gephi.datalab.plugin.manipulators.GeneralColumnsChooser;
import org.gephi.datalab.plugin.manipulators.ui.GeneralChooseColumnsUI;
import org.gephi.datalab.spi.ManipulatorUI;
import org.gephi.graph.api.Column;
import org.gephi.graph.api.Edge;
import org.gephi.graph.api.GraphController;
import org.openide.util.ImageUtilities;
......@@ -68,7 +68,7 @@ public class ClearEdgesData extends BasicEdgesManipulator implements GeneralColu
public void setup(Edge[] edges, Edge clickedEdge) {
this.edges = edges;
AttributeColumnsController ac = Lookup.getDefault().lookup(AttributeColumnsController.class);
ArrayList<Column> columnsToClearDataList = new ArrayList<Column>();
ArrayList<Column> columnsToClearDataList = new ArrayList<>();
for (Column column : Lookup.getDefault().lookup(GraphController.class).getGraphModel().getEdgeTable()) {
if (ac.canClearColumnData(column)) {
columnsToClearDataList.add(column);
......
modules/DataLaboratoryPlugin/src/main/java/org/gephi/datalab/plugin/manipulators/edges/CopyEdgeDataToOtherEdges.java
浏览文件 @ 1fba8c1a
......@@ -43,12 +43,12 @@ package org.gephi.datalab.plugin.manipulators.edges;
import java.util.ArrayList;
import javax.swing.Icon;
import org.gephi.graph.api.Column;
import org.gephi.datalab.api.AttributeColumnsController;
import org.gephi.datalab.api.datatables.DataTablesController;
import org.gephi.datalab.plugin.manipulators.GeneralColumnsAndRowChooser;
import org.gephi.datalab.plugin.manipulators.ui.GeneralChooseColumnsAndRowUI;
import org.gephi.datalab.spi.ManipulatorUI;
import org.gephi.graph.api.Column;
import org.gephi.graph.api.Edge;
import org.gephi.graph.api.Element;
import org.gephi.graph.api.GraphController;
......@@ -72,7 +72,7 @@ public class CopyEdgeDataToOtherEdges extends BasicEdgesManipulator implements G
this.clickedEdge = clickedEdge;
this.edges = edges;
AttributeColumnsController ac = Lookup.getDefault().lookup(AttributeColumnsController.class);
ArrayList<Column> columnsToCopyDataList = new ArrayList<Column>();
ArrayList<Column> columnsToCopyDataList = new ArrayList<>();
for (Column column : Lookup.getDefault().lookup(GraphController.class).getGraphModel().getEdgeTable()) {
if (ac.canChangeColumnData(column)) {
columnsToCopyDataList.add(column);
......
modules/DataLaboratoryPlugin/src/main/java/org/gephi/datalab/plugin/manipulators/general/ClearEdges.java
浏览文件 @ 1fba8c1a
......@@ -78,7 +78,7 @@ public class ClearEdges implements PluginGeneralActionsManipulator {
GraphElementsController gec = Lookup.getDefault().lookup(GraphElementsController.class);
Graph graph = Lookup.getDefault().lookup(GraphController.class).getGraphModel().getGraph();
List<Edge> edges = new ArrayList<Edge>();
List<Edge> edges = new ArrayList<>();
for (Edge edge : graph.getEdges().toArray()) {
if (edge.isDirected()) {
if(deleteDirected){
......
modules/DataLaboratoryPlugin/src/main/java/org/gephi/datalab/plugin/manipulators/general/ManageColumnEstimators.java
浏览文件 @ 1fba8c1a
......@@ -100,7 +100,7 @@ public class ManageColumnEstimators implements PluginGeneralActionsManipulator {
table = graphModel.getEdgeTable();
}
List<Column> availableColumns = new ArrayList<Column>();
List<Column> availableColumns = new ArrayList<>();
for (Column column : table) {
if(TimeMap.class.isAssignableFrom(column.getTypeClass())){
availableColumns.add(column);
......
modules/DataLaboratoryPlugin/src/main/java/org/gephi/datalab/plugin/manipulators/general/MergeNodeDuplicates.java
浏览文件 @ 1fba8c1a
......@@ -44,16 +44,16 @@ package org.gephi.datalab.plugin.manipulators.general;
import java.util.ArrayList;
import java.util.List;
import javax.swing.Icon;
import org.gephi.graph.api.Column;
import org.gephi.graph.api.Table;
import org.gephi.datalab.api.GraphElementsController;
import org.gephi.datalab.plugin.manipulators.general.ui.MergeNodeDuplicatesUI;
import org.gephi.datalab.spi.ManipulatorUI;
import org.gephi.datalab.spi.general.PluginGeneralActionsManipulator;
import org.gephi.datalab.spi.rows.merge.AttributeRowsMergeStrategy;
import org.gephi.graph.api.Column;
import org.gephi.graph.api.Graph;
import org.gephi.graph.api.GraphController;
import org.gephi.graph.api.Node;
import org.gephi.graph.api.Table;
import org.openide.util.ImageUtilities;
import org.openide.util.Lookup;
import org.openide.util.NbBundle;
......@@ -107,7 +107,7 @@ public class MergeNodeDuplicates implements PluginGeneralActionsManipulator {
@Override
public ManipulatorUI getUI() {
Table nodeTable = Lookup.getDefault().lookup(GraphController.class).getGraphModel().getNodeTable();
List<Column> columnsList = new ArrayList<Column>();
List<Column> columnsList = new ArrayList<>();
for (Column column : nodeTable) {
if(!column.isReadOnly()){
columnsList.add(column);
......
modules/DataLaboratoryPlugin/src/main/java/org/gephi/datalab/plugin/manipulators/general/SearchReplace.java
浏览文件 @ 1fba8c1a
......@@ -42,13 +42,13 @@ Portions Copyrighted 2011 Gephi Consortium.
package org.gephi.datalab.plugin.manipulators.general;
import javax.swing.Icon;
import org.gephi.graph.api.Table;
import org.gephi.datalab.api.AttributeColumnsController;
import org.gephi.datalab.api.datatables.DataTablesController;
import org.gephi.datalab.plugin.manipulators.general.ui.SearchReplaceUI;
import org.gephi.datalab.spi.ManipulatorUI;
import org.gephi.datalab.spi.general.GeneralActionsManipulator;
import org.gephi.graph.api.GraphController;
import org.gephi.graph.api.Table;
import org.openide.DialogDescriptor;
import org.openide.DialogDisplayer;
import org.openide.util.ImageUtilities;
......
modules/DataLaboratoryPlugin/src/main/java/org/gephi/datalab/plugin/manipulators/general/ui/ImportCSVUIVisualPanel1.java
浏览文件 @ 1fba8c1a
......@@ -188,7 +188,7 @@ public class ImportCSVUIVisualPanel1 extends javax.swing.JPanel {
columnCount = headers.length;
//Check for repeated column names:
Set<String> columnNamesSet = new HashSet<String>();
Set<String> columnNamesSet = new HashSet<>();
hasColumnNamesRepeated = false;
hasSourceNodeColumn = false;
hasTargetNodeColumn = false;
......@@ -212,7 +212,7 @@ public class ImportCSVUIVisualPanel1 extends javax.swing.JPanel {
currentColumn++;
}
ArrayList<String[]> records = new ArrayList<String[]>();
ArrayList<String[]> records = new ArrayList<>();
hasRowsMissingSourcesOrTargets = false;
ImportCSVUIWizardAction.Mode mode = getMode();
if (columnCount > 0) {
......
modules/DataLaboratoryPlugin/src/main/java/org/gephi/datalab/plugin/manipulators/general/ui/ImportCSVUIVisualPanel2.java
浏览文件 @ 1fba8c1a
......@@ -53,12 +53,12 @@ import javax.swing.JComboBox;
import javax.swing.JLabel;
import javax.swing.JPanel;
import net.miginfocom.swing.MigLayout;
import org.gephi.graph.api.Table;
import org.gephi.datalab.plugin.manipulators.general.ui.ImportCSVUIWizardAction.Mode;
import org.gephi.datalab.utils.SupportedColumnTypeWrapper;
import org.gephi.graph.api.Column;
import org.gephi.graph.api.GraphController;
import org.gephi.graph.api.GraphModel;
import org.gephi.graph.api.Table;
import org.openide.util.Exceptions;
import org.openide.util.Lookup;
import org.openide.util.NbBundle;
......@@ -72,8 +72,8 @@ public final class ImportCSVUIVisualPanel2 extends JPanel {
private Character separator;
private File file;
private ImportCSVUIWizardAction.Mode mode;
private final ArrayList<JCheckBox> columnsCheckBoxes = new ArrayList<JCheckBox>();
private final ArrayList<JComboBox> columnsComboBoxes = new ArrayList<JComboBox>();
private final ArrayList<JCheckBox> columnsCheckBoxes = new ArrayList<>();
private final ArrayList<JComboBox> columnsComboBoxes = new ArrayList<>();
private GraphModel graphModel;
private Table table;
private Charset charset;
......@@ -229,7 +229,7 @@ public final class ImportCSVUIVisualPanel2 extends JPanel {
}
public String[] getColumnsToImport() {
ArrayList<String> columns = new ArrayList<String>();
ArrayList<String> columns = new ArrayList<>();
for (JCheckBox columnCheckBox : columnsCheckBoxes) {
if (columnCheckBox.isSelected()) {
columns.add(columnCheckBox.getText());
......@@ -239,7 +239,7 @@ public final class ImportCSVUIVisualPanel2 extends JPanel {
}
public Class[] getColumnsToImportTypes() {
ArrayList<Class> types = new ArrayList<Class>();
ArrayList<Class> types = new ArrayList<>();
for (int i = 0; i < columnsCheckBoxes.size(); i++) {
if (columnsCheckBoxes.get(i).isSelected()) {
SupportedColumnTypeWrapper selected = (SupportedColumnTypeWrapper)columnsComboBoxes.get(i).getSelectedItem();
......
modules/DataLaboratoryPlugin/src/main/java/org/gephi/datalab/plugin/manipulators/general/ui/ImportCSVUIWizardPanel1.java
浏览文件 @ 1fba8c1a
......@@ -83,7 +83,7 @@ public class ImportCSVUIWizardPanel1 implements WizardDescriptor.Panel {
public boolean isValid() {
return component.isCSVValid();
}
private final Set<ChangeListener> listeners = new HashSet<ChangeListener>(1); // or can use ChangeSupport in NB 6.0
private final Set<ChangeListener> listeners = new HashSet<>(1); // or can use ChangeSupport in NB 6.0
@Override
public final void addChangeListener(ChangeListener l) {
......@@ -102,7 +102,7 @@ public class ImportCSVUIWizardPanel1 implements WizardDescriptor.Panel {
protected final void fireChangeEvent() {
Iterator<ChangeListener> it;
synchronized (listeners) {
it = new HashSet<ChangeListener>(listeners).iterator();
it = new HashSet<>(listeners).iterator();
}
ChangeEvent ev = new ChangeEvent(this);
while (it.hasNext()) {
......
modules/DataLaboratoryPlugin/src/main/java/org/gephi/datalab/plugin/manipulators/general/ui/ImportCSVUIWizardPanel2.java
浏览文件 @ 1fba8c1a
......@@ -87,7 +87,7 @@ public class ImportCSVUIWizardPanel2 implements WizardDescriptor.Panel {
return component.isValidCSV();
}
private final Set<ChangeListener> listeners = new HashSet<ChangeListener>(1); // or can use ChangeSupport in NB 6.0
private final Set<ChangeListener> listeners = new HashSet<>(1); // or can use ChangeSupport in NB 6.0
@Override
public final void addChangeListener(ChangeListener l) {
......@@ -106,7 +106,7 @@ public class ImportCSVUIWizardPanel2 implements WizardDescriptor.Panel {
protected final void fireChangeEvent() {
Iterator<ChangeListener> it;
synchronized (listeners) {
it = new HashSet<ChangeListener>(listeners).iterator();
it = new HashSet<>(listeners).iterator();
}
ChangeEvent ev = new ChangeEvent(this);
while (it.hasNext()) {
......
modules/DataLaboratoryPlugin/src/main/java/org/gephi/datalab/plugin/manipulators/general/ui/ManageColumnEstimatorsUI.java
浏览文件 @ 1fba8c1a
......@@ -47,14 +47,13 @@ import javax.swing.JComboBox;
import javax.swing.JLabel;
import javax.swing.JPanel;
import net.miginfocom.swing.MigLayout;
import org.gephi.graph.api.Column;
import org.gephi.datalab.plugin.manipulators.general.ManageColumnEstimators;
import org.gephi.datalab.spi.DialogControls;
import org.gephi.datalab.spi.Manipulator;
import org.gephi.datalab.spi.ManipulatorUI;
import org.gephi.graph.api.Column;
import org.gephi.graph.api.Estimator;
import org.gephi.graph.api.types.TimeMap;
import org.openide.util.Exceptions;
import org.openide.util.NbBundle;
/**
......
modules/DataLaboratoryPlugin/src/main/java/org/gephi/datalab/plugin/manipulators/general/ui/MergeNodeDuplicatesUI.java
浏览文件 @ 1fba8c1a
......@@ -54,7 +54,6 @@ import javax.swing.JComboBox;
import javax.swing.JLabel;
import javax.swing.JPanel;
import net.miginfocom.swing.MigLayout;
import org.gephi.graph.api.Column;
import org.gephi.datalab.api.AttributeColumnsController;
import org.gephi.datalab.api.DataLaboratoryHelper;
import org.gephi.datalab.plugin.manipulators.general.MergeNodeDuplicates;
......@@ -62,6 +61,7 @@ import org.gephi.datalab.spi.DialogControls;
import org.gephi.datalab.spi.Manipulator;
import org.gephi.datalab.spi.ManipulatorUI;
import org.gephi.datalab.spi.rows.merge.AttributeRowsMergeStrategy;
import org.gephi.graph.api.Column;
import org.gephi.graph.api.Element;
import org.gephi.graph.api.Node;
import org.gephi.ui.components.richtooltip.RichTooltip;
......@@ -197,7 +197,7 @@ public final class MergeNodeDuplicatesUI extends JPanel implements ManipulatorUI
}
private List<AttributeRowsMergeStrategy> getColumnAvailableStrategies(Column column) {
ArrayList<AttributeRowsMergeStrategy> availableStrategies = new ArrayList<AttributeRowsMergeStrategy>();
ArrayList<AttributeRowsMergeStrategy> availableStrategies = new ArrayList<>();
for (AttributeRowsMergeStrategy strategy : DataLaboratoryHelper.getDefault().getAttributeRowsMergeStrategies()) {
strategy.setup(rows, rows[0], column);
if (strategy.canExecute()) {
......
modules/DataLaboratoryPlugin/src/main/java/org/gephi/datalab/plugin/manipulators/general/ui/SearchReplaceUI.java
浏览文件 @ 1fba8c1a
......@@ -48,15 +48,15 @@ import java.util.regex.PatternSyntaxException;
import javax.swing.JOptionPane;
import javax.swing.event.DocumentEvent;
import javax.swing.event.DocumentListener;
import org.gephi.graph.api.Column;
import org.gephi.graph.api.Table;
import org.gephi.datalab.api.SearchReplaceController;
import org.gephi.datalab.api.SearchReplaceController.SearchOptions;
import org.gephi.datalab.api.SearchReplaceController.SearchResult;
import org.gephi.datalab.api.datatables.DataTablesController;
import org.gephi.graph.api.Column;
import org.gephi.graph.api.Edge;
import org.gephi.graph.api.GraphController;
import org.gephi.graph.api.Node;
import org.gephi.graph.api.Table;
import org.gephi.utils.HTMLEscape;
import org.openide.util.Lookup;
import org.openide.util.NbBundle;
......
modules/DataLaboratoryPlugin/src/main/java/org/gephi/datalab/plugin/manipulators/nodes/ClearNodesData.java
浏览文件 @ 1fba8c1a
......@@ -43,12 +43,12 @@ package org.gephi.datalab.plugin.manipulators.nodes;
import java.util.ArrayList;
import javax.swing.Icon;
import org.gephi.graph.api.Column;
import org.gephi.datalab.api.AttributeColumnsController;
import org.gephi.datalab.api.datatables.DataTablesController;
import org.gephi.datalab.plugin.manipulators.GeneralColumnsChooser;
import org.gephi.datalab.plugin.manipulators.ui.GeneralChooseColumnsUI;
import org.gephi.datalab.spi.ManipulatorUI;
import org.gephi.graph.api.Column;
import org.gephi.graph.api.GraphController;
import org.gephi.graph.api.Node;
import org.openide.util.ImageUtilities;
......@@ -68,7 +68,7 @@ public class ClearNodesData extends BasicNodesManipulator implements GeneralCol
public void setup(Node[] nodes, Node clickedNode) {
this.nodes = nodes;
AttributeColumnsController ac = Lookup.getDefault().lookup(AttributeColumnsController.class);
ArrayList<Column> columnsToClearDataList = new ArrayList<Column>();
ArrayList<Column> columnsToClearDataList = new ArrayList<>();
for (Column column : Lookup.getDefault().lookup(GraphController.class).getGraphModel().getNodeTable()) {
if (ac.canClearColumnData(column)) {
columnsToClearDataList.add(column);
......
modules/DataLaboratoryPlugin/src/main/java/org/gephi/datalab/plugin/manipulators/nodes/CopyNodeDataToOtherNodes.java
浏览文件 @ 1fba8c1a
......@@ -43,12 +43,12 @@ package org.gephi.datalab.plugin.manipulators.nodes;
import java.util.ArrayList;
import javax.swing.Icon;
import org.gephi.graph.api.Column;
import org.gephi.datalab.api.AttributeColumnsController;
import org.gephi.datalab.api.datatables.DataTablesController;
import org.gephi.datalab.plugin.manipulators.GeneralColumnsAndRowChooser;
import org.gephi.datalab.plugin.manipulators.ui.GeneralChooseColumnsAndRowUI;
import org.gephi.datalab.spi.ManipulatorUI;
import org.gephi.graph.api.Column;
import org.gephi.graph.api.Element;
import org.gephi.graph.api.GraphController;
import org.gephi.graph.api.Node;
......@@ -71,7 +71,7 @@ public class CopyNodeDataToOtherNodes extends BasicNodesManipulator implements G
this.clickedNode = clickedNode;
this.nodes = nodes;
AttributeColumnsController ac = Lookup.getDefault().lookup(AttributeColumnsController.class);
ArrayList<Column> columnsToCopyDataList = new ArrayList<Column>();
ArrayList<Column> columnsToCopyDataList = new ArrayList<>();
for (Column column : Lookup.getDefault().lookup(GraphController.class).getGraphModel().getNodeTable()) {
if (ac.canChangeColumnData(column)) {
columnsToCopyDataList.add(column);
......
modules/DataLaboratoryPlugin/src/main/java/org/gephi/datalab/plugin/manipulators/nodes/MergeNodes.java
浏览文件 @ 1fba8c1a
......@@ -44,12 +44,12 @@ package org.gephi.datalab.plugin.manipulators.nodes;
import java.util.ArrayList;
import java.util.List;
import javax.swing.Icon;
import org.gephi.graph.api.Column;
import org.gephi.datalab.api.GraphElementsController;
import org.gephi.datalab.api.datatables.DataTablesController;
import org.gephi.datalab.plugin.manipulators.nodes.ui.MergeNodesUI;
import org.gephi.datalab.spi.ManipulatorUI;
import org.gephi.datalab.spi.rows.merge.AttributeRowsMergeStrategy;
import org.gephi.graph.api.Column;
import org.gephi.graph.api.Graph;
import org.gephi.graph.api.GraphController;
import org.gephi.graph.api.Node;
......@@ -87,7 +87,7 @@ public class MergeNodes extends BasicNodesManipulator {
selectedNode = clickedNode != null ? clickedNode : nodes[0];
Table nodeTable = Lookup.getDefault().lookup(GraphController.class).getGraphModel().getNodeTable();
List<Column> columnsList = new ArrayList<Column>();
List<Column> columnsList = new ArrayList<>();
for (Column column : nodeTable) {
if(!column.isReadOnly()){
columnsList.add(column);
......
modules/DataLaboratoryPlugin/src/main/java/org/gephi/datalab/plugin/manipulators/nodes/ui/MergeNodesUI.java
浏览文件 @ 1fba8c1a
......@@ -54,13 +54,13 @@ import javax.swing.JComboBox;
import javax.swing.JLabel;
import javax.swing.JPanel;
import net.miginfocom.swing.MigLayout;
import org.gephi.graph.api.Column;
import org.gephi.datalab.api.DataLaboratoryHelper;
import org.gephi.datalab.plugin.manipulators.nodes.MergeNodes;
import org.gephi.datalab.spi.DialogControls;
import org.gephi.datalab.spi.Manipulator;
import org.gephi.datalab.spi.ManipulatorUI;
import org.gephi.datalab.spi.rows.merge.AttributeRowsMergeStrategy;
import org.gephi.graph.api.Column;
import org.gephi.graph.api.Node;
import org.gephi.ui.components.richtooltip.RichTooltip;
import org.openide.util.ImageUtilities;
......@@ -154,7 +154,7 @@ public final class MergeNodesUI extends JPanel implements ManipulatorUI {
}
private List<AttributeRowsMergeStrategy> getColumnAvailableStrategies(Column column) {
ArrayList<AttributeRowsMergeStrategy> availableStrategies = new ArrayList<AttributeRowsMergeStrategy>();
ArrayList<AttributeRowsMergeStrategy> availableStrategies = new ArrayList<>();
for (AttributeRowsMergeStrategy strategy : DataLaboratoryHelper.getDefault().getAttributeRowsMergeStrategies()) {
strategy.setup(nodes, manipulator.getSelectedNode(), column);
if (strategy.canExecute()) {
......
modules/DataLaboratoryPlugin/src/main/java/org/gephi/datalab/plugin/manipulators/nodes/ui/SetNodesSizeUI.java
浏览文件 @ 1fba8c1a
......@@ -100,13 +100,13 @@ public class SetNodesSizeUI extends javax.swing.JPanel implements ManipulatorUI
@Override
public void insertString(int offs, String str, AttributeSet a) throws BadLocationException {
for (int i = 0; i < str.length(); i++) {
if (POSITIVE_FLOAT_ACCEPTED_CHARS.indexOf(String.valueOf(str.charAt(i))) == -1) {
if (!POSITIVE_FLOAT_ACCEPTED_CHARS.contains(String.valueOf(str.charAt(i)))) {
return;
}
}
if (str.indexOf(".") != -1) {
if (getText(0, getLength()).indexOf(".") != -1) {
if (str.contains(".")) {
if (getText(0, getLength()).contains(".")) {
return;
}
}
......
modules/DataLaboratoryPlugin/src/main/java/org/gephi/datalab/plugin/manipulators/rows/merge/AverageNumber.java
浏览文件 @ 1fba8c1a
......@@ -43,11 +43,11 @@ package org.gephi.datalab.plugin.manipulators.rows.merge;
import java.math.BigDecimal;
import javax.swing.Icon;
import org.gephi.graph.api.AttributeUtils;
import org.gephi.graph.api.Column;
import org.gephi.datalab.api.AttributeColumnsController;
import org.gephi.datalab.spi.ManipulatorUI;
import org.gephi.datalab.spi.rows.merge.AttributeRowsMergeStrategy;
import org.gephi.graph.api.AttributeUtils;
import org.gephi.graph.api.Column;
import org.gephi.graph.api.Element;
import org.gephi.utils.StatisticsUtils;
import org.openide.util.ImageUtilities;
......
modules/DataLaboratoryPlugin/src/main/java/org/gephi/datalab/plugin/manipulators/rows/merge/FirstQuartileNumber.java
浏览文件 @ 1fba8c1a
......@@ -43,11 +43,11 @@ package org.gephi.datalab.plugin.manipulators.rows.merge;
import java.math.BigDecimal;
import javax.swing.Icon;
import org.gephi.graph.api.Column;
import org.gephi.datalab.api.AttributeColumnsController;
import org.gephi.datalab.spi.ManipulatorUI;
import org.gephi.datalab.spi.rows.merge.AttributeRowsMergeStrategy;
import org.gephi.graph.api.AttributeUtils;
import org.gephi.graph.api.Column;
import org.gephi.graph.api.Element;
import org.gephi.utils.StatisticsUtils;
import org.openide.util.Lookup;
......
modules/DataLaboratoryPlugin/src/main/java/org/gephi/datalab/plugin/manipulators/rows/merge/InterQuartileRangeNumber.java
浏览文件 @ 1fba8c1a
......@@ -43,11 +43,11 @@ package org.gephi.datalab.plugin.manipulators.rows.merge;
import java.math.BigDecimal;
import javax.swing.Icon;
import org.gephi.graph.api.Column;
import org.gephi.datalab.api.AttributeColumnsController;
import org.gephi.datalab.spi.ManipulatorUI;
import org.gephi.datalab.spi.rows.merge.AttributeRowsMergeStrategy;
import org.gephi.graph.api.AttributeUtils;
import org.gephi.graph.api.Column;
import org.gephi.graph.api.Element;
import org.gephi.utils.StatisticsUtils;
import org.openide.util.Lookup;
......
modules/DataLaboratoryPlugin/src/main/java/org/gephi/datalab/plugin/manipulators/rows/merge/JoinWithSeparator.java
浏览文件 @ 1fba8c1a
......@@ -42,10 +42,10 @@
package org.gephi.datalab.plugin.manipulators.rows.merge;
import javax.swing.Icon;
import org.gephi.graph.api.Column;
import org.gephi.datalab.plugin.manipulators.rows.merge.ui.JoinWithSeparatorUI;
import org.gephi.datalab.spi.ManipulatorUI;
import org.gephi.datalab.spi.rows.merge.AttributeRowsMergeStrategy;
import org.gephi.graph.api.Column;
import org.gephi.graph.api.Element;
import org.openide.util.ImageUtilities;
import org.openide.util.NbBundle;
......
modules/DataLaboratoryPlugin/src/main/java/org/gephi/datalab/plugin/manipulators/rows/merge/KeepSelectedRowValue.java
浏览文件 @ 1fba8c1a
......@@ -42,9 +42,9 @@ Portions Copyrighted 2011 Gephi Consortium.
package org.gephi.datalab.plugin.manipulators.rows.merge;
import javax.swing.Icon;
import org.gephi.graph.api.Column;
import org.gephi.datalab.spi.ManipulatorUI;
import org.gephi.datalab.spi.rows.merge.AttributeRowsMergeStrategy;
import org.gephi.graph.api.Column;
import org.gephi.graph.api.Element;
import org.openide.util.ImageUtilities;
import org.openide.util.NbBundle;
......
modules/DataLaboratoryPlugin/src/main/java/org/gephi/datalab/plugin/manipulators/rows/merge/MaximumNumber.java
浏览文件 @ 1fba8c1a
......@@ -43,11 +43,11 @@ package org.gephi.datalab.plugin.manipulators.rows.merge;
import java.math.BigDecimal;
import javax.swing.Icon;
import org.gephi.graph.api.AttributeUtils;
import org.gephi.graph.api.Column;
import org.gephi.datalab.api.AttributeColumnsController;
import org.gephi.datalab.spi.ManipulatorUI;
import org.gephi.datalab.spi.rows.merge.AttributeRowsMergeStrategy;
import org.gephi.graph.api.AttributeUtils;
import org.gephi.graph.api.Column;
import org.gephi.graph.api.Element;
import org.gephi.utils.StatisticsUtils;
import org.openide.util.ImageUtilities;
......
modules/DataLaboratoryPlugin/src/main/java/org/gephi/datalab/plugin/manipulators/rows/merge/MedianNumber.java
浏览文件 @ 1fba8c1a
......@@ -43,11 +43,11 @@ package org.gephi.datalab.plugin.manipulators.rows.merge;
import java.math.BigDecimal;
import javax.swing.Icon;
import org.gephi.graph.api.Column;
import org.gephi.datalab.api.AttributeColumnsController;
import org.gephi.datalab.spi.ManipulatorUI;
import org.gephi.datalab.spi.rows.merge.AttributeRowsMergeStrategy;
import org.gephi.graph.api.AttributeUtils;
import org.gephi.graph.api.Column;
import org.gephi.graph.api.Element;
import org.gephi.utils.StatisticsUtils;
import org.openide.util.ImageUtilities;
......
modules/DataLaboratoryPlugin/src/main/java/org/gephi/datalab/plugin/manipulators/rows/merge/MinimumNumber.java
浏览文件 @ 1fba8c1a
......@@ -43,11 +43,11 @@ package org.gephi.datalab.plugin.manipulators.rows.merge;
import java.math.BigDecimal;
import javax.swing.Icon;
import org.gephi.graph.api.AttributeUtils;
import org.gephi.graph.api.Column;
import org.gephi.datalab.api.AttributeColumnsController;
import org.gephi.datalab.spi.ManipulatorUI;
import org.gephi.datalab.spi.rows.merge.AttributeRowsMergeStrategy;
import org.gephi.graph.api.AttributeUtils;
import org.gephi.graph.api.Column;
import org.gephi.graph.api.Element;
import org.gephi.utils.StatisticsUtils;
import org.openide.util.ImageUtilities;
......
modules/DataLaboratoryPlugin/src/main/java/org/gephi/datalab/plugin/manipulators/rows/merge/SetNull.java
浏览文件 @ 1fba8c1a
......@@ -42,9 +42,9 @@ Portions Copyrighted 2011 Gephi Consortium.
package org.gephi.datalab.plugin.manipulators.rows.merge;
import javax.swing.Icon;
import org.gephi.graph.api.Column;
import org.gephi.datalab.spi.ManipulatorUI;
import org.gephi.datalab.spi.rows.merge.AttributeRowsMergeStrategy;
import org.gephi.graph.api.Column;
import org.gephi.graph.api.Element;
import org.openide.util.ImageUtilities;
import org.openide.util.NbBundle;
......
modules/DataLaboratoryPlugin/src/main/java/org/gephi/datalab/plugin/manipulators/rows/merge/SumNumbers.java
浏览文件 @ 1fba8c1a
......@@ -43,11 +43,11 @@ package org.gephi.datalab.plugin.manipulators.rows.merge;
import java.math.BigDecimal;
import javax.swing.Icon;
import org.gephi.graph.api.Column;
import org.gephi.datalab.api.AttributeColumnsController;
import org.gephi.datalab.spi.ManipulatorUI;
import org.gephi.datalab.spi.rows.merge.AttributeRowsMergeStrategy;
import org.gephi.graph.api.AttributeUtils;
import org.gephi.graph.api.Column;
import org.gephi.graph.api.Element;
import org.gephi.utils.StatisticsUtils;
import org.openide.util.ImageUtilities;
......
modules/DataLaboratoryPlugin/src/main/java/org/gephi/datalab/plugin/manipulators/rows/merge/ThirdQuartileNumber.java
浏览文件 @ 1fba8c1a
......@@ -43,11 +43,11 @@ package org.gephi.datalab.plugin.manipulators.rows.merge;
import java.math.BigDecimal;
import javax.swing.Icon;
import org.gephi.graph.api.AttributeUtils;
import org.gephi.graph.api.Column;
import org.gephi.datalab.api.AttributeColumnsController;
import org.gephi.datalab.spi.ManipulatorUI;
import org.gephi.datalab.spi.rows.merge.AttributeRowsMergeStrategy;
import org.gephi.graph.api.AttributeUtils;
import org.gephi.graph.api.Column;
import org.gephi.graph.api.Element;
import org.gephi.utils.StatisticsUtils;
import org.openide.util.Lookup;
......
modules/DataLaboratoryPlugin/src/main/java/org/gephi/datalab/plugin/manipulators/ui/GeneralChooseColumnsAndRowUI.java
浏览文件 @ 1fba8c1a
......@@ -45,11 +45,11 @@ import java.util.ArrayList;
import javax.swing.JCheckBox;
import javax.swing.JPanel;
import net.miginfocom.swing.MigLayout;
import org.gephi.graph.api.Column;
import org.gephi.datalab.plugin.manipulators.GeneralColumnsAndRowChooser;
import org.gephi.datalab.spi.DialogControls;
import org.gephi.datalab.spi.Manipulator;
import org.gephi.datalab.spi.ManipulatorUI;
import org.gephi.graph.api.Column;
import org.gephi.graph.api.Edge;
import org.gephi.graph.api.Element;
import org.gephi.graph.api.Node;
......@@ -100,7 +100,7 @@ public class GeneralChooseColumnsAndRowUI extends javax.swing.JPanel implements
}
public Column[] getChosenColumns() {
ArrayList<Column> columnsToClearDataList = new ArrayList<Column>();
ArrayList<Column> columnsToClearDataList = new ArrayList<>();
for (ColumnCheckBox c : columnsCheckBoxes) {
if (c.isSelected()) {
columnsToClearDataList.add(c.getColumn());
......
modules/DataLaboratoryPlugin/src/main/java/org/gephi/datalab/plugin/manipulators/ui/GeneralChooseColumnsUI.java
浏览文件 @ 1fba8c1a
......@@ -45,11 +45,11 @@ import java.util.ArrayList;
import javax.swing.JCheckBox;
import javax.swing.JPanel;
import net.miginfocom.swing.MigLayout;
import org.gephi.graph.api.Column;
import org.gephi.datalab.plugin.manipulators.GeneralColumnsChooser;
import org.gephi.datalab.spi.DialogControls;
import org.gephi.datalab.spi.Manipulator;
import org.gephi.datalab.spi.ManipulatorUI;
import org.gephi.graph.api.Column;
/**
* UI for GeneralColumnsChooser (ClearNodesData and ClearEdgesData)
......@@ -93,7 +93,7 @@ public class GeneralChooseColumnsUI extends javax.swing.JPanel implements Manipu
}
public Column[] getChosenColumns(){
ArrayList<Column> columnsToClearDataList=new ArrayList<Column>();
ArrayList<Column> columnsToClearDataList=new ArrayList<>();
for(ColumnCheckBox c:columnsCheckBoxes){
if(c.isSelected()){
columnsToClearDataList.add(c.getColumn());
......
modules/DataLaboratoryPlugin/src/main/java/org/gephi/datalab/plugin/manipulators/ui/GeneralNumberListStatisticsReportUI.java
浏览文件 @ 1fba8c1a
......@@ -43,14 +43,14 @@ package org.gephi.datalab.plugin.manipulators.ui;
import java.math.BigDecimal;
import javax.swing.JPanel;
import org.gephi.graph.api.Column;
import org.gephi.graph.api.Table;
import org.gephi.datalab.spi.DialogControls;
import org.gephi.datalab.spi.Manipulator;
import org.gephi.datalab.spi.ManipulatorUI;
import org.gephi.datalab.spi.columns.AttributeColumnsManipulator;
import org.gephi.datalab.spi.columns.AttributeColumnsManipulatorUI;
import org.gephi.graph.api.Column;
import org.gephi.graph.api.GraphModel;
import org.gephi.graph.api.Table;
import org.gephi.ui.components.JFreeChartDialog;
import org.gephi.ui.components.SimpleHTMLReport;
import org.gephi.ui.utils.ChartsUtils;
......
modules/DataLaboratoryPlugin/src/main/java/org/gephi/datalab/plugin/manipulators/values/ClearAttributeValue.java
浏览文件 @ 1fba8c1a
......@@ -42,10 +42,10 @@
package org.gephi.datalab.plugin.manipulators.values;
import javax.swing.Icon;
import org.gephi.graph.api.Column;
import org.gephi.datalab.api.AttributeColumnsController;
import org.gephi.datalab.spi.ManipulatorUI;
import org.gephi.datalab.spi.values.AttributeValueManipulator;
import org.gephi.graph.api.Column;
import org.gephi.graph.api.Element;
import org.openide.util.ImageUtilities;
import org.openide.util.Lookup;
......
modules/DataLaboratoryPlugin/src/main/java/org/gephi/datalab/plugin/manipulators/values/NumberListStatisticsReport.java
浏览文件 @ 1fba8c1a
......@@ -42,12 +42,12 @@ Portions Copyrighted 2011 Gephi Consortium.
package org.gephi.datalab.plugin.manipulators.values;
import javax.swing.Icon;
import org.gephi.graph.api.AttributeUtils;
import org.gephi.graph.api.Column;
import org.gephi.datalab.api.AttributeColumnsController;
import org.gephi.datalab.plugin.manipulators.ui.GeneralNumberListStatisticsReportUI;
import org.gephi.datalab.spi.ManipulatorUI;
import org.gephi.datalab.spi.values.AttributeValueManipulator;
import org.gephi.graph.api.AttributeUtils;
import org.gephi.graph.api.Column;
import org.gephi.graph.api.Element;
import org.openide.util.ImageUtilities;
import org.openide.util.Lookup;
......
modules/DesktopAppearance/src/main/java/org/gephi/desktop/appearance/AppearanceToolbar.java
浏览文件 @ 1fba8c1a
......@@ -234,7 +234,7 @@ public class AppearanceToolbar implements AppearanceUIModelListener {
private class CategoryToolbar extends AbstractToolbar {
private final List<ButtonGroup> buttonGroups = new ArrayList<ButtonGroup>();
private final List<ButtonGroup> buttonGroups = new ArrayList<>();
public CategoryToolbar() {
//Init components
......@@ -352,7 +352,7 @@ public class AppearanceToolbar implements AppearanceUIModelListener {
private class TransformerToolbar extends AbstractToolbar {
private final List<ButtonGroup> buttonGroups = new ArrayList<ButtonGroup>();
private final List<ButtonGroup> buttonGroups = new ArrayList<>();
public TransformerToolbar() {
}
......@@ -376,7 +376,7 @@ public class AppearanceToolbar implements AppearanceUIModelListener {
for (TransformerCategory c : controller.getCategories(elmtType)) {
ButtonGroup buttonGroup = new ButtonGroup();
Map<String, TransformerUI> titles = new LinkedHashMap<String, TransformerUI>();
Map<String, TransformerUI> titles = new LinkedHashMap<>();
for (TransformerUI t : controller.getTransformerUIs(elmtType, c)) {
titles.put(t.getDisplayName(), t);
}
......@@ -440,9 +440,9 @@ public class AppearanceToolbar implements AppearanceUIModelListener {
private transient final Set<AbstractButton> controlButtons;
public ControlToolbar() {
rankingSouthControls = new HashSet<AbstractButton>();
partitionSouthControls = new HashSet<AbstractButton>();
controlButtons = new HashSet<AbstractButton>();
rankingSouthControls = new HashSet<>();
partitionSouthControls = new HashSet<>();
controlButtons = new HashSet<>();
}
public void addRankingButton(AbstractButton btn) {
......
modules/DesktopAppearance/src/main/java/org/gephi/desktop/appearance/AppearanceTopComponent.java
浏览文件 @ 1fba8c1a
......@@ -247,7 +247,7 @@ public class AppearanceTopComponent extends TopComponent implements Lookup.Provi
comboBoxModel.addElement(NO_SELECTION);
comboBoxModel.setSelectedItem(NO_SELECTION);
List<Function> rows = new ArrayList<Function>();
List<Function> rows = new ArrayList<>();
rows.addAll(model.getFunctions());
Collections.sort(rows, new Comparator<Function>() {
......
modules/DesktopAppearance/src/main/java/org/gephi/desktop/appearance/AppearanceUIController.java
浏览文件 @ 1fba8c1a
......@@ -163,13 +163,13 @@ public class AppearanceUIController {
listeners = Collections.synchronizedSet(new HashSet<AppearanceUIModelListener>());
transformers = new HashMap<String, Map<TransformerCategory, Set<TransformerUI>>>();
transformers = new HashMap<>();
for (String ec : ELEMENT_CLASSES) {
transformers.put(ec, new LinkedHashMap<TransformerCategory, Set<TransformerUI>>());
}
//Register transformers
Map<Class, Transformer> tMap = new HashMap<Class, Transformer>();
Map<Class, Transformer> tMap = new HashMap<>();
for (Transformer t : Lookup.getDefault().lookupAll(Transformer.class)) {
tMap.put(t.getClass(), t);
}
......@@ -180,7 +180,7 @@ public class AppearanceUIController {
if (t.isNode()) {
Set<TransformerUI> uis = transformers.get(NODE_ELEMENT).get(c);
if (uis == null) {
uis = new LinkedHashSet<TransformerUI>();
uis = new LinkedHashSet<>();
transformers.get(NODE_ELEMENT).put(c, uis);
}
uis.add(ui);
......@@ -188,7 +188,7 @@ public class AppearanceUIController {
if (t.isEdge()) {
Set<TransformerUI> uis = transformers.get(EDGE_ELEMENT).get(c);
if (uis == null) {
uis = new LinkedHashSet<TransformerUI>();
uis = new LinkedHashSet<>();
transformers.get(EDGE_ELEMENT).put(c, uis);
}
uis.add(ui);
......
modules/DesktopAppearance/src/main/java/org/gephi/desktop/appearance/AppearanceUIModel.java
浏览文件 @ 1fba8c1a
......@@ -88,11 +88,11 @@ public class AppearanceUIModel {
this.graphController = Lookup.getDefault().lookup(GraphController.class);
//Init maps
selectedCategory = new HashMap<String, TransformerCategory>();
selectedTransformerUI = new HashMap<String, Map<TransformerCategory, TransformerUI>>();
selectedFunction = new HashMap<String, Map<TransformerUI, Function>>();
selectedAutoTransformer = new HashMap<String, Map<TransformerCategory, AutoAppyTransformer>>();
savedProperties = new HashMap<Function, Map<String, Object>>();
selectedCategory = new HashMap<>();
selectedTransformerUI = new HashMap<>();
selectedFunction = new HashMap<>();
selectedAutoTransformer = new HashMap<>();
savedProperties = new HashMap<>();
//Init selected
for (String ec : ELEMENT_CLASSES) {
......@@ -103,7 +103,7 @@ public class AppearanceUIModel {
private void initSelectedTransformerUIs(String elementClass) {
Graph graph = graphController.getGraphModel(appearanceModel.getWorkspace()).getGraph();
Map<TransformerCategory, TransformerUI> newMap = new HashMap<TransformerCategory, TransformerUI>();
Map<TransformerCategory, TransformerUI> newMap = new HashMap<>();
for (Function func : elementClass.equals(AppearanceUIController.NODE_ELEMENT) ? appearanceModel.getNodeFunctions(graph) : appearanceModel.getEdgeFunctions(graph)) {
TransformerUI ui = func.getUI();
if (ui != null) {
......@@ -129,7 +129,7 @@ public class AppearanceUIModel {
}
private void refreshSelectedFunctions(String elementClass) {
Set<Function> functionSet = new HashSet<Function>();
Set<Function> functionSet = new HashSet<>();
Graph graph = graphController.getGraphModel(appearanceModel.getWorkspace()).getGraph();
for (Function func : elementClass.equals(AppearanceUIController.NODE_ELEMENT) ? appearanceModel.getNodeFunctions(graph) : appearanceModel.getEdgeFunctions(graph)) {
TransformerUI ui = func.getUI();
......@@ -195,7 +195,7 @@ public class AppearanceUIModel {
Transformer transformer = func.getTransformer();
Map<String, Object> props = savedProperties.get(func);
if (props == null) {
props = new HashMap<String, Object>();
props = new HashMap<>();
savedProperties.put(func, new HashMap<String, Object>());
}
......@@ -259,7 +259,7 @@ public class AppearanceUIModel {
public Collection<Function> getFunctions() {
Graph graph = graphController.getGraphModel(appearanceModel.getWorkspace()).getGraph();
List<Function> functions = new ArrayList<Function>();
List<Function> functions = new ArrayList<>();
for (Function func : selectedElementClass.equalsIgnoreCase(AppearanceUIController.NODE_ELEMENT) ? appearanceModel.getNodeFunctions(graph) : appearanceModel.getEdgeFunctions(graph)) {
TransformerUI ui = func.getUI();
if (ui != null && ui.getDisplayName().equals(getSelectedTransformerUI().getDisplayName())) {
......@@ -320,7 +320,7 @@ public class AppearanceUIModel {
}
private Map<String, Method[]> getProperties(Transformer transformer) {
Map<String, Method[]> propertyMethods = new HashMap<String, Method[]>();
Map<String, Method[]> propertyMethods = new HashMap<>();
for (Method m : transformer.getClass().getMethods()) {
String name = m.getName();
......
modules/DesktopBanner/src/main/java/org/gephi/desktop/banner/BannerRootPanelLayout.java
浏览文件 @ 1fba8c1a
......@@ -41,7 +41,6 @@
*/
package org.gephi.desktop.banner;
import java.awt.Color;
import java.awt.Component;
import java.awt.Container;
import java.awt.Dimension;
......
modules/DesktopBanner/src/main/java/org/gephi/desktop/banner/Installer.java
浏览文件 @ 1fba8c1a
......@@ -48,7 +48,6 @@ import javax.swing.*;
import org.gephi.desktop.banner.perspective.spi.BottomComponent;
import org.gephi.perspective.api.PerspectiveController;
import org.openide.modules.ModuleInstall;
import org.openide.util.Exceptions;
import org.openide.util.Lookup;
import org.openide.windows.WindowManager;
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或