From 2c3f828c0b3f4bc5928c85968f0956d913da5706 Mon Sep 17 00:00:00 2001 From: Alexander Nozik Date: Fri, 13 Jan 2017 12:19:42 +0300 Subject: [PATCH] Joined documentation/site project --- build.gradle | 12 ------------ .../numass/readvac/devices/VacCollectorDevice.java | 2 +- .../numass/readvac/fx/PoweredVacuumeterView.java | 13 +++++++------ .../numass/readvac/fx/VacCollectorController.java | 2 +- .../java/inr/numass/readvac/fx/VacuumeterView.java | 2 +- .../java/inr/numass/actions/AdjustErrorsAction.java | 2 +- .../inr/numass/actions/SubstractSpectrumAction.java | 2 +- .../java/inr/numass/models/sterile/NumassBeta.java | 2 +- .../inr/numass/models/sterile/NumassResolution.java | 2 +- .../numass/models/sterile/NumassTransmission.java | 2 +- .../main/java/inr/numass/utils/PileUpSimulator.java | 2 +- .../java/inr/numass/utils/UnderflowCorrection.java | 2 +- .../main/java/inr/numass/workbench/OutputTab.java | 2 +- .../main/java/inr/numass/workbench/StagePane.java | 7 ++++--- .../java/inr/numass/workbench/StagePaneHolder.java | 2 +- .../java/inr/numass/workbench/TextOutputTab.java | 2 +- .../inr/numass/workbench/WorkbenchIOManager.java | 2 +- .../java/inr/numass/workbench/WorkbenchUtils.java | 2 +- .../main/java/inr/numass/storage/NumassData.java | 3 ++- 19 files changed, 28 insertions(+), 37 deletions(-) diff --git a/build.gradle b/build.gradle index 8439a4bc..894a55d5 100644 --- a/build.gradle +++ b/build.gradle @@ -29,15 +29,3 @@ buildscript { classpath 'com.github.jengelman.gradle.plugins:shadow:1.2.+' } } -//task mergedJavadoc(type: Javadoc, description: 'Creates Javadoc from all the projects.') { -// title = 'All modules' -// destinationDir = new File(project.buildDir, 'merged-javadoc') -// -// // Note: The closures below are executed lazily. -// source { -// subprojects*.sourceSets*.main*.allSource -// } -// classpath.from { -// subprojects*.configurations*.compile*.copyRecursive({!(it instanceof ProjectDependency)})*.resolve() -// } -//} diff --git a/numass-control/vac/src/main/java/inr/numass/readvac/devices/VacCollectorDevice.java b/numass-control/vac/src/main/java/inr/numass/readvac/devices/VacCollectorDevice.java index ef09f676..c0bb4889 100644 --- a/numass-control/vac/src/main/java/inr/numass/readvac/devices/VacCollectorDevice.java +++ b/numass-control/vac/src/main/java/inr/numass/readvac/devices/VacCollectorDevice.java @@ -32,7 +32,7 @@ import java.util.concurrent.TimeUnit; /** * - * @author Alexander Nozik + * @author Alexander Nozik */ @RoleDef(name = Roles.STORAGE_ROLE, objectType = PointListener.class, info = "Storage for acquired points") public class VacCollectorDevice extends Sensor { diff --git a/numass-control/vac/src/main/java/inr/numass/readvac/fx/PoweredVacuumeterView.java b/numass-control/vac/src/main/java/inr/numass/readvac/fx/PoweredVacuumeterView.java index db63587b..a8c1df1a 100644 --- a/numass-control/vac/src/main/java/inr/numass/readvac/fx/PoweredVacuumeterView.java +++ b/numass-control/vac/src/main/java/inr/numass/readvac/fx/PoweredVacuumeterView.java @@ -7,20 +7,21 @@ package inr.numass.readvac.fx; import hep.dataforge.exceptions.ControlException; import hep.dataforge.values.Value; -import java.io.IOException; -import java.net.URL; -import java.util.ResourceBundle; -import java.util.logging.Level; -import java.util.logging.Logger; import javafx.beans.value.ObservableValue; import javafx.fxml.FXML; import javafx.fxml.FXMLLoader; import javafx.scene.Node; import org.controlsfx.control.ToggleSwitch; +import java.io.IOException; +import java.net.URL; +import java.util.ResourceBundle; +import java.util.logging.Level; +import java.util.logging.Logger; + /** * - * @author Alexander Nozik + * @author Alexander Nozik */ public class PoweredVacuumeterView extends VacuumeterView { diff --git a/numass-control/vac/src/main/java/inr/numass/readvac/fx/VacCollectorController.java b/numass-control/vac/src/main/java/inr/numass/readvac/fx/VacCollectorController.java index 184bf4cd..94dfa5e7 100644 --- a/numass-control/vac/src/main/java/inr/numass/readvac/fx/VacCollectorController.java +++ b/numass-control/vac/src/main/java/inr/numass/readvac/fx/VacCollectorController.java @@ -63,7 +63,7 @@ import java.util.function.BiFunction; /** * FXML Controller class * - * @author Alexander Nozik + * @author Alexander Nozik */ public class VacCollectorController implements Initializable, DeviceListener, MeasurementListener { diff --git a/numass-control/vac/src/main/java/inr/numass/readvac/fx/VacuumeterView.java b/numass-control/vac/src/main/java/inr/numass/readvac/fx/VacuumeterView.java index f9a3a196..85bc5a99 100644 --- a/numass-control/vac/src/main/java/inr/numass/readvac/fx/VacuumeterView.java +++ b/numass-control/vac/src/main/java/inr/numass/readvac/fx/VacuumeterView.java @@ -33,7 +33,7 @@ import java.time.format.DateTimeFormatter; import java.util.ResourceBundle; /** - * @author Alexander Nozik + * @author Alexander Nozik */ public class VacuumeterView extends DeviceViewController implements MeasurementListener, Initializable, Named, Annotated { diff --git a/numass-main/src/main/java/inr/numass/actions/AdjustErrorsAction.java b/numass-main/src/main/java/inr/numass/actions/AdjustErrorsAction.java index 93ff12f0..21a8a0be 100644 --- a/numass-main/src/main/java/inr/numass/actions/AdjustErrorsAction.java +++ b/numass-main/src/main/java/inr/numass/actions/AdjustErrorsAction.java @@ -21,7 +21,7 @@ import java.util.List; /** * Adjust errors for all numass points in the dataset * - * @author Alexander Nozik + * @author Alexander Nozik */ @TypedActionDef(name = "adjustErrors", inputType = Table.class, outputType = Table.class) public class AdjustErrorsAction extends OneToOneAction { diff --git a/numass-main/src/main/java/inr/numass/actions/SubstractSpectrumAction.java b/numass-main/src/main/java/inr/numass/actions/SubstractSpectrumAction.java index b209acb6..28247ff6 100644 --- a/numass-main/src/main/java/inr/numass/actions/SubstractSpectrumAction.java +++ b/numass-main/src/main/java/inr/numass/actions/SubstractSpectrumAction.java @@ -22,7 +22,7 @@ import java.io.OutputStream; import java.util.Optional; /** - * @author Alexander Nozik + * @author Alexander Nozik */ @TypedActionDef(name = "substractSpectrum", inputType = Table.class, outputType = Table.class, info = "Substract reference spectrum (background)") public class SubstractSpectrumAction extends OneToOneAction { diff --git a/numass-main/src/main/java/inr/numass/models/sterile/NumassBeta.java b/numass-main/src/main/java/inr/numass/models/sterile/NumassBeta.java index 752b03f5..2e00c999 100644 --- a/numass-main/src/main/java/inr/numass/models/sterile/NumassBeta.java +++ b/numass-main/src/main/java/inr/numass/models/sterile/NumassBeta.java @@ -18,7 +18,7 @@ import static java.lang.Math.*; * dissertation p.33 *

