git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube...

diff --git a/server/user.jobengine.osgi.server/WEB-INF/zk.xml b/server/user.jobengine.osgi.server/WEB-INF/zk.xml
index 39a1973633a9b7c01e1a04a4e23a57c748d09945..f8e45c0e5ea44df6d77024ad45ee8ffbed5b177e 100644 (file)
--- a/server/user.jobengine.osgi.server/WEB-INF/zk.xml
+++ b/server/user.jobengine.osgi.server/WEB-INF/zk.xml
@@ -22,14 +22,14 @@
 <!--   <listener> -->\r
 <!--       <listener-class>user.jobengine.zk.util.LogEventInterceptor</listener-class> -->\r
 <!--   </listener>      -->\r
-       <listener>\r
-        <description>Monitor the statistic</description>\r
-        <listener-class>org.zkoss.zk.ui.util.Statistic</listener-class>\r
-    </listener>\r
-    <listener>\r
-       <description>ZK performance monitor</description>\r
-       <listener-class>org.zkoss.performance.monitor.PerformanceMeter</listener-class>\r
-    </listener>\r
+<!--   <listener> -->\r
+<!--         <description>Monitor the statistic</description> -->\r
+<!--         <listener-class>org.zkoss.zk.ui.util.Statistic</listener-class> -->\r
+<!--     </listener> -->\r
+<!--     <listener> -->\r
+<!--           <description>ZK performance monitor</description> -->\r
+<!--           <listener-class>org.zkoss.performance.monitor.PerformanceMeter</listener-class> -->\r
+<!--     </listener> -->\r
        <listener>\r
                <listener-class>user.jobengine.zk.util.DesktopCleanupListener</listener-class>\r
        </listener>\r

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 7b1596eb10999c30cabc0e3f9ccd708b2bb83bc1..366a8d14e35e45594f50643f4c427230341ad71f 100644 (file)
--- 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 {
 \r
        private List<UITask> uiTasks = new ArrayList<>();\r
 \r
-       protected void NotifyChange(String... names) {\r
+       protected void notifyChange(String... names) {\r
                List<String> nameList = Arrays.asList(names);\r
                nameList.forEach(name -> BindUtils.postNotifyChange(null, null, this, name));\r
        }\r

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 a5a85e604dfcc107c1ad03758ea61a8d4cfc7a1b..19aaf9b71396edfd3212cc2d10ea6d5a5381105a 100644 (file)
--- 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
 \r
        private void onJobCreated(IJobRuntime job) {\r
                jobList.add(job);\r
-               NotifyChange("jobList");\r
+               notifyChange("jobList");\r
        }\r
 \r
        private void onJobDeleted(IJobRuntime job) {\r
                //              selectedJobs.remove(job);\r
                //              NotifyChange("selectedJobs");\r
                jobList.remove(job);\r
-               NotifyChange("jobList");\r
+               notifyChange("jobList");\r
        }\r
 \r
        private void onJobUpdated(IJobRuntime job) {\r
@@ -217,12 +217,12 @@ public class JobListModel extends AsyncBaseModel implements IJobChangedListener
 \r
        public void setShutdownDisabled(boolean shutdownDisabled) {\r
                this.shutdownDisabled = shutdownDisabled;\r
-               NotifyChange("shutdownDisabled");\r
+               notifyChange("shutdownDisabled");\r
        }\r
 \r
        public void setStartupDisabled(boolean startupDisabled) {\r
                this.startupDisabled = startupDisabled;\r
-               NotifyChange("startupDisabled");\r
+               notifyChange("startupDisabled");\r
        }\r
 \r
        @Command\r

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 ba744c56f51bfb4d9a922ff69b90b1b3441d0f05..f154acf1ca9007e2921493d651fc5112ddd8ea32 100644 (file)
--- 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
 \r
        public void setImportDisabled(boolean importDisabled) {\r
                this.importDisabled = importDisabled;\r
-               NotifyChange(IMPORT_DISABLED);\r
+               notifyChange(IMPORT_DISABLED);\r
        }\r
 \r
        public void setJobList(ListModelList<BasicDBObject> jobList) {\r

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 dcf7fd596e40879181539ddd86a0f81487b75c01..93fb1c0ab887a9fd02322d46bbdf69b63a4d1b60 100644 (file)
--- 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());\r
                orderAscending = evt.isAscending();\r
                doSearch();\r
-               NotifyChange("searchResult", "selectedObject", "hasLowresMediaFile", "lowresMediaFilePath");\r
+               notifyChange("searchResult", "selectedObject", "hasLowresMediaFile", "lowresMediaFilePath");\r
 \r
                evt.stopPropagation();\r
        }\r
@@ -481,7 +481,7 @@ public class SearchModel extends AsyncBaseModel {
 \r
                registerTask(() -> {\r
                        allChecked = check[0];\r
-                       NotifyChange("allChecked");\r
+                       notifyChange("allChecked");\r
                });\r
        }\r
 }\r