From: Omar Sweidan <omar.sweidan@userrendszerhaz.hu>
Date: Fri, 6 May 2022 13:22:48 +0000 (+0200)
Subject: feladat megoldva
X-Git-Url: http://git.useribm.hu/?a=commitdiff_plain;h=66cdfe04385cdf01e052d13accf4fff98aecc666;p=mediacube.git

feladat megoldva
---

diff --git a/server/user.jobengine.osgi.commons/src/user/commons/nosql/NoSQLUtils.java b/server/user.jobengine.osgi.commons/src/user/commons/nosql/NoSQLUtils.java
index 3e16b64e..7c128a10 100644
--- a/server/user.jobengine.osgi.commons/src/user/commons/nosql/NoSQLUtils.java
+++ b/server/user.jobengine.osgi.commons/src/user/commons/nosql/NoSQLUtils.java
@@ -155,16 +155,24 @@ public class NoSQLUtils {
 	 * 
 	 * @param source a BasicDBObject to be deep-copied
 	 */
-	public static void /* BasicDBObject */ deepCopy(BasicDBObject source, BasicDBObject target) {
-//		BasicDBObject target = new BasicDBObject();
+	public static BasicDBObject deepCopy(BasicDBObject source) {
 		HashMap<String, Object> sourceAsMap = (HashMap<String, Object>) source.toMap();
-
+		BasicDBObject target= new BasicDBObject();
+		 
 		for (HashMap.Entry<String, Object> entry : sourceAsMap.entrySet()) {
 			String key = entry.getKey();
 			Object val = entry.getValue();
+			if(val instanceof BasicDBList) {
+				List<BasicDBObject> listval= asList((BasicDBList) val);
+				val= new BasicDBList();
+				
+				for (BasicDBObject innerObject : listval) {
+					((BasicDBList) val).add(deepCopy(innerObject));
+				}
+			}
 			target.put(key, val);
 		}
-
-//		return target;
+		
+		return target;
 	}
 }
diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/server/IJobEngineConfiguration.java b/server/user.jobengine.osgi.server/src/user/jobengine/server/IJobEngineConfiguration.java
index f0a9c9de..31b3337c 100644
--- a/server/user.jobengine.osgi.server/src/user/jobengine/server/IJobEngineConfiguration.java
+++ b/server/user.jobengine.osgi.server/src/user/jobengine/server/IJobEngineConfiguration.java
@@ -39,11 +39,11 @@ public interface IJobEngineConfiguration {
 
 	void saveTemplateXml(JobTemplate jobTemplate) throws ParserConfigurationException;
 
-	void saveSchedulesJson() throws Exception;
+	void saveSchedulesJson(BasicDBObject originalJob, BasicDBObject newJob) throws Exception;
 
 	void resetStepClassLoader();
 
-	void duplicateTemplate(String originalTemplateName);
+	String duplicateTemplate(BasicDBObject selectedJob);
 
 	boolean scheduleExists(String name);
 
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 9f3a83bc..ccae13d4 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
@@ -380,40 +380,24 @@ public class JobEngineConfiguration implements IJobEngineConfiguration {
 	}
 
 	@Override
-	public void saveSchedulesJson() throws Exception {
+	public void saveSchedulesJson(BasicDBObject originalJob, BasicDBObject newJob) throws Exception {
 		logger.info("saveSchedulesJson()");
 
 		Path schedulesPath = null;
 		try {
 			schedulesPath = Paths.get(systemConfig.getConfig(CONF_SCHEDULES));
-//			if (!Files.exists(schedulesPath)) {
-//				Files.createFile(schedulesPath);
-//			}
 			if (Files.isDirectory(schedulesPath))
 				throw new FileNotFoundException(schedulesPath + " is a directory!");
 			logger.info("Saving schedules.json to {}", schedulesPath);
-			BasicDBObject dbo = new BasicDBObject();
-			BasicDBList jobList = new BasicDBList();
-			for (int i = 0; i < schedules.size(); i++) {
-				BasicDBObject temp = schedules.get(i).getValue();
-				temp.remove("xml");
-				jobList.add(temp);
-			}
-			dbo.put("joblist", jobList);
-			if (Files.isWritable(schedulesPath)) {
-				logger.info("{} is writable", schedulesPath);
-			} else {
-				logger.info("{} was not writable", schedulesPath);
-				DosFileAttributeView dos = Files.getFileAttributeView(schedulesPath, DosFileAttributeView.class);
-				if (dos != null) {
-					try {
-						dos.setReadOnly(false);
-						logger.info("{} is writable");
-					} catch (IOException e) {
-						logger.info("IOException: {}", e.getCause());
-					}
+			for (int i = 0; i < getSchedules().size(); i++) {
+				BasicDBObject value = getSchedules().get(i).getValue();
+				if (value.equals(originalJob)) {
+					getSchedules().get(i).setValue(newJob);
+					break;
 				}
 			}
+			BasicDBObject dbo = assembleSchedulesJson();
+			setFileAsWritable(schedulesPath);
 			Files.write(schedulesPath, dbo.toPrettyString("").getBytes());
 		} catch (FileNotFoundException e) {
 			logger.error("File not found: {}", CONF_SCHEDULES);
@@ -422,6 +406,43 @@ public class JobEngineConfiguration implements IJobEngineConfiguration {
 		}
 	}
 
+	private BasicDBObject assembleSchedulesJson() {
+		BasicDBObject dbo = new BasicDBObject();
+		BasicDBList jobList = new BasicDBList();
+		for (int i = 0; i < schedules.size(); i++) {
+			BasicDBObject temp = schedules.get(i).getValue();
+			temp.remove("xml");
+			temp.remove("nextTime");
+			if(temp.get("active") == null) {
+				temp.remove("active");
+			}
+			if(temp.get("executeimmediate") == null) {
+				temp.remove("executeimmediate");
+			}
+			jobList.add(temp);
+		}
+		dbo.put("joblist", jobList);
+		
+		return dbo;
+	}
+
+	private void setFileAsWritable(Path schedulesPath) {
+		if (Files.isWritable(schedulesPath)) {
+			logger.info("{} is writable", schedulesPath);
+		} else {
+			logger.info("{} was not writable", schedulesPath);
+			DosFileAttributeView dos = Files.getFileAttributeView(schedulesPath, DosFileAttributeView.class);
+			if (dos != null) {
+				try {
+					dos.setReadOnly(false);
+					logger.info("{} is now writable");
+				} catch (IOException e) {
+					logger.info("IOException: {}", e.getCause());
+				}
+			}
+		}
+	}
+
 	@Override
 	public void saveTemplateXml(JobTemplate templateToSave) {
 		logger.info("saveTemplateXml()");
@@ -485,34 +506,30 @@ public class JobEngineConfiguration implements IJobEngineConfiguration {
 	}
 
 	@Override
-	public void duplicateTemplate(String originalTemplateName) {
+	public String duplicateTemplate(BasicDBObject selectedJob) {
 		logger.info("duplicateTemplate()");
-		if (originalTemplateName == null) {
-			throw new NullPointerException("originalTemplateName == null");
-		}
 
 		Path templatesPath = null;
 		String filePath = null;
 		String duplicateFileName = null;
 		try {
 			templatesPath = Paths.get(systemConfig.getConfig(DIR_TEMPLATES));
-			if (!Files.isDirectory(templatesPath))
-				throw new FileNotFoundException(templatesPath + " is not a directory!");
-			duplicateFileName = FilenameUtils.getName(originalTemplateName).replace(".xml", "").concat("-copy.xml");
+			duplicateFileName = FilenameUtils.getName(selectedJob.getString("template")).replace(".xml", "").concat("-copy.xml");
 			filePath = templatesPath.toString() + FileSystems.getDefault().getSeparator() + duplicateFileName;
 			while (Files.exists(Paths.get(filePath))) {
 				duplicateFileName = FilenameUtils.getName(duplicateFileName).replace(".xml", "").concat("-copy.xml");
 				filePath = templatesPath.toString() + FileSystems.getDefault().getSeparator() + duplicateFileName;
 			}
 			InputStream is = new FileInputStream(
-					templatesPath.toString() + FileSystems.getDefault().getSeparator() + originalTemplateName);
+					templatesPath.toString() + FileSystems.getDefault().getSeparator() + selectedJob.getString("template"));
 			Files.copy(is, Paths.get(filePath));
 		} catch (FileNotFoundException e) {
 			logger.error("File not found: {}", filePath);
 		} catch (IOException e) {
 			logger.error("IOException: {}", e.getCause());
 		}
-
+		return duplicateFileName;
+		
 	}
 
 	@Override
diff --git a/server/user.mediacube.gui/pages/jobeditor2.zul b/server/user.mediacube.gui/pages/jobeditor2.zul
index 2cc73997..4f9e2dc1 100644
--- a/server/user.mediacube.gui/pages/jobeditor2.zul
+++ b/server/user.mediacube.gui/pages/jobeditor2.zul
@@ -13,11 +13,9 @@
 		<toolbar>
 			<toolbarbutton label="Futtatás" iconSclass="z-icon-play" onClick="@command('execute')" 
 				disabled="${not sessionScope.userPrincipal.admin}" autodisable="self" />
-			<toolbarbutton label="scheduledjobs.json mentése" id="SaveScheduleButton" iconSclass="z-icon-save" onClick="@command('saveSchedulesJson')" />
-			<toolbarbutton label="folyamatsablon mentése" id="SaveTemplateButton" iconSclass="z-icon-save" onClick="@command('saveJobTemplate')" />
-			<toolbarbutton label="folyamat duplikálása" id="DuplicateTemplateButton" onClick="@command('duplicateTemplate')" />
-			<toolbarbutton label="folyamat bejegyzés másolása" id="CopyProcessButton" onClick="@command('copyProcessEntry')" />
-			<toolbarbutton label="Újratöltés" id="reloadButton" iconSclass="z-icon-rotate-right" onClick="@command('reload')" />
+			<toolbarbutton label="Duplikálás" iconSclass="z-icon-copy" onClick="@command('duplicateProcessEntry')" />
+			<toolbarbutton label="Másolás" id="CopyProcessButton" iconSclass="z-icon-copy" onClick="@command('copyProcessEntry')" />
+			<toolbarbutton label="Újratöltés" iconSclass="z-icon-dot-circle-o" onClick="@command('reload')" autodisable="self"/>
 		</toolbar>
 		<borderlayout vflex="true">
 			<center border="none" vflex="true">
@@ -41,53 +39,54 @@
 						<tabs visible="true">
 							<tab id="tab0" label="Paraméterek" selected="true" />
 							<tab id="tab1" label="Részletek" />
-<!-- 							<tab id="tab2" label="Ábra" /> -->
 						</tabs>
 						<tabpanels>
 							<tabpanel>
-								<borderlayout>
-									<north size="50%" splittable="true">
-										<grid visible="@bind(not empty jem2.selectedJob)" sizedByContent="false" span="true" vflex="true"
-											style="border: none; background: #e3e3e3 !important;" oddRowSclass="listbox-odd-style" 
-											sclass="listbox-normal-style"
-											emptyMessage="A részletek megtekintéséhez jelöljön ki egy folyamatot.">
-											<columns>
-												<column hflex="min"/>
-												<column hflex="true"/>
-											</columns>
-											<rows>
-												<row>
-													<label value="Name"/>
-													<textbox value="@bind(jem2.selectedJob.name)"/>
-												</row>
-												<row>
-													<label value="Template"/>
-													<label value="@load(jem2.selectedJob.template)" />
-												</row>
-												<row>
-													<label value="Active" />
-													<checkbox disabled="true" value="@bind(empty jem2.selectedJob.active ? false : jem2.selectedJob.active)" 
-														onClick="@command('onActiveClicked')" id="ActiveCheckbox"/>
-												</row>
-												<row>
-													<label value="Execute immediate"/>
-													<checkbox disabled="true" value="@bind(empty jem2.selectedJob.executeimmediate ? false : jem2.selectedJob.executeimmediate)" 
-														onClick="@command('onExecuteImmediateClicked')" id="ExecuteImmediateCheckbox"/>
-												</row>
-												<row>
-													<label value="Cron expression"/>
-													<textbox value="@bind(jem2.selectedJob.cronexpression)"/>
-												</row>
-												<row>
-													<label value="Next execution"/>
-													<label value="@bind(jem2.selectedJob.nextTime)"/>
-												</row>
-											</rows>
-										</grid>
-									</north>
-									<center border="none" flex="true">
-										<grid model="@load(jem2.selectedJob.parameters)" style="border: none; background: #e3e3e3 !important;"
-											oddRowSclass="listbox-odd-style" sclass="listbox-normal-style">
+								<vlayout vflex="true" hflex="true">
+									<grid visible="@bind(not empty jem2.editingJob)" sizedByContent="false" span="true" 
+										style="border: none; background: #e3e3e3 !important;" oddRowSclass="listbox-odd-style" 
+										sclass="listbox-normal-style"
+										emptyMessage="A részletek megtekintéséhez jelöljön ki egy folyamatot.">
+										<columns>
+											<column hflex="min"/>
+											<column hflex="true"/>
+										</columns>
+										<rows>
+											<row>
+												<label value="Name"/>
+												<textbox value="@bind(jem2.editingJob.name)"/>
+											</row>
+											<row>
+												<label value="Template"/>
+												<label value="@load(jem2.editingJob.template)" />
+											</row>
+											<row>
+												<label value="Active" />
+												<checkbox disabled="true" value="@bind(empty jem2.editingJob.active ? false : jem2.editingJob.active)" 
+													onClick="@command('onActiveClicked')" id="ActiveCheckbox"/>
+											</row>
+											<row>
+												<label value="Execute immediate"/>
+												<checkbox disabled="true" value="@bind(empty jem2.editingJob.executeimmediate ? false : jem2.editingJob.executeimmediate)" 
+													onClick="@command('onExecuteImmediateClicked')" id="ExecuteImmediateCheckbox"/>
+											</row>
+											<row>
+												<label value="Cron expression"/>
+												<textbox value="@bind(jem2.editingJob.cronexpression)"/>
+											</row>
+											<row>
+												<label value="Next execution"/>
+												<label value="@bind(jem2.editingJob.nextTime)"/>
+											</row>
+										</rows>
+									</grid>
+									<toolbar>
+										<toolbarbutton id="NewParameterButton" label="Új paraméter" onClick="@command('onNewParameterClicked')"
+											iconSclass="z-icon-plus"/>
+									</toolbar>
+									<vlayout hflex="true" vflex="true" style="overflow: auto !important;">
+										<grid model="@load(jem2.editingJob.parameters)" style="border: none; background: #e3e3e3 !important;"
+											oddRowSclass="listbox-odd-style"  sclass="listbox-normal-style">
 											<columns sizable="true">
 												<column label="Name" hflex="4"/>
 												<column label="Value" hflex="9"/>
@@ -105,29 +104,18 @@
 															</template>
 														</combobox>
 														<button iconSclass="z-icon-trash-o" onClick="@command('onParameterDelete', toBeDeleted=each)" />
-<!-- 														<label value="@load(each.name)" /> -->
-<!-- 														<label value="@load(each.value)" /> -->
-<!-- 														<label value="@load(each.type)" /> -->
 													</row>
 												</template>
 											</rows>
 										</grid>
-									</center>
-									<south>
-										<hlayout>
-											<button id="SaveButton" label="Save" onClick="@command('saveButtonClicked')" />
-											<button id="NewParameterButton" label="Új paraméter" onClick="@command('onNewParameterClicked')"/>
-										</hlayout>
-									</south>
-								</borderlayout>
+									</vlayout>
+									<button label="Save" onClick="@command('saveData')" />
+								</vlayout>
 							</tabpanel>
 							<tabpanel>
 								<label height="100%" ca:data-syntax-highlight="true" multiline="true" pre="true" 
-									value="@bind(jem2.selectedJob['xml'])" />
+									value="@bind(jem2.editingJob['xml'])" />
 							</tabpanel>
-<!-- 							<tabpanel> -->
-<!-- 								<include src="pages/processVisualizer2.zul" /> -->
-<!-- 							</tabpanel> -->
 						</tabpanels>
 					</tabbox>
 				</vlayout>
diff --git a/server/user.mediacube.gui/pages/joblist.zul b/server/user.mediacube.gui/pages/joblist.zul
index d5ff08f8..50a823c1 100644
--- a/server/user.mediacube.gui/pages/joblist.zul
+++ b/server/user.mediacube.gui/pages/joblist.zul
@@ -37,7 +37,6 @@
 				 autodisable="self"/>
 			<toolbarbutton label="Elindítás" iconSclass="z-icon-level-up" onClick="@command('startup')" disabled="@load(jlm.startupDisabled)" 
 				autodisable="self"/>
-			<toolbarbutton label="Újratöltés" iconSclass="z-icon-dot-circle-o" onClick="@command('reload')" autodisable="self"/>
 			<separator orient="vertical"/>
 			<toolbarbutton label="Takarítás" iconSclass="z-icon-eraser" onClick="@command('cleanupSuspended')" autodisable="self"/>
 			<separator orient="vertical"/>
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 9f66d777..3070cbd8 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
@@ -318,7 +318,7 @@ public class JobEditorModel extends BaseModel {
 	public void saveSchedule() throws Exception {
 		if (selectedJob != null && isProcessDataChanged()) {
 			BasicDBObject scheduleToSave = collectProcessScheduleSettings();
-			jobEngine.getJobEngineConfiguration().saveSchedulesJson();
+			jobEngine.getJobEngineConfiguration().saveSchedulesJson(scheduleToSave, scheduleToSave);
 		}
 	}
 
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 187dc0fe..bd2dbb6a 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
@@ -6,8 +6,7 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Date;
 import java.util.List;
-
-import javax.xml.parsers.ParserConfigurationException;
+import java.util.Map.Entry;
 
 import org.apache.commons.lang.StringUtils;
 import org.apache.logging.log4j.LogManager;
@@ -38,10 +37,7 @@ import user.commons.nosql.NoSQLUtils;
 import user.jobengine.gui.ComponentBinder;
 import user.jobengine.server.IJobEngine;
 import user.jobengine.server.IJobRuntime;
-import user.jobengine.server.ast.JobTemplate;
-import user.jobengine.server.ast.ParameterDeclaration;
 import user.jobengine.server.scheduler.ScheduledJob;
-import user.jobengine.server.scheduler.SchedulerService;
 
 public class JobEditorModel2 extends BaseModel {
 	private static final String XML = "xml";
@@ -51,44 +47,21 @@ public class JobEditorModel2 extends BaseModel {
 	private static final String CRONEXPRESSION = "cronexpression";
 	@Wire("#resultWin")
 	private Window resultWin;
-	@Wire("#SaveButton")
-	private Button saveButton;
 	@Wire("#ActiveCheckbox")
 	private Checkbox activeCheckbox;
 	@Wire("#ExecuteImmediateCheckbox")
 	private Checkbox executeImmediateCheckbox;
 	@Wire("#NewParameterButton")
 	private Button NewParameterButton;
-	private boolean processDataChanged = false;
 	private IJobEngine jobEngine;
 	private ListModelList<BasicDBObject> jobs = new ListModelList<>();
 
 	private BasicDBObject selectedJob = new BasicDBObject();
 	private BasicDBObject editingJob = new BasicDBObject();
 	private ListModelList<BasicDBObject> selectedJobs;
-//	private ChangeValidator changeValidator = new ChangeValidator(this);
-//	private TemplateNameValidator templateNameValidator = new TemplateNameValidator(this);
-//	private CronExpressionValidator cronExpressionValidator = new CronExpressionValidator(this);
-//	private ParameterNameValidator parameterNameValidator = new ParameterNameValidator(this);
-//	private ParameterTypeValidator parameterTypeValidator = new ParameterTypeValidator(this);
-//	private ParameterValueValidator parameterValueValidator = new ParameterValueValidator(this);
-	private String originalJobName;
-	private boolean changedSinceLastSave = false;
-	private boolean parameterTypeChanged = false;
-	private boolean parameterNameChanged = false;
-	private boolean jobsListModified;
-	private BasicDBObject originalJob = new BasicDBObject();
 	private ArrayList<String> dataTypes = new ArrayList<String>();
 	private int numberOfNewParams = 1;
 
-	public BasicDBObject getOriginalJob() {
-		return originalJob;
-	}
-
-	public void setOriginalJob(BasicDBObject originalJob) {
-		this.originalJob = originalJob;
-	}
-
 	@AfterCompose
 	public void afterCompose(@ContextParam(ContextType.VIEW) Component view) {
 		Selectors.wireComponents(view, this, false);
@@ -118,52 +91,33 @@ public class JobEditorModel2 extends BaseModel {
 	}
 
 	@Command
-	public void saveButtonClicked() {
-//		if (processDataChanged) {
-//			setChangedSinceLastSave(true);
-//			setSelectedJob(editingJob);
-//		setJobsListModified(true);
-		saveData();
-//		}
-//		processDataChanged = false;
-//		saveButton.setDisabled(true);
-	}
-
-	@NotifyChange("selectedJob")
-	@Command
+	@NotifyChange("editingJob")
 	public void onNewParameterClicked() {
 		logger.info("onNewParameterClicked()");
-		((BasicDBList) selectedJob.get("parameters")).add(new BasicDBObject()
-				.append("name", "param".concat(String.valueOf(numberOfNewParams)))
-				.append("value", "default".concat(String.valueOf(numberOfNewParams))).append("type", dataTypes.get(8)));
-		numberOfNewParams++;
+		if(editingJob != null) {
+			((BasicDBList) editingJob.get("parameters")).add(new BasicDBObject()
+					.append("name", "param".concat(String.valueOf(numberOfNewParams)))
+					.append("type", dataTypes.get(8)));
+			numberOfNewParams++;
+		}
 	}
 
-	@NotifyChange("selectedJob")
 	@Command
+	@NotifyChange("editingJob")
 	public void onParameterDelete(@BindingParam("toBeDeleted") BasicDBObject toBeDeleted) {
 		logger.info("onParameterDelete(toBeDeleted)");
-		((BasicDBList) selectedJob.get("parameters")).remove(toBeDeleted);
+		((BasicDBList) editingJob.get("parameters")).remove(toBeDeleted);
 	}
 
-	private void saveData() {
+	@Command
+	@NotifyChange({"editingJob", "jobs", "selectedJob"})
+	public void saveData() {
 		logger.info("saveData()");
-//		NoSQLUtils.deepCopy(editingJob, selectedJob);		
-		for (int i = 0; i < jobEngine.getJobEngineConfiguration().getSchedules().size(); i++) {
-			if (jobEngine.getJobEngineConfiguration().getSchedules().get(i).getValue().get("name")
-					.equals(originalJobName)) {
-				jobEngine.getJobEngineConfiguration().getSchedules().get(i).getValue().put("name",
-						selectedJob.get("name"));
-				jobEngine.getJobEngineConfiguration().getSchedules().get(i).getValue().put("cronexpression",
-						selectedJob.get("cronexpression"));
-				jobEngine.getJobEngineConfiguration().getSchedules().get(i).getValue().put("active",
-						selectedJob.get("active"));
-				jobEngine.getJobEngineConfiguration().getSchedules().get(i).getValue().put("executeimmediate",
-						selectedJob.get("executeimmediate"));
-				((BasicDBList) jobEngine.getJobEngineConfiguration().getSchedules().get(i).getValue().get("parameters"))
-						.putAll((BasicDBList) selectedJob.get("parameters"));
-				originalJobName = selectedJob.getString("name");
-			}
+				
+		try {
+			jobEngine.getJobEngineConfiguration().saveSchedulesJson(selectedJob, editingJob);
+		} catch (Exception e) {
+			logger.info("Exception: {}", e.getMessage());
 		}
 	}
 
@@ -187,23 +141,41 @@ public class JobEditorModel2 extends BaseModel {
 	public BasicDBObject getEditingJob() {
 		return editingJob;
 	}
+	
+	@NotifyChange("editingJob")
+	public void setEditingJob(BasicDBObject editingJob) {
+		logger.info("setEditingJob()");
+		this.editingJob= editingJob;
+		if(editingJob == null) {
+			return;
+		}
+		updateNextExecutionTime(editingJob);
+	}
 
+	@NotifyChange({"editingJob", "selectedJob"})
 	public void setSelectedJob(BasicDBObject selectedJob) {
-		this.selectedJob = selectedJob;
-		if (selectedJob != null) {
-			setOriginalJobName(selectedJob.getString("name"));
-			NoSQLUtils.deepCopy(selectedJob, originalJob);
-			String cronExpression = selectedJob.getString(CRONEXPRESSION);
-			if (StringUtils.isBlank(cronExpression))
-				return;
-
-			try {
-				CronExpression ce = new CronExpression(cronExpression);
-				Date nextTime = ce.getNextValidTimeAfter(new Date());
-				selectedJob.put(NEXT_TIME, nextTime);
-			} catch (ParseException e) {
-				logger.catching(e);
-			}
+		logger.info("setSelectedJob()");
+		if (selectedJob == null) {
+			this.selectedJob = null;
+			this.editingJob = null;
+			return;
+		}
+
+		this.selectedJob= selectedJob;
+		this.editingJob= NoSQLUtils.deepCopy(selectedJob);
+	}
+
+	private void updateNextExecutionTime(BasicDBObject selectedJob) {
+		String cronExpression = selectedJob.getString(CRONEXPRESSION);
+		if (StringUtils.isBlank(cronExpression))
+			return;
+
+		try {
+			CronExpression ce = new CronExpression(cronExpression);
+			Date nextTime = ce.getNextValidTimeAfter(new Date());
+			selectedJob.put(NEXT_TIME, nextTime);
+		} catch (ParseException e) {
+			logger.catching(e);
 		}
 	}
 
@@ -215,27 +187,9 @@ public class JobEditorModel2 extends BaseModel {
 		return selectedJobs;
 	}
 
-	public boolean isProcessDataChanged() {
-		return processDataChanged;
-	}
-
-	public void setProcessDataChanged(boolean processDataChanged) {
-		this.processDataChanged = processDataChanged;
-	}
-
 	@Init
 	public void init() {
-		dataTypes.add("java.lang.Byte");
-		dataTypes.add("java.lang.Short");
-		dataTypes.add("java.lang.Integer");
-		dataTypes.add("java.lang.Long");
-		dataTypes.add("java.lang.Float");
-		dataTypes.add("java.lang.Double");
-		dataTypes.add("java.lang.Boolean");
-		dataTypes.add("java.lang.Char");
-		dataTypes.add("java.lang.String");
-		dataTypes.add("com.ibm.nosql.json.api.BasicDBList");
-		dataTypes.add("com.ibm.nosql.json.api.BasicDBObject");
+		initializeDataTypes();
 
 		jobEngine = (IJobEngine) Executions.getCurrent().getArg().get("jobEngine");
 		if (jobEngine == null)
@@ -246,13 +200,13 @@ public class JobEditorModel2 extends BaseModel {
 
 	private void initJobList() {
 		setSelectedJob(null);
-		setOriginalJobName(null);
-//		setEditingJob(null);
+		setEditingJob(null);
 		jobs.clear();
 		List<BasicDBObject> jobsCollection = new ArrayList<BasicDBObject>();
 
-		for (int index = 0; index < jobEngine.getJobEngineConfiguration().getSchedules().size(); index++) {
-			jobsCollection.add(jobEngine.getJobEngineConfiguration().getSchedules().get(index).getValue());
+		ArrayList<Entry<String, BasicDBObject>> schedules = jobEngine.getJobEngineConfiguration().getSchedules();
+		for (int index = 0; index < schedules.size(); index++) {
+			jobsCollection.add(schedules.get(index).getValue());
 		}
 
 		Collections.sort(jobsCollection, (a, b) -> {
@@ -268,201 +222,61 @@ public class JobEditorModel2 extends BaseModel {
 	}
 
 	@Command
-	@NotifyChange("jobs")
+	@NotifyChange({"selectedJob", "jobs", "editingJob"})
 	public void reload() {
-		SchedulerService scheduler = jobEngine.getScheduler();
 		try {
-			scheduler.restart();
-			initJobList();
+			jobEngine.reloadGracefully();
 		} catch (Exception e) {
-			logger.info("Scheduler reload error. System message: {}", e.getMessage());
+			Messagebox.show(e.getMessage(), "Hiba!", Messagebox.OK, Messagebox.ERROR);
 		}
-	}
-
-	public void setJobs(ListModelList<BasicDBObject> jobs) {
-		this.jobs = jobs;
-	}
-
-	public void setSelectedJobs(ListModelList<BasicDBObject> selectedJobs) {
-		this.selectedJobs = selectedJobs;
-	}
-
-	@Command
-	public void saveSchedulesJson() throws Exception {
-		logger.info("saveSchedulesJson()");
-//		if (jobsListModified) {
-		jobEngine.getJobEngineConfiguration().saveSchedulesJson();
-//			setJobsListModified(false);
-//		}
+		initJobList();
 	}
 
 	@Command
-	public void saveJobTemplate(JobTemplate template) throws Exception {
-		logger.info("saveJobTemplate()");
-		JobTemplate jt = new JobTemplate();
-
-		try {
-			for (int i = 0; i < jobEngine.getJobEngineConfiguration().getTemplates().size(); i++) {
-				JobTemplate currentTemplate = jobEngine.getJobEngineConfiguration().getTemplates().get(i);
-				if (currentTemplate.getName() != null) {
-					if (currentTemplate.getName().equals(originalJobName)) {
-						jt = currentTemplate;
-					} else if (currentTemplate.getFileName().equals(selectedJob.getString("template"))) {
-						jt = currentTemplate;
-					}
-				} else if (currentTemplate.getFileName() != null) {
-					if (currentTemplate.getFileName().equals(selectedJob.getString("template"))) {
-						jt = currentTemplate;
-					}
-				}
-			}
-
-			if (changedSinceLastSave) {
-				if (parameterNameChanged || parameterTypeChanged) {
-					int j = 0;
-					for (int i = 0; i < jt.getDeclarationSequence().getDeclarations().size(); i++) {
-						String simpleName = jt.getDeclarationSequence().getDeclarations().get(i).getType().getClass()
-								.getSimpleName();
-						if (simpleName.equals("ParameterDeclaration")) {
-							String name = ((BasicDBObject) ((BasicDBList) selectedJob.get("parameters")).get(j))
-									.getString("name");
-							String type = ((BasicDBObject) ((BasicDBList) selectedJob.get("parameters")).get(j))
-									.getString("type");
-							j++;
-							jt.getDeclarationSequence().getDeclarations().set(i, new ParameterDeclaration(name, type));
-						}
-					}
-				}
-
-				if (originalJobName != null) {
-					jt.setName(originalJobName);
+	@NotifyChange("jobs")
+	public void duplicateProcessEntry() {
+		if (selectedJob != null) {
+			String newTemplateName= jobEngine.getJobEngineConfiguration().duplicateTemplate(selectedJob);
+			String newProcessName = copyProcessEntry();
+			List<BasicDBObject> innerList = jobs.getInnerList();
+			
+			for(int i= 0;i < innerList.size(); i++) {
+				BasicDBObject currentElement = innerList.get(i);
+				
+				if(currentElement.get("name").equals(newProcessName)) {
+					currentElement.replace("template", newTemplateName);
+					break;
 				}
-
 			}
-
-			jobEngine.getJobEngineConfiguration().saveTemplateXml(jt);
-		} catch (ParserConfigurationException e) {
-			logger.info("ParserConfigurationException: {}", e.getCause());
 		}
 	}
-
-	@Command
-	public void duplicateTemplate() {
-//		if (editingJob != null) {
-		jobEngine.getJobEngineConfiguration().duplicateTemplate(selectedJob.getString("template"));
-//		}
-	}
-
+	
 	@Command
 	@NotifyChange("jobs")
-	public void copyProcessEntry() {
-		logger.info("copyScheduleEntry()");
-//		if (editingJob != null) {
-//		String newName = editingJob.getString("name").concat("-copy");
-		String newName = selectedJob.getString("name").concat("-copy");
-		while (jobEngine.getJobEngineConfiguration().scheduleExists(newName)) {
-			newName = newName.concat("-copy");
+	public String copyProcessEntry() {
+		logger.info("copyProcessEntry()");
+		
+		String newName= null;
+		if (selectedJob != null) {
+			newName = selectedJob.getString("name").concat("-copy");
+			while (jobEngine.getJobEngineConfiguration().scheduleExists(newName)) {
+				newName = newName.concat("-copy");
+			}
+			BasicDBObject newEntry= NoSQLUtils.deepCopy(selectedJob);
+			newEntry.put("name", newName);
+	
+			jobEngine.getJobEngineConfiguration().getSchedules()
+					.add(new SimpleEntry<String, BasicDBObject>(newName, newEntry));
+			jobs.add(newEntry);
 		}
-		BasicDBObject newEntry = new BasicDBObject();
-//		NoSQLUtils.deepCopy(editingJob, newEntry);
-		NoSQLUtils.deepCopy(selectedJob, newEntry);
-		newEntry.put("name", newName);
-
-		jobEngine.getJobEngineConfiguration().getSchedules()
-				.add(new SimpleEntry<String, BasicDBObject>(newName, newEntry));
-		jobs.add(newEntry);
-		setJobsListModified(true);
-//		}
-	}
-
-//	public CronExpressionValidator getCronExpressionValidator() {
-//		return cronExpressionValidator;
-//	}
-//
-//	public void setCronExpressionValidator(CronExpressionValidator cronExpressionValidator) {
-//		this.cronExpressionValidator = cronExpressionValidator;
-//	}
-
-//	public TemplateNameValidator getTemplateNameValidator() {
-//		return templateNameValidator;
-//	}
-
-//	public ChangeValidator getChangeValidator() {
-//		return changeValidator;
-//	}
-
-//	public ParameterNameValidator getParameterNameValidator() {
-//		return parameterNameValidator;
-//	}
-//
-//	public void setParameterNameValidator(ParameterNameValidator parameterNameValidator) {
-//		this.parameterNameValidator = parameterNameValidator;
-//	}
-//
-//	public ParameterTypeValidator getParameterTypeValidator() {
-//		return parameterTypeValidator;
-//	}
-//
-//	public void setParameterTypeValidator(ParameterTypeValidator parameterTypeValidator) {
-//		this.parameterTypeValidator = parameterTypeValidator;
-//	}
-
-//	public ParameterValueValidator getParameterValueValidator() {
-//		return parameterValueValidator;
-//	}
-//
-//	public void setParameterValueValidator(ParameterValueValidator parameterValueValidator) {
-//		this.parameterValueValidator = parameterValueValidator;
-//	}
-
-	public Button getSaveButton() {
-		return saveButton;
-	}
-
-	public String getOriginalJobName() {
-		return originalJobName;
-	}
-
-	public void setOriginalJobName(String originalJobName) {
-		this.originalJobName = originalJobName;
-	}
-
-	public void setParameterTypeChanged(boolean parameterTypeChanged) {
-		this.parameterTypeChanged = parameterTypeChanged;
-	}
-
-	public void setParameterNameChanged(boolean parameterNameChanged) {
-		this.parameterNameChanged = parameterNameChanged;
-	}
-
-	public boolean isChangedSinceLastSave() {
-		return changedSinceLastSave;
-	}
-
-	public void setChangedSinceLastSave(boolean changedSinceLastSave) {
-		this.changedSinceLastSave = changedSinceLastSave;
-	}
-
-	public boolean isJobsListModified() {
-		return jobsListModified;
-	}
-
-	public void setJobsListModified(boolean jobsListModified) {
-		this.jobsListModified = jobsListModified;
+		
+		return newName;
 	}
 
 	public BasicDBObject getSelectedJob() {
 		return selectedJob;
 	}
 
-//	public void setSelectedJob(BasicDBObject selectedJob) {
-//		this.selectedJob = selectedJob;
-//	}
-
-//	public void setEditingJob(BasicDBObject editingJob) {
-//
-//	}
-
 	public ArrayList<String> getDataTypes() {
 		return dataTypes;
 	}
@@ -470,5 +284,26 @@ public class JobEditorModel2 extends BaseModel {
 	public void setDataTypes(ArrayList<String> dataTypes) {
 		this.dataTypes = dataTypes;
 	}
-
+	
+	public void setJobs(ListModelList<BasicDBObject> jobs) {
+		this.jobs = jobs;
+	}
+	
+	public void setSelectedJobs(ListModelList<BasicDBObject> selectedJobs) {
+		this.selectedJobs = selectedJobs;
+	}
+	
+	private void initializeDataTypes() {
+		dataTypes.add("java.lang.Byte");
+		dataTypes.add("java.lang.Short");
+		dataTypes.add("java.lang.Integer");
+		dataTypes.add("java.lang.Long");
+		dataTypes.add("java.lang.Float");
+		dataTypes.add("java.lang.Double");
+		dataTypes.add("java.lang.Boolean");
+		dataTypes.add("java.lang.Char");
+		dataTypes.add("java.lang.String");
+		dataTypes.add("com.ibm.nosql.json.api.BasicDBList");
+		dataTypes.add("com.ibm.nosql.json.api.BasicDBObject");
+	}
 }
\ No newline at end of file
diff --git a/server/user.mediacube.gui/src/user/jobengine/zk/validator/ChangeValidator.java b/server/user.mediacube.gui/src/user/jobengine/zk/validator/ChangeValidator.java
index f17438c9..69a7f872 100644
--- a/server/user.mediacube.gui/src/user/jobengine/zk/validator/ChangeValidator.java
+++ b/server/user.mediacube.gui/src/user/jobengine/zk/validator/ChangeValidator.java
@@ -24,42 +24,9 @@ public class ChangeValidator extends AbstractValidator {
 		BasicDBObject originalJob = ((BasicDBObject) context.getProperty().getBase());
 		String newValue = (String) context.getProperties("name")[0].getValue();
 		String whichPropertyChanged = context.getProperties("name")[0].getProperty();
-//		BasicDBObject editingJob = ;
-//		if (jobEditorModel2.getSelectedJob().get(whichPropertyChanged).toString().equals(newValue)) {
-//			jobEditorModel2.setChangedSinceLastSave(false);
-
-//		} else {
-
-		NoSQLUtils.deepCopy(originalJob, jobEditorModel2.getEditingJob());
+		jobEditorModel2.setEditingJob(NoSQLUtils.deepCopy(originalJob));
 		jobEditorModel2.getEditingJob().put(whichPropertyChanged, newValue);
-		jobEditorModel2.getEditingJob().remove("nextTime");
-//			if (!jobEditorModel2.isChangedSinceLastSave()) {
-//				jobEditorModel2.setOriginalJobName(originalJobName);
-//			}
-//		}
-		if (jobEditorModel2.getOriginalJob().toString().equals(jobEditorModel2.getEditingJob().toString())) {
-			logger.info("not new");
-			jobEditorModel2.setProcessDataChanged(false);
-			jobEditorModel2.getSaveButton().setDisabled(true);
-		} else {
-			jobEditorModel2.setProcessDataChanged(true);
-//			jobEditorModel2.setChangedSinceLastSave(true);
-			jobEditorModel2.getSaveButton().setDisabled(false);
-			logger.info("new");
-		}
-//		String originalJobName = originalProperty.getString("name");
-//		String newName = (String) context.getProperties("name")[0].getValue();
-
-//		if (originalJobName.equals(newName)) {
-//			logger.info("{} is not a new name", newName);
-//		} else {
-//			logger.info("{} is a new name", newName);
-//			originalProperty.put("name", newName);
-//			if (!jobEditorModel2.isChangedSinceLastSave()) {
-//				jobEditorModel2.setOriginalJobName(originalJobName);
-//			}
-//			jobEditorModel2.setProcessDataChanged(true);
-//			jobEditorModel2.getSaveButton().setDisabled(false);
-//		}
+		
+		//TODO check if value has changed indeed
 	}
 }
diff --git a/server/user.mediacube.gui/src/user/jobengine/zk/validator/CronExpressionValidator.java b/server/user.mediacube.gui/src/user/jobengine/zk/validator/CronExpressionValidator.java
index 0aa0f5ba..3e2f6ded 100644
--- a/server/user.mediacube.gui/src/user/jobengine/zk/validator/CronExpressionValidator.java
+++ b/server/user.mediacube.gui/src/user/jobengine/zk/validator/CronExpressionValidator.java
@@ -28,8 +28,6 @@ public class CronExpressionValidator extends AbstractValidator {
 					&& ifCronExpressionChanged(uneditedJob, newCronExpression)) {
 				logger.info("{} is a valid CRON expression", newCronExpression);
 				uneditedJob.put("cronexpression", newCronExpression);
-				jobEditorModel2.setProcessDataChanged(true);
-				jobEditorModel2.getSaveButton().setDisabled(false);
 			} else {
 				logger.info("{} is not a valid CRON expression", newCronExpression);
 			}
@@ -37,8 +35,6 @@ public class CronExpressionValidator extends AbstractValidator {
 			if (CronExpression.isValidExpression(newCronExpression)) {
 				logger.info("{} is a valid CRON expression", newCronExpression);
 				uneditedJob.put("cronexpression", newCronExpression);
-				jobEditorModel2.setProcessDataChanged(true);
-				jobEditorModel2.getSaveButton().setDisabled(false);
 			} else {
 				logger.info("{} is not a valid CRON expression", newCronExpression);
 			}
diff --git a/server/user.mediacube.gui/src/user/jobengine/zk/validator/ParameterNameValidator.java b/server/user.mediacube.gui/src/user/jobengine/zk/validator/ParameterNameValidator.java
index eeb07ae0..d281bdaf 100644
--- a/server/user.mediacube.gui/src/user/jobengine/zk/validator/ParameterNameValidator.java
+++ b/server/user.mediacube.gui/src/user/jobengine/zk/validator/ParameterNameValidator.java
@@ -25,14 +25,9 @@ public class ParameterNameValidator extends AbstractValidator {
 
 		if (uneditedParameter.getString("name").equals(newParameterName)) {
 			logger.info("{} is not a new parameter name", newParameterName);
-			jobEditorModel2.setProcessDataChanged(false);
-			jobEditorModel2.getSaveButton().setDisabled(true);
 		} else {
 			logger.info("{} is a new parameter name", newParameterName);
 			uneditedParameter.put("name", newParameterName);
-			jobEditorModel2.setProcessDataChanged(true);
-			jobEditorModel2.setParameterNameChanged(true);
-			jobEditorModel2.getSaveButton().setDisabled(false);
 		}
 	}
 }
diff --git a/server/user.mediacube.gui/src/user/jobengine/zk/validator/ParameterTypeValidator.java b/server/user.mediacube.gui/src/user/jobengine/zk/validator/ParameterTypeValidator.java
index 50fee488..38263d7f 100644
--- a/server/user.mediacube.gui/src/user/jobengine/zk/validator/ParameterTypeValidator.java
+++ b/server/user.mediacube.gui/src/user/jobengine/zk/validator/ParameterTypeValidator.java
@@ -25,14 +25,9 @@ public class ParameterTypeValidator extends AbstractValidator {
 
 		if (uneditedParameter.getString("type").equals(newParameterType)) {
 			logger.info("{} is not a new parameter type", newParameterType);
-			jobEditorModel2.setProcessDataChanged(false);
-			jobEditorModel2.getSaveButton().setDisabled(true);
 		} else {
 			logger.info("{} is a new parameter type", newParameterType);
 			uneditedParameter.put("type", newParameterType);
-			jobEditorModel2.setProcessDataChanged(true);
-			jobEditorModel2.setParameterTypeChanged(true);
-			jobEditorModel2.getSaveButton().setDisabled(false);
 		}
 	}
 }
diff --git a/server/user.mediacube.gui/src/user/jobengine/zk/validator/ParameterValueValidator.java b/server/user.mediacube.gui/src/user/jobengine/zk/validator/ParameterValueValidator.java
index 711e561c..d15832b2 100644
--- a/server/user.mediacube.gui/src/user/jobengine/zk/validator/ParameterValueValidator.java
+++ b/server/user.mediacube.gui/src/user/jobengine/zk/validator/ParameterValueValidator.java
@@ -25,13 +25,9 @@ public class ParameterValueValidator extends AbstractValidator {
 
 		if (uneditedParameter.getString("value").equals(newParameterValue)) {
 			logger.info("{} is not a new parameter value", newParameterValue);
-			jobEditorModel2.setProcessDataChanged(false);
-			jobEditorModel2.getSaveButton().setDisabled(true);
 		} else {
 			logger.info("{} is a new parameter value", newParameterValue);
 			uneditedParameter.put("value", newParameterValue);
-			jobEditorModel2.setProcessDataChanged(true);
-			jobEditorModel2.getSaveButton().setDisabled(false);
 		}
 	}
 }
diff --git a/server/user.mediacube.gui/src/user/jobengine/zk/validator/TemplateNameValidator.java b/server/user.mediacube.gui/src/user/jobengine/zk/validator/TemplateNameValidator.java
index dc476695..0c5f8c4b 100644
--- a/server/user.mediacube.gui/src/user/jobengine/zk/validator/TemplateNameValidator.java
+++ b/server/user.mediacube.gui/src/user/jobengine/zk/validator/TemplateNameValidator.java
@@ -23,22 +23,13 @@ public class TemplateNameValidator extends AbstractValidator {
 	@Override
 	public void validate(ValidationContext context) {
 		BasicDBObject uneditedJob = (BasicDBObject) context.getProperty().getBase();
-//		String originalTemplateName = uneditedJob.getString("template");
-//		jobEditorModel2.setOriginalTemplateName(originalTemplateName);
 		String newTemplateName = (String) context.getProperties("template")[0].getValue();
 
-		if (FilenameUtils.getExtension(newTemplateName).equals("xml")
-				&& ifTemplateNameChanged(uneditedJob, newTemplateName)) {
+		if (FilenameUtils.getExtension(newTemplateName).equals("xml")) {
 			logger.info("{} is a proper filename", newTemplateName);
 			uneditedJob.put("template", newTemplateName);
-//			jobEditorModel2.setTemplateNameChanged(true);
-			jobEditorModel2.setProcessDataChanged(true);
 		} else {
 			logger.info("{} is not a proper filename", newTemplateName);
 		}
 	}
-
-	private boolean ifTemplateNameChanged(BasicDBObject uneditedJob, String newTemplateName) {
-		return !uneditedJob.getString("template").equals(newTemplateName);
-	}
 }