Skip to content

Commit 26039b4

Browse files
mbastianmbastian
committed
Merge branch '0.9.1' of github.com:gephi/gephi into 0.9.1
2 parents 016c8c0 + c22f74b commit 26039b4

File tree

4 files changed

+28
-39
lines changed

4 files changed

+28
-39
lines changed

‎modules/ExportPlugin/src/main/java/org/gephi/io/exporter/plugin/ExporterGraphML.java‎

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -207,13 +207,6 @@ private void createKeys(Document document, Element root, GraphModel graphModel)
207207
weightKeyE.setAttribute("for", "edge");
208208
root.appendChild(weightKeyE);
209209

210-
Element edgeIdKeyE = document.createElement("key");
211-
edgeIdKeyE.setAttribute("id", "edgeid");
212-
edgeIdKeyE.setAttribute("attr.name", "Edge Id");
213-
edgeIdKeyE.setAttribute("attr.type", "string");
214-
edgeIdKeyE.setAttribute("for", "edge");
215-
root.appendChild(edgeIdKeyE);
216-
217210
if (exportColors) {
218211
Element colorRKeyE = document.createElement("key");
219212
colorRKeyE.setAttribute("id", "r");
@@ -438,12 +431,10 @@ private void createEdges(Document document, Element edgesE, Graph graph) throws
438431
private Element createEdge(Document document, Edge e, Graph graph) throws Exception {
439432
Element edgeE = document.createElement("edge");
440433

434+
edgeE.setAttribute("id", e.getId().toString());
441435
edgeE.setAttribute("source", e.getSource().getId().toString());
442436
edgeE.setAttribute("target", e.getTarget().getId().toString());
443437

444-
Element idE = createEdgeId(document, e);
445-
edgeE.appendChild(idE);
446-
447438
//Label
448439
if (e.getLabel() != null && !e.getLabel().isEmpty()) {
449440
Element labelE = createEdgeLabel(document, e);
@@ -556,14 +547,6 @@ private Element createNodeLabel(Document document, Node n) throws Exception {
556547
return labelE;
557548
}
558549

559-
private Element createEdgeId(Document document, Edge e) throws Exception {
560-
Element idE = document.createElement("data");
561-
idE.setAttribute("key", "edgeid");
562-
idE.setTextContent(e.getId().toString());
563-
564-
return idE;
565-
}
566-
567550
private Element createEdgeWeight(Document document, Edge e, Graph graph) throws Exception {
568551
Element weightE = document.createElement("data");
569552
weightE.setAttribute("key", "weight");

‎modules/ExportPlugin/src/main/nbm/manifest.mf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Manifest-Version: 1.0
22
AutoUpdate-Essential-Module: true
33
OpenIDE-Module-Localizing-Bundle: org/gephi/io/exporter/plugin/Bundle.properties
4-
OpenIDE-Module-Specification-Version: ${gephi.modules.specification.version}
4+
OpenIDE-Module-Specification-Version: 0.9.1.1
55
OpenIDE-Module-Display-Category: Plugin
6-
OpenIDE-Module-Name: Export Plugin
6+
OpenIDE-Module-Name: Export Plugin

‎modules/ImportPlugin/src/main/java/org/gephi/io/importer/plugin/file/ImporterGML.java‎

Lines changed: 24 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -132,11 +132,17 @@ private ArrayList<Object> parseList(LineNumberReader reader) throws IOException
132132
case '\t':
133133
case '\n':
134134
if (!stringBuffer.isEmpty()) {
135+
//First try to parse as long, if not possible, try double.
135136
try {
136-
Double doubleValue = Double.valueOf(stringBuffer);
137-
list.add(doubleValue);
138-
} catch (NumberFormatException e) {
139-
list.add(stringBuffer);
137+
Long longValue = Long.valueOf(stringBuffer);
138+
list.add(longValue);
139+
} catch (NumberFormatException e1) {
140+
try {
141+
Double doubleValue = Double.valueOf(stringBuffer);
142+
list.add(doubleValue);
143+
} catch (NumberFormatException e2) {
144+
list.add(stringBuffer);
145+
}
140146
}
141147
stringBuffer = new String();
142148
}
@@ -165,8 +171,8 @@ private boolean parseGraph(ArrayList list) {
165171
} else if ("edge".equals(key)) {
166172
ret = parseEdge((ArrayList) value);
167173
} else if ("directed".equals(key)) {
168-
if (value instanceof Double) {
169-
EdgeDirectionDefault edgeDefault = ((Double) value) == 1.0 ? EdgeDirectionDefault.DIRECTED : EdgeDirectionDefault.UNDIRECTED;
174+
if (value instanceof Number) {
175+
EdgeDirectionDefault edgeDefault = ((Number) value).intValue() == 1 ? EdgeDirectionDefault.DIRECTED : EdgeDirectionDefault.UNDIRECTED;
170176
container.setEdgeDefault(edgeDefault);
171177
} else {
172178
report.logIssue(new Issue(NbBundle.getMessage(ImporterGML.class, "importerGML_error_directedgraphparse"), Issue.Level.WARNING));
@@ -227,14 +233,14 @@ private boolean addNodeAttributes(NodeDraft node, String prefix, ArrayList list)
227233
if (!ret) {
228234
break;
229235
}
230-
} else if ("x".equalsIgnoreCase(key) && value instanceof Double) {
231-
node.setX(((Double) value).floatValue());
232-
} else if ("y".equalsIgnoreCase(key) && value instanceof Double) {
233-
node.setY(((Double) value).floatValue());
234-
} else if ("z".equalsIgnoreCase(key) && value instanceof Double) {
235-
node.setZ(((Double) value).floatValue());
236-
} else if ("w".equalsIgnoreCase(key) && value instanceof Double) {
237-
node.setSize(((Double) value).floatValue());
236+
} else if ("x".equalsIgnoreCase(key) && value instanceof Number) {
237+
node.setX(((Number) value).floatValue());
238+
} else if ("y".equalsIgnoreCase(key) && value instanceof Number) {
239+
node.setY(((Number) value).floatValue());
240+
} else if ("z".equalsIgnoreCase(key) && value instanceof Number) {
241+
node.setZ(((Number) value).floatValue());
242+
} else if ("w".equalsIgnoreCase(key) && value instanceof Number) {
243+
node.setSize(((Number) value).floatValue());
238244
} else if ("h".equalsIgnoreCase(key)) {
239245
} else if ("d".equalsIgnoreCase(key)) {
240246
} else if ("fill".equalsIgnoreCase(key)) {
@@ -276,8 +282,8 @@ private boolean parseEdge(ArrayList list) {
276282
NodeDraft target = container.getNode(value.toString());
277283
edgeDraft.setTarget(target);
278284
} else if ("value".equals(key) || "weight".equals(key)) {
279-
if (value instanceof Double) {
280-
edgeDraft.setWeight(((Double) value));
285+
if (value instanceof Number) {
286+
edgeDraft.setWeight(((Number) value).doubleValue());
281287
}
282288
} else if ("label".equals(key)) {
283289
edgeDraft.setLabel(value.toString());
@@ -303,8 +309,8 @@ private boolean addEdgeAttributes(EdgeDraft edge, String prefix, ArrayList list)
303309
break;
304310
}
305311
} else if ("directed".equalsIgnoreCase(key)) {
306-
if (value instanceof Double) {
307-
EdgeDirection type = ((Double) value) == 1 ? EdgeDirection.DIRECTED : EdgeDirection.UNDIRECTED;
312+
if (value instanceof Number) {
313+
EdgeDirection type = ((Number) value).intValue() == 1 ? EdgeDirection.DIRECTED : EdgeDirection.UNDIRECTED;
308314
edge.setDirection(type);
309315
} else {
310316
report.logIssue(new Issue(NbBundle.getMessage(ImporterGML.class, "importerGML_error_directedparse", edge.toString()), Issue.Level.WARNING));

‎modules/ImportPlugin/src/main/nbm/manifest.mf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Manifest-Version: 1.0
22
AutoUpdate-Essential-Module: true
33
OpenIDE-Module-Localizing-Bundle: org/gephi/io/importer/plugin/Bundle.properties
4-
OpenIDE-Module-Specification-Version: ${gephi.modules.specification.version}
4+
OpenIDE-Module-Specification-Version: 0.9.1.2
55
OpenIDE-Module-Display-Category: Plugin
66
OpenIDE-Module-Name: Import Plugin

0 commit comments

Comments
 (0)