From 9b85f7c5be7d7e4e33d87347507da205748fdaae Mon Sep 17 00:00:00 2001 From: Alexander Nozik Date: Wed, 20 Jan 2016 22:07:07 +0300 Subject: [PATCH] [no commit message] --- .../numass/actions/MonitorCorrectAction.java | 2 +- .../workbench/NumassWorkbenchController.java | 6 ++++-- numass.gradle | 20 ------------------- 3 files changed, 5 insertions(+), 23 deletions(-) diff --git a/numass-main/src/main/java/inr/numass/actions/MonitorCorrectAction.java b/numass-main/src/main/java/inr/numass/actions/MonitorCorrectAction.java index e43ace77..de21af04 100644 --- a/numass-main/src/main/java/inr/numass/actions/MonitorCorrectAction.java +++ b/numass-main/src/main/java/inr/numass/actions/MonitorCorrectAction.java @@ -43,7 +43,7 @@ import java.util.concurrent.CopyOnWriteArrayList; * @author Darksnake */ @TypedActionDef(name = "monitor", inputType = DataSet.class, outputType = DataSet.class) -@ValueDef(name = "monitorPoint", type = "UMBER", required = true, info = "The Uset for monitor point") +@ValueDef(name = "monitorPoint", type = "NUMBER", required = true, info = "The Uset for monitor point") @ValueDef(name = "monitorFile", info = "The outputfile for monitor points", def = "monitor.out") @ValueDef(name = "calculateRelative", info = "Calculate count rate relative to average monitor point", def = "false") public class MonitorCorrectAction extends OneToOneAction { diff --git a/numass-main/src/main/java/inr/numass/workbench/NumassWorkbenchController.java b/numass-main/src/main/java/inr/numass/workbench/NumassWorkbenchController.java index 2526e160..3598751d 100644 --- a/numass-main/src/main/java/inr/numass/workbench/NumassWorkbenchController.java +++ b/numass-main/src/main/java/inr/numass/workbench/NumassWorkbenchController.java @@ -218,16 +218,18 @@ public class NumassWorkbenchController implements Initializable, StagePaneHolder actionsConfig.setNode("action", actions); + int counter = 0; for (Configuration action : actions) { + counter++; MetaEditor actionEditor = new MetaEditor(); MetaTreeItem rootItem = new MetaTreeItem(action, getDescriptorForAction(action.getString("type"))); //Freezing actions names - rootItem.setFrozenValuePredicate((c, n) -> c.getName().equals("action") && n.equals("type")); +// rootItem.setFrozenValuePredicate((c, n) -> c.getName().equals("action") && n.equals("type")); actionEditor.setRoot(rootItem); actionEditors.add(actionEditor); - String actionTitle = String.format("action [%d]: %s", actions.indexOf(action), action.getString("type")); + String actionTitle = String.format("action [%d]: %s", counter, action.getString("type")); TitledPane actionPane = new TitledPane(actionTitle, actionEditor); metaContainer.getPanes().add(actionPane); } diff --git a/numass.gradle b/numass.gradle index de47efba..4408a58c 100644 --- a/numass.gradle +++ b/numass.gradle @@ -26,26 +26,6 @@ dependencies { deployerJars "org.apache.maven.wagon:wagon-ssh:2.8" } -task sourcesJar(type: Jar, dependsOn: classes, description: 'Creates a jar from the source files.') { - classifier = 'sources' - from sourceSets.main.allSource -} - -artifacts { - archives jar - archives sourcesJar -} - - -task createFolders(description: 'Creates the source folders if they do not exist.') doLast { - sourceSets*.allSource*.srcDirs*.each { File srcDir -> - if (!srcDir.isDirectory()) { - println "Creating source folder: ${srcDir}" - srcDir.mkdirs() - } - } -} - uploadArchives { repositories.mavenDeployer { configuration = configurations.deployerJars