From b1f3f5611741b288a953eafa19b6973b02487c9c Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1s=C3=A1ry=20D=C3=A1niel?= Date: Mon, 16 Jul 2018 12:05:02 +0000 Subject: [PATCH] git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C31171 --- server/user.jobengine.osgi.server/WEB-INF/zk.xml | 16 ++++++++-------- .../user/jobengine/zk/model/AsyncBaseModel.java | 2 +- .../user/jobengine/zk/model/JobListModel.java | 8 ++++---- .../zk/model/MissingMaterialsModel.java | 2 +- .../src/user/jobengine/zk/model/SearchModel.java | 4 ++-- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/server/user.jobengine.osgi.server/WEB-INF/zk.xml b/server/user.jobengine.osgi.server/WEB-INF/zk.xml index 39a19736..f8e45c0e 100644 --- a/server/user.jobengine.osgi.server/WEB-INF/zk.xml +++ b/server/user.jobengine.osgi.server/WEB-INF/zk.xml @@ -22,14 +22,14 @@ - - Monitor the statistic - org.zkoss.zk.ui.util.Statistic - - - ZK performance monitor - org.zkoss.performance.monitor.PerformanceMeter - + + + + + + + + user.jobengine.zk.util.DesktopCleanupListener diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/AsyncBaseModel.java b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/AsyncBaseModel.java index 7b1596eb..366a8d14 100644 --- a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/AsyncBaseModel.java +++ b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/AsyncBaseModel.java @@ -11,7 +11,7 @@ public class AsyncBaseModel extends BaseModel { private List uiTasks = new ArrayList<>(); - protected void NotifyChange(String... names) { + protected void notifyChange(String... names) { List nameList = Arrays.asList(names); nameList.forEach(name -> BindUtils.postNotifyChange(null, null, this, name)); } diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/JobListModel.java b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/JobListModel.java index a5a85e60..19aaf9b7 100644 --- a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/JobListModel.java +++ b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/JobListModel.java @@ -143,14 +143,14 @@ public class JobListModel extends AsyncBaseModel implements IJobChangedListener private void onJobCreated(IJobRuntime job) { jobList.add(job); - NotifyChange("jobList"); + notifyChange("jobList"); } private void onJobDeleted(IJobRuntime job) { // selectedJobs.remove(job); // NotifyChange("selectedJobs"); jobList.remove(job); - NotifyChange("jobList"); + notifyChange("jobList"); } private void onJobUpdated(IJobRuntime job) { @@ -217,12 +217,12 @@ public class JobListModel extends AsyncBaseModel implements IJobChangedListener public void setShutdownDisabled(boolean shutdownDisabled) { this.shutdownDisabled = shutdownDisabled; - NotifyChange("shutdownDisabled"); + notifyChange("shutdownDisabled"); } public void setStartupDisabled(boolean startupDisabled) { this.startupDisabled = startupDisabled; - NotifyChange("startupDisabled"); + notifyChange("startupDisabled"); } @Command diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/MissingMaterialsModel.java b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/MissingMaterialsModel.java index ba744c56..f154acf1 100644 --- a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/MissingMaterialsModel.java +++ b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/MissingMaterialsModel.java @@ -213,7 +213,7 @@ public class MissingMaterialsModel extends AsyncBaseModel implements IJobChanged public void setImportDisabled(boolean importDisabled) { this.importDisabled = importDisabled; - NotifyChange(IMPORT_DISABLED); + notifyChange(IMPORT_DISABLED); } public void setJobList(ListModelList jobList) { diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/SearchModel.java b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/SearchModel.java index dcf7fd59..93fb1c0a 100644 --- a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/SearchModel.java +++ b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/SearchModel.java @@ -198,7 +198,7 @@ public class SearchModel extends AsyncBaseModel { orderBy = columnHeaders.get(column.getLabel()); orderAscending = evt.isAscending(); doSearch(); - NotifyChange("searchResult", "selectedObject", "hasLowresMediaFile", "lowresMediaFilePath"); + notifyChange("searchResult", "selectedObject", "hasLowresMediaFile", "lowresMediaFilePath"); evt.stopPropagation(); } @@ -481,7 +481,7 @@ public class SearchModel extends AsyncBaseModel { registerTask(() -> { allChecked = check[0]; - NotifyChange("allChecked"); + notifyChange("allChecked"); }); } } -- 2.54.0