From acd11d08eae1bd67c6c04d31c7bff4d54ef2ba89 Mon Sep 17 00:00:00 2001 From: Omar Sweidan Date: Tue, 31 May 2022 15:20:57 +0200 Subject: [PATCH] =?utf8?q?Z=C3=A1r=C3=B3jelp=C3=A1r=20lev=C3=A9tele=20a=20?= =?utf8?q?log-=C3=BCzenetekb=C5=91l?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../server/JobEngineConfiguration.java | 6 +- .../jobengine/zk/model/CachedListModel.java | 6 +- .../user/jobengine/zk/model/IndexModel.java | 2 +- .../jobengine/zk/model/JobEditorModel.java | 71 ++----------------- .../jobengine/zk/model/JobEditorModel2.java | 14 ++-- .../jobengine/zk/model/ListSearchModel.java | 2 +- .../jobengine/zk/model/SidewindowModel.java | 4 +- 7 files changed, 23 insertions(+), 82 deletions(-) diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/server/JobEngineConfiguration.java b/server/user.jobengine.osgi.server/src/user/jobengine/server/JobEngineConfiguration.java index 7ff3e5d1..d9997bf2 100644 --- a/server/user.jobengine.osgi.server/src/user/jobengine/server/JobEngineConfiguration.java +++ b/server/user.jobengine.osgi.server/src/user/jobengine/server/JobEngineConfiguration.java @@ -394,7 +394,7 @@ public class JobEngineConfiguration implements IJobEngineConfiguration { @Override public void saveSchedulesJson(BasicDBObject originalJob, BasicDBObject newJob) throws Exception { - logger.info("saveSchedulesJson()"); + logger.info("saveSchedulesJson"); Path schedulesPath = null; try { @@ -458,7 +458,7 @@ public class JobEngineConfiguration implements IJobEngineConfiguration { @Override public void saveTemplateXml(JobTemplate templateToSave) { - logger.info("saveTemplateXml()"); + logger.info("saveTemplateXml"); if (templateToSave == null) { throw new NullPointerException("templateToSave == null"); } @@ -518,7 +518,7 @@ public class JobEngineConfiguration implements IJobEngineConfiguration { @Override public String duplicateTemplate(BasicDBObject selectedJob) { - logger.info("duplicateTemplate()"); + logger.info("duplicateTemplate"); Path templatesPath = null; String filePath = null; diff --git a/server/user.mediacube.gui/src/user/jobengine/zk/model/CachedListModel.java b/server/user.mediacube.gui/src/user/jobengine/zk/model/CachedListModel.java index 622dbab7..d79b7bcc 100644 --- a/server/user.mediacube.gui/src/user/jobengine/zk/model/CachedListModel.java +++ b/server/user.mediacube.gui/src/user/jobengine/zk/model/CachedListModel.java @@ -51,7 +51,7 @@ public class CachedListModel extends ListModelList { } public void clearAndReset() { - logger.info("clearAndReset()"); + logger.info("clearAndReset"); this.resultSetSize = -1; this.cacheStart = 0; this.cacheEnd = 0; @@ -72,7 +72,7 @@ public class CachedListModel extends ListModelList { } public void fireListEvent() { - logger.info("fireListEvent()"); + logger.info("fireListEvent"); clearCache(); fireEvent(ListDataEvent.STRUCTURE_CHANGED, -1, -1); } @@ -198,7 +198,7 @@ public class CachedListModel extends ListModelList { // kintrol is hivhatjak public void reinit() { - logger.info("reinit()"); + logger.info("reinit"); this.resultSetSize = -1; this.cacheStart = 0; this.cacheEnd = 0; diff --git a/server/user.mediacube.gui/src/user/jobengine/zk/model/IndexModel.java b/server/user.mediacube.gui/src/user/jobengine/zk/model/IndexModel.java index 05b413fc..8ed78c4c 100644 --- a/server/user.mediacube.gui/src/user/jobengine/zk/model/IndexModel.java +++ b/server/user.mediacube.gui/src/user/jobengine/zk/model/IndexModel.java @@ -53,7 +53,7 @@ public class IndexModel extends BaseModel { @Command public void onClientInfo(@ContextParam(ContextType.TRIGGER_EVENT) ClientInfoEvent event) { - logger.info("onClientInfo()"); + logger.info("onClientInfo"); SessionUtil.publish(event); } diff --git a/server/user.mediacube.gui/src/user/jobengine/zk/model/JobEditorModel.java b/server/user.mediacube.gui/src/user/jobengine/zk/model/JobEditorModel.java index f171bcce..6502e085 100644 --- a/server/user.mediacube.gui/src/user/jobengine/zk/model/JobEditorModel.java +++ b/server/user.mediacube.gui/src/user/jobengine/zk/model/JobEditorModel.java @@ -57,8 +57,6 @@ public class JobEditorModel extends BaseModel { private Window resultWin; @Wire("#SaveButton") private Button saveButton; -// @Wire("#nameTextbox") -// private Textbox nameTextbox; @Wire("#templateNameTextbox") private Textbox templateNameTextbox; @Wire("#activeCheckbox") @@ -119,8 +117,6 @@ public class JobEditorModel extends BaseModel { } private void saveData() { -// selectedJob.remove("name"); -// selectedJob.append("name", nameTextbox.getValue()); selectedJob.remove("template"); selectedJob.append("template", templateNameTextbox.getValue()); selectedJob.remove("active"); @@ -131,27 +127,13 @@ public class JobEditorModel extends BaseModel { selectedJob.append("cronexpression", cronExpressionTextbox.getValue()); } -// @Command -// public void onNameChanged() { -// setProcessDataChanged(true); -// selectedJob.remove("name"); -// selectedJob.append("name", nameTextbox.getValue()); -// saveButton.setDisabled(false); -// logger.info("onNameChanged()"); -// } - -// @Command -// public void onNameTextboxClicked() { -// oldSelectedJob = selectedJob.get("name").toString(); -// } - @Command public void onTemplateNameChanged() { setProcessDataChanged(true); selectedJob.remove("templateName"); selectedJob.append("templateName", templateNameTextbox.getValue()); saveButton.setDisabled(false); - logger.info("onTemplateNameChanged()"); + logger.info("onTemplateNameChanged"); } @Command @@ -160,7 +142,7 @@ public class JobEditorModel extends BaseModel { selectedJob.remove("active"); selectedJob.append("active", activeCheckbox.isChecked()); saveButton.setDisabled(false); - logger.info("onActiveCheckBoxChanged()"); + logger.info("onActiveCheckBoxChanged"); } @Command @@ -169,7 +151,7 @@ public class JobEditorModel extends BaseModel { selectedJob.remove("executeimmediate"); selectedJob.append("executeimmediate", executeImmediateCheckbox.isChecked()); saveButton.setDisabled(false); - logger.info("onExecuteImmediateCheckBoxChanged()"); + logger.info("onExecuteImmediateCheckBoxChanged"); } @Command @@ -178,39 +160,9 @@ public class JobEditorModel extends BaseModel { selectedJob.remove("cronexpression"); selectedJob.append("cronexpression", cronExpressionTextbox.getValue()); saveButton.setDisabled(false); - logger.info("onCronExpressionChangedChanged()"); + logger.info("onCronExpressionChangedChanged"); } -// @Command -// public void onParameterNameChanged() { -// setProcessDataChanged(!isProcessDataChanged()); -// BasicDBList parameters = (BasicDBList) selectedJob.get("parameters"); -// selectedJob.remove("cronexpression"); -// selectedJob.append("cronexpression", parameterNameTextbox.getValue()); -// saveButton.setDisabled(false); -// logger.info("onParameterNameChanged()"); -// } -// -// @Command -// public void onParameterValueChanged() { -// setProcessDataChanged(!isProcessDataChanged()); -// BasicDBList parameters = (BasicDBList) selectedJob.get("parameters"); -// selectedJob.remove("cronexpression"); -// selectedJob.append("cronexpression", parameterValueTextbox.getValue()); -// saveButton.setDisabled(false); -// logger.info("onParameterValueChanged()"); -// } -// -// @Command -// public void onParameterTypeChanged() { -// setProcessDataChanged(!isProcessDataChanged()); -// BasicDBList parameters = (BasicDBList) selectedJob.get("parameters"); -// selectedJob.remove("cronexpression"); -// selectedJob.append("cronexpression", parameterTypeTextbox.getValue()); -// saveButton.setDisabled(false); -// logger.info("onParameterTypeChanged()"); -// } - private void toast(IJobRuntime runtime) { Clients.evalJavaScript(String.format("showToast('%s elindítva.
ID %d')", runtime.getName(), runtime.getId())); } @@ -319,7 +271,7 @@ public class JobEditorModel extends BaseModel { @Command public void saveTemplateXml() throws Exception { - logger.info("saveTemplateXml()"); + logger.info("saveTemplateXml"); if (selectedJob != null && isProcessDataChanged()) { JobTemplate jobTemplateToSave2 = collectProcessTemplateSettings(); jobEngine.getJobEngineConfiguration().saveTemplateXml(jobTemplateToSave2); @@ -357,7 +309,6 @@ public class JobEditorModel extends BaseModel { private JobTemplate collectProcessTemplateSettings() { JobTemplate jobTemplate = new JobTemplate(); -// jobTemplate.setName(nameTextbox.getValue()); jobTemplate.setFileName(templateNameTextbox.getValue()); return jobTemplate; @@ -371,17 +322,7 @@ public class JobEditorModel extends BaseModel { public void duplicateTemplate() { if (selectedJob != null) { JobTemplate processToDuplicate = collectProcessTemplateSettings(); -// jobEngine.getJobEngineConfiguration().duplicateProcess(selectedJob); - logger.info("duplicateTemplate()"); + logger.info("duplicateTemplate"); } } - -// @Command -// public void copyProcessEntry() { -// if (selectedJob != null) { -//// BasicDBObject scheduleToCopy = collectProcessScheduleSettings(); -// jobEngine.getJobEngineConfiguration().copyProcessEntry(selectedJob); -// logger.info("copyProcessEntry()"); -// } -// } } \ No newline at end of file diff --git a/server/user.mediacube.gui/src/user/jobengine/zk/model/JobEditorModel2.java b/server/user.mediacube.gui/src/user/jobengine/zk/model/JobEditorModel2.java index bd2dbb6a..57fd1404 100644 --- a/server/user.mediacube.gui/src/user/jobengine/zk/model/JobEditorModel2.java +++ b/server/user.mediacube.gui/src/user/jobengine/zk/model/JobEditorModel2.java @@ -93,7 +93,7 @@ public class JobEditorModel2 extends BaseModel { @Command @NotifyChange("editingJob") public void onNewParameterClicked() { - logger.info("onNewParameterClicked()"); + logger.info("onNewParameterClicked"); if(editingJob != null) { ((BasicDBList) editingJob.get("parameters")).add(new BasicDBObject() .append("name", "param".concat(String.valueOf(numberOfNewParams))) @@ -112,7 +112,7 @@ public class JobEditorModel2 extends BaseModel { @Command @NotifyChange({"editingJob", "jobs", "selectedJob"}) public void saveData() { - logger.info("saveData()"); + logger.info("saveData"); try { jobEngine.getJobEngineConfiguration().saveSchedulesJson(selectedJob, editingJob); @@ -124,13 +124,13 @@ public class JobEditorModel2 extends BaseModel { @Command public void onActiveClicked() { activeCheckbox.setDisabled(false); - logger.info("onActiveClicked()"); + logger.info("onActiveClicked"); } @Command public void onExecuteImmediateClicked() { executeImmediateCheckbox.setDisabled(false); - logger.info("onExecuteImmediateClicked()"); + logger.info("onExecuteImmediateClicked"); } private void toast(IJobRuntime runtime) { @@ -144,7 +144,7 @@ public class JobEditorModel2 extends BaseModel { @NotifyChange("editingJob") public void setEditingJob(BasicDBObject editingJob) { - logger.info("setEditingJob()"); + logger.info("setEditingJob"); this.editingJob= editingJob; if(editingJob == null) { return; @@ -154,7 +154,7 @@ public class JobEditorModel2 extends BaseModel { @NotifyChange({"editingJob", "selectedJob"}) public void setSelectedJob(BasicDBObject selectedJob) { - logger.info("setSelectedJob()"); + logger.info("setSelectedJob"); if (selectedJob == null) { this.selectedJob = null; this.editingJob = null; @@ -254,7 +254,7 @@ public class JobEditorModel2 extends BaseModel { @Command @NotifyChange("jobs") public String copyProcessEntry() { - logger.info("copyProcessEntry()"); + logger.info("copyProcessEntry"); String newName= null; if (selectedJob != null) { diff --git a/server/user.mediacube.gui/src/user/jobengine/zk/model/ListSearchModel.java b/server/user.mediacube.gui/src/user/jobengine/zk/model/ListSearchModel.java index 6f68c807..b1df74ac 100644 --- a/server/user.mediacube.gui/src/user/jobengine/zk/model/ListSearchModel.java +++ b/server/user.mediacube.gui/src/user/jobengine/zk/model/ListSearchModel.java @@ -1036,7 +1036,7 @@ public class ListSearchModel extends AsyncBaseModel { @NotifyChange({ "selectedObject", "hasLowresMediaFile", "hasTSMMediaFile", "lowresMediaFilePath" }) public void setSelectedObject(ArchivedMedia selectedObject) { - logger.info("setSelectedObject()"); + logger.info("setSelectedObject"); this.selectedObject = selectedObject; if (selectedObject != null) { long mediaId = selectedObject.getMedia().getId(); diff --git a/server/user.mediacube.gui/src/user/jobengine/zk/model/SidewindowModel.java b/server/user.mediacube.gui/src/user/jobengine/zk/model/SidewindowModel.java index 6eaf9a12..01aa30f1 100644 --- a/server/user.mediacube.gui/src/user/jobengine/zk/model/SidewindowModel.java +++ b/server/user.mediacube.gui/src/user/jobengine/zk/model/SidewindowModel.java @@ -56,13 +56,13 @@ public class SidewindowModel extends BaseModel { @Command public void onAfterResize() { - logger.info("onAfterResize()"); + logger.info("onAfterResize"); } @Command @NotifyChange({"left", "width", "opened"}) public void onSelectTab(@ContextParam(ContextType.TRIGGER_EVENT) SelectEvent event) { - logger.info("onSelectTab()"); + logger.info("onSelectTab"); setOpened(true); setWidth("200px"); setLeft((getScreenWidth()-200)+"px"); -- 2.54.0