Zárójelpár levétele a log-üzenetekből
authorOmar Sweidan <omar.sweidan@userrendszerhaz.hu>
Tue, 31 May 2022 13:20:57 +0000 (15:20 +0200)
committerOmar Sweidan <omar.sweidan@userrendszerhaz.hu>
Tue, 31 May 2022 13:32:13 +0000 (15:32 +0200)
server/user.jobengine.osgi.server/src/user/jobengine/server/JobEngineConfiguration.java
server/user.mediacube.gui/src/user/jobengine/zk/model/CachedListModel.java
server/user.mediacube.gui/src/user/jobengine/zk/model/IndexModel.java
server/user.mediacube.gui/src/user/jobengine/zk/model/JobEditorModel.java
server/user.mediacube.gui/src/user/jobengine/zk/model/JobEditorModel2.java
server/user.mediacube.gui/src/user/jobengine/zk/model/ListSearchModel.java
server/user.mediacube.gui/src/user/jobengine/zk/model/SidewindowModel.java

index 7ff3e5d12a6628d443a67c3a482abc2613aabc01..d9997bf221715631eb85dccf77fb1480e4da8ede 100644 (file)
@@ -394,7 +394,7 @@ public class JobEngineConfiguration implements IJobEngineConfiguration {
 \r
        @Override\r
        public void saveSchedulesJson(BasicDBObject originalJob, BasicDBObject newJob) throws Exception {\r
-               logger.info("saveSchedulesJson()");\r
+               logger.info("saveSchedulesJson");\r
 \r
                Path schedulesPath = null;\r
                try {\r
@@ -458,7 +458,7 @@ public class JobEngineConfiguration implements IJobEngineConfiguration {
 \r
        @Override\r
        public void saveTemplateXml(JobTemplate templateToSave) {\r
-               logger.info("saveTemplateXml()");\r
+               logger.info("saveTemplateXml");\r
                if (templateToSave == null) {\r
                        throw new NullPointerException("templateToSave == null");\r
                }\r
@@ -518,7 +518,7 @@ public class JobEngineConfiguration implements IJobEngineConfiguration {
 \r
        @Override\r
        public String duplicateTemplate(BasicDBObject selectedJob) {\r
-               logger.info("duplicateTemplate()");\r
+               logger.info("duplicateTemplate");\r
 \r
                Path templatesPath = null;\r
                String filePath = null;\r
index 622dbab70a4523c5d48cd5e28340b248b08574f8..d79b7bccec8d4cc09b0684cfdc7ab5346443f11e 100644 (file)
@@ -51,7 +51,7 @@ public class CachedListModel extends ListModelList<ArchivedMedia> {
        }\r
 \r
        public void clearAndReset() {\r
-               logger.info("clearAndReset()");\r
+               logger.info("clearAndReset");\r
                this.resultSetSize = -1;\r
                this.cacheStart = 0;\r
                this.cacheEnd = 0;\r
@@ -72,7 +72,7 @@ public class CachedListModel extends ListModelList<ArchivedMedia> {
        }\r
 \r
        public void fireListEvent() {\r
-               logger.info("fireListEvent()");\r
+               logger.info("fireListEvent");\r
                clearCache();\r
                fireEvent(ListDataEvent.STRUCTURE_CHANGED, -1, -1);\r
        }\r
@@ -198,7 +198,7 @@ public class CachedListModel extends ListModelList<ArchivedMedia> {
 \r
        // kintrol is hivhatjak\r
        public void reinit() {\r
-               logger.info("reinit()");\r
+               logger.info("reinit");\r
                this.resultSetSize = -1;\r
                this.cacheStart = 0;\r
                this.cacheEnd = 0;\r
index 05b413fc4336e7771f8153c93c2469524baf673b..8ed78c4c0758bc8af7c9edd6c67d43f38ce17ef3 100644 (file)
@@ -53,7 +53,7 @@ public class IndexModel extends BaseModel {
        \r
        @Command\r
        public void onClientInfo(@ContextParam(ContextType.TRIGGER_EVENT) ClientInfoEvent event) {\r
-               logger.info("onClientInfo()");\r
+               logger.info("onClientInfo");\r
                SessionUtil.publish(event);\r
        }\r
        \r
index f171bccebd67529886813d2068fed43fd0c5480d..6502e0852df64fbd922db145d9dc851b306b3e7a 100644 (file)
@@ -57,8 +57,6 @@ public class JobEditorModel extends BaseModel {
        private Window resultWin;\r
        @Wire("#SaveButton")\r
        private Button saveButton;\r
-//     @Wire("#nameTextbox")\r
-//     private Textbox nameTextbox;\r
        @Wire("#templateNameTextbox")\r
        private Textbox templateNameTextbox;\r
        @Wire("#activeCheckbox")\r
@@ -119,8 +117,6 @@ public class JobEditorModel extends BaseModel {
        }\r
 \r
        private void saveData() {\r
-//             selectedJob.remove("name");\r
-//             selectedJob.append("name", nameTextbox.getValue());\r
                selectedJob.remove("template");\r
                selectedJob.append("template", templateNameTextbox.getValue());\r
                selectedJob.remove("active");\r
@@ -131,27 +127,13 @@ public class JobEditorModel extends BaseModel {
                selectedJob.append("cronexpression", cronExpressionTextbox.getValue());\r
        }\r
 \r
-//     @Command\r
-//     public void onNameChanged() {\r
-//             setProcessDataChanged(true);\r
-//             selectedJob.remove("name");\r
-//             selectedJob.append("name", nameTextbox.getValue());\r
-//             saveButton.setDisabled(false);\r
-//             logger.info("onNameChanged()");\r
-//     }\r
-\r
-//     @Command\r
-//     public void onNameTextboxClicked() {\r
-//             oldSelectedJob = selectedJob.get("name").toString();\r
-//     }\r
-\r
        @Command\r
        public void onTemplateNameChanged() {\r
                setProcessDataChanged(true);\r
                selectedJob.remove("templateName");\r
                selectedJob.append("templateName", templateNameTextbox.getValue());\r
                saveButton.setDisabled(false);\r
-               logger.info("onTemplateNameChanged()");\r
+               logger.info("onTemplateNameChanged");\r
        }\r
 \r
        @Command\r
@@ -160,7 +142,7 @@ public class JobEditorModel extends BaseModel {
                selectedJob.remove("active");\r
                selectedJob.append("active", activeCheckbox.isChecked());\r
                saveButton.setDisabled(false);\r
-               logger.info("onActiveCheckBoxChanged()");\r
+               logger.info("onActiveCheckBoxChanged");\r
        }\r
 \r
        @Command\r
@@ -169,7 +151,7 @@ public class JobEditorModel extends BaseModel {
                selectedJob.remove("executeimmediate");\r
                selectedJob.append("executeimmediate", executeImmediateCheckbox.isChecked());\r
                saveButton.setDisabled(false);\r
-               logger.info("onExecuteImmediateCheckBoxChanged()");\r
+               logger.info("onExecuteImmediateCheckBoxChanged");\r
        }\r
 \r
        @Command\r
@@ -178,39 +160,9 @@ public class JobEditorModel extends BaseModel {
                selectedJob.remove("cronexpression");\r
                selectedJob.append("cronexpression", cronExpressionTextbox.getValue());\r
                saveButton.setDisabled(false);\r
-               logger.info("onCronExpressionChangedChanged()");\r
+               logger.info("onCronExpressionChangedChanged");\r
        }\r
 \r
-//     @Command\r
-//     public void onParameterNameChanged() {\r
-//             setProcessDataChanged(!isProcessDataChanged());\r
-//             BasicDBList parameters = (BasicDBList) selectedJob.get("parameters");\r
-//             selectedJob.remove("cronexpression");\r
-//             selectedJob.append("cronexpression", parameterNameTextbox.getValue());\r
-//             saveButton.setDisabled(false);\r
-//             logger.info("onParameterNameChanged()");\r
-//     }\r
-//\r
-//     @Command\r
-//     public void onParameterValueChanged() {\r
-//             setProcessDataChanged(!isProcessDataChanged());\r
-//             BasicDBList parameters = (BasicDBList) selectedJob.get("parameters");\r
-//             selectedJob.remove("cronexpression");\r
-//             selectedJob.append("cronexpression", parameterValueTextbox.getValue());\r
-//             saveButton.setDisabled(false);\r
-//             logger.info("onParameterValueChanged()");\r
-//     }\r
-//\r
-//     @Command\r
-//     public void onParameterTypeChanged() {\r
-//             setProcessDataChanged(!isProcessDataChanged());\r
-//             BasicDBList parameters = (BasicDBList) selectedJob.get("parameters");\r
-//             selectedJob.remove("cronexpression");\r
-//             selectedJob.append("cronexpression", parameterTypeTextbox.getValue());\r
-//             saveButton.setDisabled(false);\r
-//             logger.info("onParameterTypeChanged()");\r
-//     }\r
-\r
        private void toast(IJobRuntime runtime) {\r
                Clients.evalJavaScript(String.format("showToast('<b>%s</b> elindítva.</br>ID %d')", runtime.getName(), runtime.getId()));\r
        }\r
@@ -319,7 +271,7 @@ public class JobEditorModel extends BaseModel {
 \r
        @Command\r
        public void saveTemplateXml() throws Exception {\r
-               logger.info("saveTemplateXml()");\r
+               logger.info("saveTemplateXml");\r
                if (selectedJob != null && isProcessDataChanged()) {\r
                        JobTemplate jobTemplateToSave2 = collectProcessTemplateSettings();\r
                        jobEngine.getJobEngineConfiguration().saveTemplateXml(jobTemplateToSave2);\r
@@ -357,7 +309,6 @@ public class JobEditorModel extends BaseModel {
        private JobTemplate collectProcessTemplateSettings() {\r
                JobTemplate jobTemplate = new JobTemplate();\r
 \r
-//             jobTemplate.setName(nameTextbox.getValue());\r
                jobTemplate.setFileName(templateNameTextbox.getValue());\r
 \r
                return jobTemplate;\r
@@ -371,17 +322,7 @@ public class JobEditorModel extends BaseModel {
        public void duplicateTemplate() {\r
                if (selectedJob != null) {\r
                        JobTemplate processToDuplicate = collectProcessTemplateSettings();\r
-//                     jobEngine.getJobEngineConfiguration().duplicateProcess(selectedJob);\r
-                       logger.info("duplicateTemplate()");\r
+                       logger.info("duplicateTemplate");\r
                }\r
        }\r
-\r
-//     @Command\r
-//     public void copyProcessEntry() {\r
-//             if (selectedJob != null) {\r
-////                   BasicDBObject scheduleToCopy = collectProcessScheduleSettings();\r
-//                     jobEngine.getJobEngineConfiguration().copyProcessEntry(selectedJob);\r
-//                     logger.info("copyProcessEntry()");\r
-//             }\r
-//     }\r
 }
\ No newline at end of file
index bd2dbb6a3a404a1db30f396537d8c6e857af3598..57fd1404342fbd7dcf2e55872de35cbe9cc76cd4 100644 (file)
@@ -93,7 +93,7 @@ public class JobEditorModel2 extends BaseModel {
        @Command\r
        @NotifyChange("editingJob")\r
        public void onNewParameterClicked() {\r
-               logger.info("onNewParameterClicked()");\r
+               logger.info("onNewParameterClicked");\r
                if(editingJob != null) {\r
                        ((BasicDBList) editingJob.get("parameters")).add(new BasicDBObject()\r
                                        .append("name", "param".concat(String.valueOf(numberOfNewParams)))\r
@@ -112,7 +112,7 @@ public class JobEditorModel2 extends BaseModel {
        @Command\r
        @NotifyChange({"editingJob", "jobs", "selectedJob"})\r
        public void saveData() {\r
-               logger.info("saveData()");\r
+               logger.info("saveData");\r
                                \r
                try {\r
                        jobEngine.getJobEngineConfiguration().saveSchedulesJson(selectedJob, editingJob);\r
@@ -124,13 +124,13 @@ public class JobEditorModel2 extends BaseModel {
        @Command\r
        public void onActiveClicked() {\r
                activeCheckbox.setDisabled(false);\r
-               logger.info("onActiveClicked()");\r
+               logger.info("onActiveClicked");\r
        }\r
 \r
        @Command\r
        public void onExecuteImmediateClicked() {\r
                executeImmediateCheckbox.setDisabled(false);\r
-               logger.info("onExecuteImmediateClicked()");\r
+               logger.info("onExecuteImmediateClicked");\r
        }\r
 \r
        private void toast(IJobRuntime runtime) {\r
@@ -144,7 +144,7 @@ public class JobEditorModel2 extends BaseModel {
        \r
        @NotifyChange("editingJob")\r
        public void setEditingJob(BasicDBObject editingJob) {\r
-               logger.info("setEditingJob()");\r
+               logger.info("setEditingJob");\r
                this.editingJob= editingJob;\r
                if(editingJob == null) {\r
                        return;\r
@@ -154,7 +154,7 @@ public class JobEditorModel2 extends BaseModel {
 \r
        @NotifyChange({"editingJob", "selectedJob"})\r
        public void setSelectedJob(BasicDBObject selectedJob) {\r
-               logger.info("setSelectedJob()");\r
+               logger.info("setSelectedJob");\r
                if (selectedJob == null) {\r
                        this.selectedJob = null;\r
                        this.editingJob = null;\r
@@ -254,7 +254,7 @@ public class JobEditorModel2 extends BaseModel {
        @Command\r
        @NotifyChange("jobs")\r
        public String copyProcessEntry() {\r
-               logger.info("copyProcessEntry()");\r
+               logger.info("copyProcessEntry");\r
                \r
                String newName= null;\r
                if (selectedJob != null) {\r
index 6f68c807feffb6f93257058f2852a39eca1bd029..b1df74ac66bf2761eff554b4746963bc064903fe 100644 (file)
@@ -1036,7 +1036,7 @@ public class ListSearchModel extends AsyncBaseModel {
 \r
        @NotifyChange({ "selectedObject", "hasLowresMediaFile", "hasTSMMediaFile", "lowresMediaFilePath" })\r
        public void setSelectedObject(ArchivedMedia selectedObject) {\r
-               logger.info("setSelectedObject()");\r
+               logger.info("setSelectedObject");\r
                this.selectedObject = selectedObject;\r
                if (selectedObject != null) {\r
                        long mediaId = selectedObject.getMedia().getId();\r
index 6eaf9a1217ff55f076e0d9995843f1e4d747c2bf..01aa30f1335e20856967d9c6f070841e98a25a49 100644 (file)
@@ -56,13 +56,13 @@ public class SidewindowModel extends BaseModel {
 \r
        @Command\r
        public void onAfterResize() {\r
-               logger.info("onAfterResize()");\r
+               logger.info("onAfterResize");\r
        }\r
        \r
        @Command\r
        @NotifyChange({"left", "width", "opened"})\r
        public void onSelectTab(@ContextParam(ContextType.TRIGGER_EVENT) SelectEvent<Tab, Event> event) {\r
-               logger.info("onSelectTab()");\r
+               logger.info("onSelectTab");\r
                setOpened(true);\r
                setWidth("200px");\r
                setLeft((getScreenWidth()-200)+"px");\r