* - * @author Alexander Nozik + * @author Alexander Nozik */ public class NumassBeta extends AbstractParametricBiFunction { diff --git a/numass-main/src/main/java/inr/numass/models/sterile/NumassResolution.java b/numass-main/src/main/java/inr/numass/models/sterile/NumassResolution.java index 19f99824..b19a1f33 100644 --- a/numass-main/src/main/java/inr/numass/models/sterile/NumassResolution.java +++ b/numass-main/src/main/java/inr/numass/models/sterile/NumassResolution.java @@ -15,7 +15,7 @@ import static java.lang.Math.sqrt; /** * - * @author Alexander Nozik + * @author Alexander Nozik */ public class NumassResolution extends AbstractParametricBiFunction { diff --git a/numass-main/src/main/java/inr/numass/models/sterile/NumassTransmission.java b/numass-main/src/main/java/inr/numass/models/sterile/NumassTransmission.java index 41f42c11..a5b6e76f 100644 --- a/numass-main/src/main/java/inr/numass/models/sterile/NumassTransmission.java +++ b/numass-main/src/main/java/inr/numass/models/sterile/NumassTransmission.java @@ -20,7 +20,7 @@ import java.util.Map; /** * - * @author Alexander Nozik + * @author Alexander Nozik */ public class NumassTransmission extends AbstractParametricBiFunction { diff --git a/numass-main/src/main/java/inr/numass/utils/PileUpSimulator.java b/numass-main/src/main/java/inr/numass/utils/PileUpSimulator.java index bc305760..0916bdf7 100644 --- a/numass-main/src/main/java/inr/numass/utils/PileUpSimulator.java +++ b/numass-main/src/main/java/inr/numass/utils/PileUpSimulator.java @@ -18,7 +18,7 @@ import java.util.function.Supplier; import static java.lang.Math.max; /** - * @author Alexander Nozik + * @author Alexander Nozik */ public class PileUpSimulator { diff --git a/numass-main/src/main/java/inr/numass/utils/UnderflowCorrection.java b/numass-main/src/main/java/inr/numass/utils/UnderflowCorrection.java index 16729eef..402c4027 100644 --- a/numass-main/src/main/java/inr/numass/utils/UnderflowCorrection.java +++ b/numass-main/src/main/java/inr/numass/utils/UnderflowCorrection.java @@ -23,7 +23,7 @@ import java.util.stream.Collectors; /** * A class to calculate underflow correction * - * @author Alexander Nozik + * @author Alexander Nozik */ public class UnderflowCorrection { diff --git a/numass-main/src/main/java/inr/numass/workbench/OutputTab.java b/numass-main/src/main/java/inr/numass/workbench/OutputTab.java index f5b8c1c7..50dd1d57 100644 --- a/numass-main/src/main/java/inr/numass/workbench/OutputTab.java +++ b/numass-main/src/main/java/inr/numass/workbench/OutputTab.java @@ -11,7 +11,7 @@ import javafx.scene.control.Tab; /** * A tab which contains output of task or action. * - * @author Alexander Nozik + * @author Alexander Nozik */ public abstract class OutputTab extends Tab implements Named { diff --git a/numass-main/src/main/java/inr/numass/workbench/StagePane.java b/numass-main/src/main/java/inr/numass/workbench/StagePane.java index 606ae271..143ea20a 100644 --- a/numass-main/src/main/java/inr/numass/workbench/StagePane.java +++ b/numass-main/src/main/java/inr/numass/workbench/StagePane.java @@ -9,14 +9,15 @@ import hep.dataforge.fx.FXUtils; import hep.dataforge.meta.Meta; import hep.dataforge.names.Named; import hep.dataforge.plots.PlotFrame; -import java.util.HashMap; -import java.util.Map; import javafx.application.Platform; import javafx.scene.control.TabPane; +import java.util.HashMap; +import java.util.Map; + /** * - * @author Alexander Nozik + * @author Alexander Nozik */ public class StagePane extends TabPane implements Named { diff --git a/numass-main/src/main/java/inr/numass/workbench/StagePaneHolder.java b/numass-main/src/main/java/inr/numass/workbench/StagePaneHolder.java index 935593a9..166613a9 100644 --- a/numass-main/src/main/java/inr/numass/workbench/StagePaneHolder.java +++ b/numass-main/src/main/java/inr/numass/workbench/StagePaneHolder.java @@ -7,7 +7,7 @@ package inr.numass.workbench; /** * - * @author Alexander Nozik + * @author Alexander Nozik */ public interface StagePaneHolder { StagePane getStagePane(String stageName); diff --git a/numass-main/src/main/java/inr/numass/workbench/TextOutputTab.java b/numass-main/src/main/java/inr/numass/workbench/TextOutputTab.java index 122b930e..f25d3560 100644 --- a/numass-main/src/main/java/inr/numass/workbench/TextOutputTab.java +++ b/numass-main/src/main/java/inr/numass/workbench/TextOutputTab.java @@ -13,7 +13,7 @@ import java.io.OutputStream; /** * A text output tab. Basically it is attached to IOManager::onComplete * - * @author Alexander Nozik + * @author Alexander Nozik */ public class TextOutputTab extends OutputTab { diff --git a/numass-main/src/main/java/inr/numass/workbench/WorkbenchIOManager.java b/numass-main/src/main/java/inr/numass/workbench/WorkbenchIOManager.java index 44647cc9..b5556b40 100644 --- a/numass-main/src/main/java/inr/numass/workbench/WorkbenchIOManager.java +++ b/numass-main/src/main/java/inr/numass/workbench/WorkbenchIOManager.java @@ -16,7 +16,7 @@ import java.io.OutputStream; /** * An IOManager wrapper that redirects output to appropriate FX components - * @author Alexander Nozik + * @author Alexander Nozik */ public class WorkbenchIOManager extends BasicIOManager { diff --git a/numass-main/src/main/java/inr/numass/workbench/WorkbenchUtils.java b/numass-main/src/main/java/inr/numass/workbench/WorkbenchUtils.java index ed032ee4..b845281e 100644 --- a/numass-main/src/main/java/inr/numass/workbench/WorkbenchUtils.java +++ b/numass-main/src/main/java/inr/numass/workbench/WorkbenchUtils.java @@ -7,7 +7,7 @@ package inr.numass.workbench; /** * - * @author Alexander Nozik + * @author Alexander Nozik */ public class WorkbenchUtils { diff --git a/numass-storage/src/main/java/inr/numass/storage/NumassData.java b/numass-storage/src/main/java/inr/numass/storage/NumassData.java index dc97f31c..79bff076 100644 --- a/numass-storage/src/main/java/inr/numass/storage/NumassData.java +++ b/numass-storage/src/main/java/inr/numass/storage/NumassData.java @@ -9,13 +9,14 @@ import hep.dataforge.meta.Annotated; import hep.dataforge.meta.Meta; import hep.dataforge.names.Named; import hep.dataforge.tables.Table; + import java.time.Instant; import java.util.List; import java.util.function.Supplier; /** * - * @author Alexander Nozik + * @author Alexander Nozik */ public interface NumassData extends Named, Annotated {