Composite build clean-up

build.gradle

@@ -1,3 +1,5 @@
+apply plugin: 'idea'
+
 subprojects {
     apply plugin: 'java'
     apply plugin: 'idea'

numass-main/src/main/java/inr/numass/actions/ShowLossSpectrumAction.java

@@ -27,18 +27,15 @@ import hep.dataforge.meta.Laminate;
 import hep.dataforge.meta.MetaBuilder;
 import hep.dataforge.plots.PlotFrame;
 import hep.dataforge.plots.PlotUtils;
-import hep.dataforge.plots.data.PlottableData;
 import hep.dataforge.plots.data.PlottableXYFunction;
 import hep.dataforge.stat.fit.FitState;
 import hep.dataforge.stat.fit.FitTaskResult;
 import hep.dataforge.stat.fit.Param;
 import hep.dataforge.stat.fit.ParamSet;
-import hep.dataforge.stat.models.Histogram;
 import hep.dataforge.stat.simulation.GaussianParameterGenerator;
 import hep.dataforge.tables.ListTable;
 import hep.dataforge.tables.MapPoint;
 import hep.dataforge.tables.Table;
-import hep.dataforge.tables.XYAdapter;
 import hep.dataforge.values.NamedValueSet;
 import inr.numass.models.ExperimentalVariableLossSpectrum;
 import inr.numass.models.LossCalculator;
@@ -264,13 +261,13 @@ public class ShowLossSpectrumAction extends OneToOneAction<FitState, FitState> {
                 .filter(d -> !Double.isNaN(d))
                 .toArray();
 
-        Histogram hist = new Histogram(0.3, 0.5, 0.002);
+//        Histogram hist = new Histogram(0.3, 0.5, 0.002);
-        hist.fill(res);
+//        hist.fill(res);
-        PlotFrame frame = PlotUtils.getPlotManager(context)
+//        PlotFrame frame = PlotUtils.getPlotManager(context)
-                .buildPlotFrame(getName(), name + ".ionRatio",
+//                .buildPlotFrame(getName(), name + ".ionRatio",
-                        new MetaBuilder("plot").setValue("plotTitle", "Ion ratio Distribution for " + name)
+//                        new MetaBuilder("plot").setValue("plotTitle", "Ion ratio Distribution for " + name)
-                );
+//                );
-        frame.add(PlottableData.plot("ionRatio", new XYAdapter("binCenter", "count"), hist));
+//        frame.add(PlottableData.plot("ionRatio", new XYAdapter("binCenter", "count"), hist));
 
         return new DescriptiveStatistics(res).getStandardDeviation();
     }

numass-storage/numass-server/build.gradle

@@ -6,6 +6,8 @@ dependencies {
     compile 'commons-daemon:commons-daemon:1.+'
 }
 
-processResources {
+//processResources {
 //    from configurations.compile.files {"hep.dataforge:storage-servlet"}.find {'/src/main/resources/ratpack'}
-}
+//}
+
+

numass-storage/numass-server/src/main/java/inr/numass/server/NumassRun.java

@@ -71,7 +71,7 @@ public class NumassRun implements Annotated, Responder {
     public NumassRun(String path, NumassStorage workStorage, MessageFactory factory) throws StorageException {
         this.storage = workStorage;
         this.states = LoaderFactory.buildStateLoder(storage, RUN_STATE, null);
-        this.noteLoader = (ObjectLoader<NumassNote>) LoaderFactory.buildObjectLoder(storage, RUN_NOTES, null);
+        this.noteLoader =  LoaderFactory.buildObjectLoder(storage, RUN_NOTES, null);
         this.factory = factory;
         this.runPath = path;
         logger = LoggerFactory.getLogger("CURRENT_RUN");

numass-storage/numass-server/src/main/java/inr/numass/server/NumassStorageHandler.java

@@ -43,6 +43,7 @@ public class NumassStorageHandler extends StorageRatpackHandler {
     }
 
     @Override
+    @SuppressWarnings("unchecked")
     protected void renderObjects(Context ctx, ObjectLoader<?> loader) {
         if (loader instanceof NumassData) {
 

numass-viewer/src/main/java/inr/numass/viewer/NumassLoaderTreeBuilder.java

@@ -39,6 +39,7 @@ import java.util.function.Consumer;
  */
 public class NumassLoaderTreeBuilder {
 
+    @SuppressWarnings("unchecked")
     public void build(Work callback,
                       TreeTableView<TreeItemValue> numassLoaderDataTree,
                       NumassStorage rootStorage,

settings.gradle

@@ -1,19 +1,18 @@
 rootProject.name = 'numass'
 
-if(file("../dataforge").exists()){
-    includeBuild('../dataforge')
-}
-
 include ":numass-control"
 include ":numass-control:cryotemp"
 include ":numass-control:magnet"
 include ":numass-control:msp"
-
+//
 include ":numass-main"
-
+//
 include ":numass-storage"
 include ":numass-storage:numass-client"
 include ":numass-storage:numass-server"
-
+//
 include ":numass-viewer"
 
+if(file("../dataforge").exists()){
+    includeBuild('../dataforge')
+}