Skip to content

Commit 2617210

Browse files
committed
Turns out some 1.7-specific classes got in, this version of the project should be 1.6-compatible.
1 parent c2b2083 commit 2617210

14 files changed

Lines changed: 41 additions & 28 deletions

File tree

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Java Source Metrics
1+
Java Source Metrics [![Build Status](https://travis-ci.org/Kiskae/Java-Source-Metrics.svg?branch=master)](https://travis-ci.org/Kiskae/Java-Source-Metrics)
22
===================
33

44
An application to calculate metrics from java bytecode.

src/main/java/nl/rug/jbi/jsm/core/pipeline/Pipeline.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,9 @@ private ProducerMetric loadProducer(final Class<? extends ProducerMetric> produc
238238
);
239239
} catch (NoSuchMethodException e) {
240240
throw new MetricPreparationException("Producers require a zero-argument constructor.");
241-
} catch (ReflectiveOperationException e) {
241+
} catch (InstantiationException e) {
242+
throw new MetricPreparationException("Exception in producer creation through reflection", e);
243+
} catch (IllegalAccessException e) {
242244
throw new MetricPreparationException("Exception in producer creation through reflection", e);
243245
}
244246
}

src/main/java/nl/rug/jbi/jsm/frontend/GUIFrontend.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,14 @@ public JSMCore getCore() {
4949
public void init() {
5050
try {
5151
UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
52-
} catch (final ReflectiveOperationException e) {
53-
logger.warn("Exception setting Swing L&F", e);
5452
} catch (final UnsupportedLookAndFeelException ignored) {
5553
/* Will just default to the cross-platform L&F */
54+
} catch (ClassNotFoundException e) {
55+
logger.warn("Exception setting Swing L&F", e);
56+
} catch (InstantiationException e) {
57+
logger.warn("Exception setting Swing L&F", e);
58+
} catch (IllegalAccessException e) {
59+
logger.warn("Exception setting Swing L&F", e);
5660
}
5761

5862
SwingUtilities.invokeLater(new Runnable() {

src/main/java/nl/rug/jbi/jsm/frontend/ui/element/SelectableList.java

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,20 @@
11
package nl.rug.jbi.jsm.frontend.ui.element;
22

3+
import com.google.common.base.Function;
4+
import com.google.common.collect.FluentIterable;
5+
36
import javax.swing.*;
47
import java.util.Collections;
58
import java.util.List;
69

7-
public class SelectableList extends JList<String> {
8-
private final DefaultListModel<String> items;
10+
public class SelectableList extends JList {
11+
private final DefaultListModel items;
912

1013
public SelectableList() {
11-
this(new DefaultListModel<String>());
14+
this(new DefaultListModel());
1215
}
1316

14-
private SelectableList(final DefaultListModel<String> items) {
17+
private SelectableList(final DefaultListModel items) {
1518
super(items);
1619
this.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
1720
this.setLayoutOrientation(JList.VERTICAL);
@@ -21,7 +24,14 @@ private SelectableList(final DefaultListModel<String> items) {
2124
}
2225

2326
public List<String> getOptions() {
24-
return Collections.list(this.items.elements());
27+
return FluentIterable.from(Collections.list(this.items.elements()))
28+
.transform(new Function<Object, String>() {
29+
@Override
30+
public String apply(Object o) {
31+
return o != null ? o.toString() : null;
32+
}
33+
})
34+
.toList();
2535
}
2636

2737
public void addOption(final String item) {

src/main/java/nl/rug/jbi/jsm/metrics/packagemetrics/IIPED.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public List<MetricResult> getResults(final Map<String, MetricState> states, fina
6464

6565
for (final Map.Entry<String, MetricState> entry : states.entrySet()) {
6666
final String collectionName = entry.getValue().getValue("Collection");
67-
final double result = entry.getValue().getValue("IIPED-p");
67+
final double result = entry.getValue().<Number>getValue("IIPED-p").doubleValue();
6868

6969
results.add(MetricResult.getResult(
7070
entry.getKey(),

src/main/java/nl/rug/jbi/jsm/metrics/packagemetrics/IIPUD.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public List<MetricResult> getResults(final Map<String, MetricState> states, fina
6464

6565
for (final Map.Entry<String, MetricState> entry : states.entrySet()) {
6666
final String collectionName = entry.getValue().getValue("Collection");
67-
final double result = entry.getValue().getValue("IIPUD-p");
67+
final double result = entry.getValue().<Number>getValue("IIPUD-p").doubleValue();
6868

6969
results.add(MetricResult.getResult(
7070
entry.getKey(),

src/main/java/nl/rug/jbi/jsm/metrics/packagemetrics/IPSC.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ public List<MetricResult> getResults(final Map<String, MetricState> states, fina
8686

8787
for (final Map.Entry<String, MetricState> entry : states.entrySet()) {
8888
final String collectionName = entry.getValue().getValue("Collection");
89-
final double result = entry.getValue().getValue("IPSC-p");
89+
final double result = entry.getValue().<Number>getValue("IPSC-p").doubleValue();
9090

9191
results.add(MetricResult.getResult(
9292
entry.getKey(),

src/main/java/nl/rug/jbi/jsm/metrics/packagemetrics/PF.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ public List<MetricResult> getResults(final Map<String, MetricState> states, fina
7676

7777
for (final Map.Entry<String, MetricState> entry : states.entrySet()) {
7878
final String collectionName = entry.getValue().getValue("Collection");
79-
final double result = entry.getValue().getValue("PF-p");
79+
final double result = entry.getValue().<Number>getValue("PF-p").doubleValue();
8080

8181
results.add(MetricResult.getResult(
8282
entry.getKey(),

src/main/java/nl/rug/jbi/jsm/util/ResultsExporter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ private static String printObject(final Object o, final NumberFormat nf) {
6969
if (o instanceof Number) {
7070
return nf.format(((Number) o).doubleValue());
7171
} else {
72-
return java.util.Objects.toString(o);
72+
return o != null ? o.toString() : "null";
7373
}
7474
}
7575

src/test/java/nl/rug/jbi/jsm/metrics/ckjm/CBOTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ public void testRefFieldAccess() throws ExecutionException {
109109
//Referenced Types:
110110
//Accessed Type: [nl.rug.jbi.jsm.metrics.ckjm.cbo.RefTypes]
111111
//Field Type: [nl.rug.jbi.jsm.metrics.ckjm.cbo.RefTypes.Map]
112-
//java.util.Objects access is ignored!
112+
//java.lang.String access is ignored!
113113
assertEquals(2.0, result, 0.001);
114114
}
115115

@@ -233,6 +233,7 @@ public void testRefAll() throws ExecutionException {
233233
//Implements: nl.rug.jbi.jsm.metrics.ckjm.cbo.RefTypes.FakeInterface
234234
//INSTANCEOF: nl.rug.jbi.jsm.metrics.ckjm.cbo.RefTypes.List
235235
//CAST: nl.rug.jbi.jsm.metrics.ckjm.cbo.RefTypes.FakeInterface
236+
//java.lang.String access is ignored!
236237

237238
//Basically all types created by nl.rug.jbi.jsm.metrics.ckjm.cbo.RefTypes
238239
assertEquals(5.0, result, 0.001);

0 commit comments

Comments
 (0)