Skip to content
Snippets Groups Projects
Commit 9aa7a6f5 authored by Nils Christian Ehmke's avatar Nils Christian Ehmke
Browse files

FB issue

parent f5e224c8
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 46 additions and 46 deletions
src/main/java/kieker/diagnosis/mainview/dialog/SettingsDialog.java
+ 2
− 2
View file @ 9aa7a6f5
......@@ -103,7 +103,7 @@ public final class SettingsDialog extends Dialog {
private void loadSettings() {
this.textGraphvizPath.setText(this.model.getGraphvizPath());
this.comboBoxGraphvizGenerator.select(this.model.getGraphvizGenerator() == GraphvizGenerator.DOT ? 0 : 1);
this.comboBoxTimeUnit.select(this.timeUnitMapper.resolve(this.model.getTimeunit()));
this.comboBoxTimeUnit.select(this.timeUnitMapper.resolve(this.model.getTimeUnit()));
this.comboBoxOperationNames.select(this.model.getOperationNames() == OperationNames.SHORT ? 0 : 1);
this.comboBoxComponentNames.select(this.model.getComponentNames() == ComponentNames.SHORT ? 0 : 1);
}
......@@ -113,7 +113,7 @@ public final class SettingsDialog extends Dialog {
this.model.setGraphvizPath(this.textGraphvizPath.getText());
this.model.setGraphvizGenerator(this.comboBoxGraphvizGenerator.getSelectionIndex() == 0 ? GraphvizGenerator.DOT : GraphvizGenerator.NEATO);
this.model.setTimeunit(this.timeUnitMapper.invertedResolve(this.comboBoxTimeUnit.getSelectionIndex()));
this.model.setTimeUnit(this.timeUnitMapper.invertedResolve(this.comboBoxTimeUnit.getSelectionIndex()));
this.model.setOperationNames(this.comboBoxOperationNames.getSelectionIndex() == 0 ? OperationNames.SHORT : OperationNames.LONG);
this.model.setComponentNames(this.comboBoxComponentNames.getSelectionIndex() == 0 ? ComponentNames.SHORT : ComponentNames.LONG);
......
src/main/java/kieker/diagnosis/model/PropertiesModel.java
+ 7
− 7
View file @ 9aa7a6f5
......@@ -36,7 +36,7 @@ public final class PropertiesModel extends Observable {
private String graphvizPath;
private GraphvizGenerator graphvizGenerator;
private TimeUnit timeunit;
private TimeUnit timeUnit;
private ComponentNames componentNames;
private OperationNames operationNames;
......@@ -49,7 +49,7 @@ public final class PropertiesModel extends Observable {
this.graphvizPath = preferences.get(PropertiesModel.KEY_GRAPHVIZ_PATH, ".");
this.graphvizGenerator = GraphvizGenerator.valueOf(preferences.get(PropertiesModel.KEY_GRAPHVIZ_GENERATOR, GraphvizGenerator.DOT.name()));
this.timeunit = TimeUnit.valueOf(preferences.get(PropertiesModel.KEY_TIMEUNIT, TimeUnit.NANOSECONDS.name()));
this.timeUnit = TimeUnit.valueOf(preferences.get(PropertiesModel.KEY_TIMEUNIT, TimeUnit.NANOSECONDS.name()));
this.componentNames = ComponentNames.valueOf(preferences.get(PropertiesModel.KEY_COMPONENTS, ComponentNames.LONG.name()));
this.operationNames = OperationNames.valueOf(preferences.get(PropertiesModel.KEY_OPERATIONS, OperationNames.SHORT.name()));
}
......@@ -59,7 +59,7 @@ public final class PropertiesModel extends Observable {
preferences.put(PropertiesModel.KEY_GRAPHVIZ_PATH, this.graphvizPath);
preferences.put(PropertiesModel.KEY_GRAPHVIZ_GENERATOR, this.graphvizGenerator.name());
preferences.put(PropertiesModel.KEY_TIMEUNIT, this.timeunit.name());
preferences.put(PropertiesModel.KEY_TIMEUNIT, this.timeUnit.name());
preferences.put(PropertiesModel.KEY_COMPONENTS, this.componentNames.name());
preferences.put(PropertiesModel.KEY_OPERATIONS, this.operationNames.name());
......@@ -90,12 +90,12 @@ public final class PropertiesModel extends Observable {
this.notifyObserversAndSaveSettings();
}
public TimeUnit getTimeunit() {
return this.timeunit;
public TimeUnit getTimeUnit() {
return this.timeUnit;
}
public void setTimeunit(final TimeUnit timeunit) {
this.timeunit = timeunit;
public void setTimeUnit(final TimeUnit timeUnit) {
this.timeUnit = timeUnit;
this.notifyObserversAndSaveSettings();
}
......
src/main/java/kieker/diagnosis/subview/aggregatedcalls/View.java
+ 12
− 12
View file @ 9aa7a6f5
......@@ -295,13 +295,13 @@ public final class View implements ISubView, Observer {
private void updateDetailComposite() {
final AggregatedOperationCall call = this.model.getCurrentActiveCall();
final String shortTimeUnit = NameConverter.toShortTimeUnit(this.propertiesModel.getTimeunit());
final String shortTimeUnit = NameConverter.toShortTimeUnit(this.propertiesModel.getTimeUnit());
final String minDuration = this.propertiesModel.getTimeunit().convert(call.getMinDuration(), this.modelProxy.getSourceTimeUnit()) + " " + shortTimeUnit;
final String maxDuration = this.propertiesModel.getTimeunit().convert(call.getMaxDuration(), this.modelProxy.getSourceTimeUnit()) + " " + shortTimeUnit;
final String meanDuration = this.propertiesModel.getTimeunit().convert(call.getMedianDuration(), this.modelProxy.getSourceTimeUnit()) + " " + shortTimeUnit;
final String avgDuration = this.propertiesModel.getTimeunit().convert(call.getMeanDuration(), this.modelProxy.getSourceTimeUnit()) + " " + shortTimeUnit;
final String totalDuration = this.propertiesModel.getTimeunit().convert(call.getTotalDuration(), this.modelProxy.getSourceTimeUnit()) + " " + shortTimeUnit;
final String minDuration = this.propertiesModel.getTimeUnit().convert(call.getMinDuration(), this.modelProxy.getSourceTimeUnit()) + " " + shortTimeUnit;
final String maxDuration = this.propertiesModel.getTimeUnit().convert(call.getMaxDuration(), this.modelProxy.getSourceTimeUnit()) + " " + shortTimeUnit;
final String meanDuration = this.propertiesModel.getTimeUnit().convert(call.getMedianDuration(), this.modelProxy.getSourceTimeUnit()) + " " + shortTimeUnit;
final String avgDuration = this.propertiesModel.getTimeUnit().convert(call.getMeanDuration(), this.modelProxy.getSourceTimeUnit()) + " " + shortTimeUnit;
final String totalDuration = this.propertiesModel.getTimeUnit().convert(call.getTotalDuration(), this.modelProxy.getSourceTimeUnit()) + " " + shortTimeUnit;
this.lblMinimalDurationDisplay.setText(minDuration);
this.lblMaximalDurationDisplay.setText(maxDuration);
......@@ -351,13 +351,13 @@ public final class View implements ISubView, Observer {
operationString = NameConverter.toShortOperationName(operationString);
}
final String shortTimeUnit = NameConverter.toShortTimeUnit(View.this.propertiesModel.getTimeunit());
final String shortTimeUnit = NameConverter.toShortTimeUnit(View.this.propertiesModel.getTimeUnit());
final String minDuration = View.this.propertiesModel.getTimeunit().convert(call.getMinDuration(), View.this.modelProxy.getSourceTimeUnit()) + " " + shortTimeUnit;
final String maxDuration = View.this.propertiesModel.getTimeunit().convert(call.getMaxDuration(), View.this.modelProxy.getSourceTimeUnit()) + " " + shortTimeUnit;
final String meanDuration = View.this.propertiesModel.getTimeunit().convert(call.getMedianDuration(), View.this.modelProxy.getSourceTimeUnit()) + " " + shortTimeUnit;
final String avgDuration = View.this.propertiesModel.getTimeunit().convert(call.getMeanDuration(), View.this.modelProxy.getSourceTimeUnit()) + " " + shortTimeUnit;
final String totalDuration = View.this.propertiesModel.getTimeunit().convert(call.getTotalDuration(), View.this.modelProxy.getSourceTimeUnit()) + " " + shortTimeUnit;
final String minDuration = View.this.propertiesModel.getTimeUnit().convert(call.getMinDuration(), View.this.modelProxy.getSourceTimeUnit()) + " " + shortTimeUnit;
final String maxDuration = View.this.propertiesModel.getTimeUnit().convert(call.getMaxDuration(), View.this.modelProxy.getSourceTimeUnit()) + " " + shortTimeUnit;
final String meanDuration = View.this.propertiesModel.getTimeUnit().convert(call.getMedianDuration(), View.this.modelProxy.getSourceTimeUnit()) + " " + shortTimeUnit;
final String avgDuration = View.this.propertiesModel.getTimeUnit().convert(call.getMeanDuration(), View.this.modelProxy.getSourceTimeUnit()) + " " + shortTimeUnit;
final String totalDuration = View.this.propertiesModel.getTimeUnit().convert(call.getTotalDuration(), View.this.modelProxy.getSourceTimeUnit()) + " " + shortTimeUnit;
item.setText(new String[] { call.getContainer(), componentName, operationString, Long.toString(call.getCalls()), minDuration, avgDuration, meanDuration, maxDuration,
totalDuration });
......
src/main/java/kieker/diagnosis/subview/aggregatedtraces/View.java
+ 12
− 12
View file @ 9aa7a6f5
......@@ -315,13 +315,13 @@ public final class View implements Observer, ISubView {
private void updateDetailComposite() {
final AggregatedOperationCall call = this.aggregatedTracesSubViewModel.getCurrentActiveCall();
final String shortTimeUnit = NameConverter.toShortTimeUnit(this.propertiesModel.getTimeunit());
final String shortTimeUnit = NameConverter.toShortTimeUnit(this.propertiesModel.getTimeUnit());
final String minDuration = this.propertiesModel.getTimeunit().convert(call.getMinDuration(), this.modelProxy.getSourceTimeUnit()) + " " + shortTimeUnit;
final String maxDuration = this.propertiesModel.getTimeunit().convert(call.getMaxDuration(), this.modelProxy.getSourceTimeUnit()) + " " + shortTimeUnit;
final String meanDuration = this.propertiesModel.getTimeunit().convert(call.getMedianDuration(), this.modelProxy.getSourceTimeUnit()) + " " + shortTimeUnit;
final String avgDuration = this.propertiesModel.getTimeunit().convert(call.getMeanDuration(), this.modelProxy.getSourceTimeUnit()) + " " + shortTimeUnit;
final String totalDuration = this.propertiesModel.getTimeunit().convert(call.getTotalDuration(), this.modelProxy.getSourceTimeUnit()) + " " + shortTimeUnit;
final String minDuration = this.propertiesModel.getTimeUnit().convert(call.getMinDuration(), this.modelProxy.getSourceTimeUnit()) + " " + shortTimeUnit;
final String maxDuration = this.propertiesModel.getTimeUnit().convert(call.getMaxDuration(), this.modelProxy.getSourceTimeUnit()) + " " + shortTimeUnit;
final String meanDuration = this.propertiesModel.getTimeUnit().convert(call.getMedianDuration(), this.modelProxy.getSourceTimeUnit()) + " " + shortTimeUnit;
final String avgDuration = this.propertiesModel.getTimeUnit().convert(call.getMeanDuration(), this.modelProxy.getSourceTimeUnit()) + " " + shortTimeUnit;
final String totalDuration = this.propertiesModel.getTimeUnit().convert(call.getTotalDuration(), this.modelProxy.getSourceTimeUnit()) + " " + shortTimeUnit;
this.lblMinimalDurationDisplay.setText(minDuration);
this.lblMaximalDurationDisplay.setText(maxDuration);
......@@ -380,13 +380,13 @@ public final class View implements Observer, ISubView {
operationString = NameConverter.toShortOperationName(operationString);
}
final String shortTimeUnit = NameConverter.toShortTimeUnit(View.this.propertiesModel.getTimeunit());
final String shortTimeUnit = NameConverter.toShortTimeUnit(View.this.propertiesModel.getTimeUnit());
final String minDuration = View.this.propertiesModel.getTimeunit().convert(call.getMinDuration(), View.this.modelProxy.getSourceTimeUnit()) + " " + shortTimeUnit;
final String maxDuration = View.this.propertiesModel.getTimeunit().convert(call.getMaxDuration(), View.this.modelProxy.getSourceTimeUnit()) + " " + shortTimeUnit;
final String meanDuration = View.this.propertiesModel.getTimeunit().convert(call.getMedianDuration(), View.this.modelProxy.getSourceTimeUnit()) + " " + shortTimeUnit;
final String avgDuration = View.this.propertiesModel.getTimeunit().convert(call.getMeanDuration(), View.this.modelProxy.getSourceTimeUnit()) + " " + shortTimeUnit;
final String totalDuration = View.this.propertiesModel.getTimeunit().convert(call.getTotalDuration(), View.this.modelProxy.getSourceTimeUnit()) + " " + shortTimeUnit;
final String minDuration = View.this.propertiesModel.getTimeUnit().convert(call.getMinDuration(), View.this.modelProxy.getSourceTimeUnit()) + " " + shortTimeUnit;
final String maxDuration = View.this.propertiesModel.getTimeUnit().convert(call.getMaxDuration(), View.this.modelProxy.getSourceTimeUnit()) + " " + shortTimeUnit;
final String meanDuration = View.this.propertiesModel.getTimeUnit().convert(call.getMedianDuration(), View.this.modelProxy.getSourceTimeUnit()) + " " + shortTimeUnit;
final String avgDuration = View.this.propertiesModel.getTimeUnit().convert(call.getMeanDuration(), View.this.modelProxy.getSourceTimeUnit()) + " " + shortTimeUnit;
final String totalDuration = View.this.propertiesModel.getTimeUnit().convert(call.getTotalDuration(), View.this.modelProxy.getSourceTimeUnit()) + " " + shortTimeUnit;
if (parent != null) {
item.setText(new String[] { call.getContainer(), componentName, operationString, "", minDuration, avgDuration, meanDuration, maxDuration,
......
src/main/java/kieker/diagnosis/subview/calls/View.java
+ 4
− 4
View file @ 9aa7a6f5
......@@ -205,8 +205,8 @@ public final class View implements ISubView, Observer {
private void updateDetailComposite() {
final OperationCall call = this.model.getCurrentActiveCall();
final String shortTimeUnit = NameConverter.toShortTimeUnit(this.propertiesModel.getTimeunit());
final long duration = this.propertiesModel.getTimeunit().convert(call.getDuration(), this.modelProxy.getSourceTimeUnit());
final String shortTimeUnit = NameConverter.toShortTimeUnit(this.propertiesModel.getTimeUnit());
final long duration = this.propertiesModel.getTimeUnit().convert(call.getDuration(), this.modelProxy.getSourceTimeUnit());
final String durationString = duration + " " + shortTimeUnit;
this.lblMinimalDurationDisplay.setText(durationString);
......@@ -273,8 +273,8 @@ public final class View implements ISubView, Observer {
operationString = NameConverter.toShortOperationName(operationString);
}
final String shortTimeUnit = NameConverter.toShortTimeUnit(View.this.propertiesModel.getTimeunit());
final long duration = View.this.propertiesModel.getTimeunit().convert(call.getDuration(), View.this.modelProxy.getSourceTimeUnit());
final String shortTimeUnit = NameConverter.toShortTimeUnit(View.this.propertiesModel.getTimeUnit());
final long duration = View.this.propertiesModel.getTimeUnit().convert(call.getDuration(), View.this.modelProxy.getSourceTimeUnit());
item.setText(new String[] { call.getContainer(), componentName, operationString, Long.toString(duration) + " " + shortTimeUnit, Long.toString(call.getTraceID()) });
......
src/main/java/kieker/diagnosis/subview/traces/View.java
+ 4
− 4
View file @ 9aa7a6f5
......@@ -266,8 +266,8 @@ public final class View implements Observer, ISubView {
private void updateDetailComposite() {
final OperationCall call = this.tracesSubViewModel.getCurrentActiveCall();
final String shortTimeUnit = NameConverter.toShortTimeUnit(View.this.propertiesModel.getTimeunit());
final long duration = this.propertiesModel.getTimeunit().convert(call.getDuration(), this.modelProxy.getSourceTimeUnit());
final String shortTimeUnit = NameConverter.toShortTimeUnit(View.this.propertiesModel.getTimeUnit());
final long duration = this.propertiesModel.getTimeUnit().convert(call.getDuration(), this.modelProxy.getSourceTimeUnit());
final String durationString = duration + " " + shortTimeUnit;
this.lblTraceIdDisplay.setText(Long.toString(call.getTraceID()));
......@@ -326,8 +326,8 @@ public final class View implements Observer, ISubView {
operationString = NameConverter.toShortOperationName(operationString);
}
final String shortTimeUnit = NameConverter.toShortTimeUnit(View.this.propertiesModel.getTimeunit());
final long duration = View.this.propertiesModel.getTimeunit().convert(call.getDuration(), View.this.modelProxy.getSourceTimeUnit());
final String shortTimeUnit = NameConverter.toShortTimeUnit(View.this.propertiesModel.getTimeUnit());
final long duration = View.this.propertiesModel.getTimeUnit().convert(call.getDuration(), View.this.modelProxy.getSourceTimeUnit());
final String durationString = duration + " " + shortTimeUnit;
item.setText(new String[] { call.getContainer(), componentName, operationString, durationString, String.format("%.1f%%", call.getPercent()),
......
src/test/java/kieker/diagnosis/model/PropertiesModelTest.java
+ 5
− 5
View file @ 9aa7a6f5
......@@ -37,7 +37,7 @@ public final class PropertiesModelTest {
model.startModification();
model.setTimeunit(TimeUnit.NANOSECONDS);
model.setTimeUnit(TimeUnit.NANOSECONDS);
assertThat(observer.isFlag(), is(false));
model.commitModification();
......@@ -51,18 +51,18 @@ public final class PropertiesModelTest {
final PropertiesModel model = new PropertiesModel();
model.addObserver(observer);
model.setTimeunit(TimeUnit.NANOSECONDS);
model.setTimeUnit(TimeUnit.NANOSECONDS);
assertThat(observer.isFlag(), is(true));
}
@Test
public void settingShouldBePersisted() {
final PropertiesModel fstModel = new PropertiesModel();
fstModel.setTimeunit(TimeUnit.NANOSECONDS);
fstModel.setTimeunit(TimeUnit.MICROSECONDS);
fstModel.setTimeUnit(TimeUnit.NANOSECONDS);
fstModel.setTimeUnit(TimeUnit.MICROSECONDS);
final PropertiesModel sndModel = new PropertiesModel();
assertThat(sndModel.getTimeunit(), is(TimeUnit.MICROSECONDS));
assertThat(sndModel.getTimeUnit(), is(TimeUnit.MICROSECONDS));
}
private static class BooleanObserver implements Observer {
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment